16964 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nathaniel Guse	d7cff78443	[feature/twig] Use adm_relative_path to build admin namespace ... PHPBB3-11598	2013-07-01 13:39:51 -05:00
Nathaniel Guse	9fbba760fb	[feature/twig] Remove classes related to old template engine ... PHPBB3-11598	2013-07-01 13:34:28 -05:00
Nathaniel Guse	793ee3f8d9	[feature/twig] Remove debug code, set debug/auto reload correctly ... PHPBB3-11598	2013-07-01 13:32:43 -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	2d9bbe0ef2	[feature/twig] Fix template/context.php ... PHPBB3-11598	2013-07-01 13:26:00 -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	341bae40eb	[feature/twig] Remove the twig loader class that I started (don't use it) ... PHPBB3-11598	2013-07-01 12:58:31 -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	e9bbeeb1a4	[feature/twig] Fix includephp node ... PHPBB3-11598	2013-07-01 12:23:25 -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	f08330f762	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig ... # By Dhruv (7) and others # Via Andreas Fischer (7) and others * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11593] initialize $is_expr as null before being passed to get_varref [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/11618] Replace glob() with scandir() and string matching [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars Conflicts: tests/template/template_test_case.php	2013-07-01 12:03:24 -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	ddaccaf63e	[feature/twig] A bit of cleanup in twig.php ... PHPBB3-11598	2013-07-01 11:52:03 -05:00
Nathaniel Guse	4ee7fb1a9d	[feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_block ... PHPBB3-11598	2013-07-01 10:57:57 -05:00
Nathaniel Guse	42e3a4bfb9	[feature/twig] Add addslashes filter (to use on LA_ instead of escape) ... To match previous parser behavior PHPBB3-11598	2013-07-01 10:17:58 -05:00
Nathaniel Guse	8d3fd1fcdd	[feature/twig] Remove the get_rootref and get_tpldata functions prev added ... These are not really necessary PHPBB3-11598	2013-07-01 09:38:51 -05:00
Nathaniel Guse	9749405129	[feature/twig] Transform {L_, {LA_ to use the lang() function ... PHPBB3-11598	2013-07-01 09:32:21 -05:00
Nathaniel Guse	658d1b6afe	[feature/twig] Fixing include node ... PHPBB3-11598	2013-07-01 09:20:46 -05:00
Nathaniel Guse	ecdc73a81a	[feature/twig] Fixing define node ... PHPBB3-11598	2013-07-01 09:19:54 -05:00
Nathaniel Guse	2c55671767	[feature/twig] Fixing div by replacement ... PHPBB3-11598	2013-07-01 09:19:30 -05:00
Nathaniel Guse	c49d27329d	[feature/twig] Adding ! operator ... PHPBB3-11598	2013-07-01 09:18:58 -05:00
Nathaniel Guse	c477f865fb	[feature/twig] Add S_NUM_ROWS to loops in context ... PHPBB3-11598	2013-06-29 19:22:58 -05:00
Nathaniel Guse	82aa4edeab	[feature/twig] Adding some operators to the extension ... PHPBB3-11598	2013-06-29 19:22:01 -05:00
Nathaniel Guse	f18cbd50f0	[feature/twig] Fixing more stuff for DEFINE/INCLUDE ... PHPBB3-11598	2013-06-29 19:19:18 -05:00
Nathaniel Guse	64963b5962	[feature/twig] Fixing DEFINE statements ... PHPBB3-11598	2013-06-29 11:07:10 -05:00
Joas Schilling	8233c3e340	Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop ... * dhruvgoel92/ticket/9341: [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars	2013-06-29 15:49:23 +02:00
Andreas Fischer	c0c4ce8b8b	Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into develop ... * dhruvgoel92/ticket/11593: [ticket/11593] initialize $is_expr as null before being passed to get_varref	2013-06-29 14:07:42 +02:00
Dhruv	5182ec09a5	[ticket/11593] initialize $is_expr as null before being passed to get_varref ... PHPBB3-11593	2013-06-29 15:26:36 +05:30
Nathaniel Guse	abb7901edb	[feature/twig] New Twig filter, subset ... This filter grabs a subset of a loop for output (according to past functionality). PHPBB3-11598	2013-06-28 15:40:30 -05:00
Dhruv	91e773a795	[ticket/9341] Assert that page doesnt contain next or prev page posts ... PHPBB3-9341	2013-06-28 01:02:00 +05:30
Dhruv	22998ee5ee	[ticket/9341] Follow the Next/Prev link in tests ... follow the next/prev link and then assert if the page contains its last post or not PHPBB3-9341	2013-06-28 00:52:36 +05:30
Dhruv	69001902b9	[ticket/9341] remove PREV_PAGE tpl var used for backward compatability ... PHPBB3-9341	2013-06-27 20:47:03 +05:30
Andreas Fischer	f2b174c8b5	Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/11618] Replace glob() with scandir() and string matching Conflicts: tests/template/template_test.php	2013-06-27 02:23:57 +02:00
Andreas Fischer	960b20e45b	Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus ... * Hardolaf/ticket/11618: [ticket/11618] Replace glob() with scandir() and string matching	2013-06-27 02:08:48 +02:00
Joseph Warner	8e575487ff	[ticket/11618] Replace glob() with scandir() and string matching ... Removes glob from template tests as glob() does not work on all systems according to PHP documentation as has been noticed by users. PHPBB3-11618	2013-06-26 19:51:52 -04:00
Andreas Fischer	86234ea533	Merge branch 'develop-olympus' into develop ... * develop-olympus:	2013-06-27 01:22:01 +02:00
Andreas Fischer	e0c572d1d8	Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus ... * asperous/ticket/11615/creation_test: [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity	2013-06-27 01:21:28 +02:00
Andreas Fischer	d0f0704515	Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity	2013-06-27 01:12:34 +02:00
Andreas Fischer	95730c1ff1	Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus ... * asperous/ticket/11615/creation_test: [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity	2013-06-27 01:09:52 +02:00
Dhruv	bd9ece7ab6	[ticket/9341] Add tests for checking Next and Previous template vars ... PHPBB3-9341	2013-06-27 00:59:37 +05:30
Dhruv	1f989c6be7	[ticket/9341] Move create_topic and post into functional test case ... create_topic and create_post are moved into functional test case so that they can be used by other tests as well PHPBB3-9341	2013-06-27 00:57:34 +05:30
Andy Chase	7ba81a293f	[ticket/11615] Fix typo in creation_test ... PHPBB3-11615	2013-06-26 11:49:37 -07:00
Andy Chase	4c432fecc7	[ticket/11615] Remove magic number in creation_test ... Removing this magic number to its own variable with clean multiplication makes it clear what the number represents. PHPBB3-11615	2013-06-26 11:49:36 -07:00
Andy Chase	c29cca1a75	[ticket/11615] Rename class in file to match ... PHPBB3-11615	2013-06-26 11:49:35 -07:00
Andy Chase	a105a6d7a7	[ticket/11615] Rename init_test to creation_test for clarity ... PHPBB3-11615	2013-06-26 11:49:34 -07:00
Nathaniel Guse	09ed0dd7bc	[feature/twig] Replace BEGIN with Twig for using Lexer ... No longer using the begin tokenparser/node as it did not allow proper handling of <!-- BEGIN !foo, <!-- BEGIN foo(0,2). Now the lexer will use regular expressions to handle that correctly and replace it with Twig's for token Also fixing <!-- IF .foo as I discovered it evaluates to if sizeof(foo) PHPBB3-11598	2013-06-26 12:30:59 -05:00
Nathaniel Guse	6d709525c3	[feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter) ... PHPBB3-11598	2013-06-26 12:27:32 -05:00
Nathaniel Guse	15e4b33495	[feature/twig] Fix alter_block_array to correctly set S_ROW_COUNT ... PHPBB3-11598	2013-06-26 09:09:11 -05:00
Nathaniel Guse	040186418a	[feature/twig] Forgot to set up $config in node/php.php ... PHPBB3-11598	2013-06-25 20:52:04 -05:00