mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
21,049 Commits 17 Branches 190 Tags
Commit Graph

241 Commits

Author SHA1 Message Date
Nathan Guse
d879acb7cc Merge pull request #1519 from cyberalien/ticket/11647 
Fix INCLUDEJS URLs handling
 2013-07-13 08:46:46 -07:00
Andreas Fischer
ac9dfd023c Merge remote-tracking branch 'EXreaction/ticket/11665' into develop 
* EXreaction/ticket/11665:
  [ticket/11665] Fix test class name
  [ticket/11665] Can't change file names already sent to set_filenames
 2013-07-12 19:15:25 +02:00
Nathaniel Guse
27b550ae66 [ticket/11665] Fix test class name 
PHPBB3-11665
 2013-07-12 12:10:57 -05:00
Nathaniel Guse
df3f0a212e [ticket/11664] Stop creating php.html file in root path in tests 
Also includephp_absolute.html

PHPBB3-11664
 2013-07-12 11:56:03 -05:00
Nathaniel Guse
7e20b71180 [ticket/11665] Can't change file names already sent to set_filenames 
PHPBB3-11665
 2013-07-12 11:47:34 -05:00
Andreas Fischer
658b378b63 [ticket/11662] Typos: occured -> occurred 
PHPBB3-11662
 2013-07-12 17:51:29 +02:00
Vjacheslav Trushkin
f5c2119e7c [ticket/11647] Always use & for URLs 
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs

PHPBB3-11647
 2013-07-11 18:13:48 -04:00
Igor Wiedler
1a5d685f45 [feature/bootstrap-dic] Bootstrap container from config.php 
PHPBB3-11651
 2013-07-11 18:04:40 -04:00
Nathaniel Guse
9f5c1e0062 [ticket/11388] Add newlines at EOF 
PHPBB3-11388
 2013-07-11 15:40:43 -05:00
Nathaniel Guse
159f018056 [ticket/11388] INCLUDECSS 
PHPBB3-11388
 2013-07-11 15:31:55 -05:00
Vjacheslav Trushkin
6eef2aebd7 [ticket/11647] Fix tests for INCLUDEJS 
PHPBB-11647
 2013-07-11 15:40:28 -04:00
Nathaniel Guse
947b907efe [ticket/11388] Do not append assets_version if using remote path (e.g. http) 
PHPBB3-11388
 2013-07-11 11:28:35 -05:00
Nathaniel Guse
648e1e51fa [ticket/11388] INCLUDEJS test for //(url) 
PHPBB3-11388
 2013-07-11 08:44:48 -05:00
Nathaniel Guse
8d8979eda7 [ticket/11388] Fixing includejs test 
Changed expected output to file?(any supplied argument string)&asset_version
=($config['asset_version'])#(any supplied anchor string)

Testing lines one at a time to make checking them easier.

PHPBB3-11388
 2013-07-10 13:23:36 -05:00
Nathaniel Guse
f88cdce43a Merge remote-tracking branch 'remotes/cyberalien/feature/twig/includejs_tests' into feature/twig 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/twig/includejs_tests:
  [feature/twig] Unit tests for includejs
 2013-07-10 11:38:48 -05:00
Vjacheslav Trushkin
9725eb19f8 [feature/twig] Unit tests for includejs 
PHPBB3-11598
 2013-07-10 11:43:52 -04:00
Nathan Guse
47ec38c011 [feature/twig] Add simple test to make sure Twig filters/tags are working 
PHPBB3-11598
 2013-07-08 15:21:27 -05:00
Nathan Guse
9ac61565fd [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAME 
PHPBB3-11598
 2013-07-05 12:48:02 -05:00
Nathan Guse
1f4a717f9e [feature/twig] Add template test for ===, !== 
PHPBB3-11598
 2013-07-05 10:29:24 -05:00
Nathaniel Guse
81f27fd87e [feature/twig] Add test to make sure nested loops get the correct S_ROW_COUNT 
PHPBB3-11598
 2013-07-04 10:40:14 -05:00
Nathaniel Guse
2507c648fe [feature/twig] template->cachepath is now private, missed checking tests 
PHPBB3-11598
 2013-07-02 12:59:23 -05:00
Nathaniel Guse
6bbe92a8d0 [feature/twig] Move test_php back to template_test 
Was originally moved because I thought that a new test file might mean a new
instance and the memory would be cleared, fixing the original problem, but
that isn't true and it was fixed another way.

PHPBB3-11598
 2013-07-02 12:50:55 -05:00
Nathaniel Guse
b4947f94ed [feature/twig] Should compare to $this->test_path rather than hardcoded path 
PHPBB3-11598
 2013-07-02 12:43:26 -05:00
Nathaniel Guse
c6c064a136 [feature/twig] Fix includejs test 
PHPBB3-11598
 2013-07-02 11:21:31 -05:00
Nathaniel Guse
9dce2b28af [feature/twig] Fix template test case 
PHPBB3-11598
 2013-07-02 11:21:05 -05:00
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template 
PHPBB3-11598
 2013-07-01 13:28:08 -05:00
Nathaniel Guse
3060cbe089 [feature/twig] Fix template/template_php_test.php 
Must create a template file in the cache to load as this causes errors
otherwise. The problem was that Twig builds template files into classes,
which are always stored in PHP memory after being loaded. Because of this,
Twig would never recompile a template that was already compiled on the same
page load (so switching enable PHP on/off in two tests would not work).

PHPBB3-11598
 2013-07-01 13:17:59 -05:00
Nathaniel Guse
6f925552a5 [feature/twig] Fix includephp_from_subdir_test.php 
PHPBB3-11598
 2013-07-01 13:06:37 -05:00
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly 
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
 2013-07-01 12:26:01 -05:00
Nathaniel Guse
1b2e5503ac [feature/twig] PHP test moved to a separate file 
This had to be done because cached template files are available in memory,
so Twig doesn't ever reparse a template on the same page load

PHPBB3-11598
 2013-07-01 12:07:29 -05:00
Nathaniel Guse
8c75d1c1bc [feature/twig] Fix template_test.php 
Various tests were broken completely, and some things such as whitespace
changed with Twig

PHPBB3-11598
 2013-07-01 11:58:16 -05:00
Nathaniel Guse
6c771a38de [feature/twig] Going back to Twig's handling of cache file names for now 
My method was not working correctly, will work on it more later.

PHPBB3-11598
 2013-06-25 19:24:32 -05:00
Nathaniel Guse
25f0ee9fb6 [feature/twig] Fixing template events test (and behavior) 
According to the test, template event behavior was never correct.

Only ONE template event file is supposed to be included from EACH
extension. As it was before, EVERY matching template event file from
each extension was included (this was how it was designed).

E.g.
Event call in prosilver "foo"
Extension has template "foo" in prosilver AND all

foo from all would be included, then foo from prosilver would be included

This was clearly not designed correctly as only the most specific event
file from each extension should be loaded, otherwise events could only
ever be put in a single style tree (either only all, or only prosilver
and subsilver2 and any style that inherits from neither of those).
Otherwise the events would be duplicated on output (which is clearly not
desirable).

The Twig behavior already was correct as I designed it, so only the one
most specific template event file found would be included from each
extension. The tests had to be updated for the correct expected output.

PHPBB3-11598
 2013-06-25 19:22:23 -05:00
Nathaniel Guse
1c8c03c4db [feature/twig] INCLUDEPHP token abs paths & fix test 
PHPBB3-11598
 2013-06-25 16:51:50 -05:00
Nathaniel Guse
fe61527c52 [feature/twig] Remove duplicate test calls 
PHPBB3-11598
 2013-06-24 23:29:22 -05:00
Nathaniel Guse
dabc0edea2 [feature/twig] Delete template_spacing_test.php 
No longer needed

PHPBB3-11598
 2013-06-24 22:50:09 -05:00
Nathaniel Guse
1d6a51f51a [feature/twig] Delete template_locate_test.php 
No longer needed

PHPBB3-11598
 2013-06-24 22:44:57 -05:00
Nathaniel Guse
92391d2f4f [feature/twig] Correct template_inheritance_test.php 
PHPBB3-11598
 2013-06-24 22:44:12 -05:00
Nathaniel Guse
8bda356dab [feature/twig] Correct includejs test 
PHPBB3-11598
 2013-06-24 22:40:17 -05:00
Nathaniel Guse
814d57d201 [feature/twig] Delete template_compile_test.php 
No longer necessary

PHPBB3-11598
 2013-06-24 21:58:09 -05:00
Nathaniel Guse
d986e124fe [feature/twig] Delete renderer_eval_test.php 
No longer necessary

PHPBB3-11598
 2013-06-24 21:57:01 -05:00
Nathaniel Guse
881bc60fbc [feature/twig] Delete invalid constructs template test 
Invalid tags is no longer a valid test (invalid tags are ignored)

Twig contains tests for loading files, so we should not need to test this

PHPBB3-11598
 2013-06-24 21:55:45 -05:00
Nathan Guse
a1f957af84 [feature/twig] Working on fixing tests 
PHPBB3-11598
 2013-06-24 15:28:54 -05:00
Nathan Guse
38d8025f12 [feature/twig] Use phpbb_template_twig in tests 
Replace all new phpbb_template( with new phpbb_template_twig(

PHPBB3-11598
 2013-06-12 13:29:57 -05:00
Nathan Guse
06720fb0d7 [ticket/11435] Enable spacing test as it should now pass 
PHPBB3-11435
 2013-05-20 11:46:08 -05:00
Nathan Guse
9fab868f0f Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11482:
  [ticket/11482] Use double quotes for code
  [ticket/11482] Unit tests for advanced DEFINE
  [ticket/11482] Implementation of advanced DEFINE tag
 2013-05-20 10:47:45 -05:00
Nathaniel Guse
9608d9bf1e [ticket/11519] Rename test event template file 
As requested by Oleg
https://github.com/phpbb/phpbb3/pull/1340#issuecomment-17306967

PHPBB3-11519
 2013-05-04 11:45:49 -05:00
Nathaniel Guse
356bc00a29 [ticket/11435] Mark extension spacing test as incomplete 
This test fails until 11435 is fixed

Add newlines at EOF

PHPBB3-11435
 2013-04-30 23:21:50 -05:00
Nathan Guse
ab87fe7982 [ticket/11435] Create test to make sure template/event output is equal 
PHPBB3-11435
 2013-04-25 15:26:59 -05:00
Nathan Guse
6801e36def [ticket/11435] Fix comments in events test 
PHPBB3-11435
 2013-04-25 15:26:59 -05:00