1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

253 Commits

Author SHA1 Message Date
rechosen
e1c9a87586 [ticket/11777] Move the testing template events to 'events/' subdirectories
The tests written for extension template events did not follow the convention
and documentation of placing template event files in the events/ subdirectory.
Moved the files to this subdirectory so the tests succeed again.

PHPBB3-11777
2013-08-12 09:59:10 +02:00
Nathan Guse
d5c56c5d50 [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
PHPBB3-11724
2013-07-27 20:02:03 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
2013-07-24 13:25:20 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
2013-07-24 12:56:39 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 12:05:04 -05:00
Nathaniel Guse
0f83d7fd6c [ticket/11701] New line at EOF
PHPBB3-11701
2013-07-23 09:28:24 -05:00
Nathaniel Guse
30bfd7fb61 [ticket/11701] Test events in loops
PHPBB3-11701
2013-07-23 09:28:24 -05:00
Nathaniel Guse
c0b9db1c62 [ticket/11701] Fix loops var check
PHPBB3-11701
2013-07-23 09:26:50 -05:00
Andreas Fischer
7d8e80241c Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
2013-07-23 04:24:05 +02:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected
PHPBB3-11707
2013-07-19 14:12:28 -05:00
Nathaniel Guse
1c59ad87b0 [ticket/11718] Quick test for fixes in ELSEIF
PHPBB3-11718
2013-07-19 13:34:08 -05:00
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