aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] Fix template/context.phpNathaniel Guse2013-07-011-2/+2
| | | | PHPBB3-11598
* [feature/twig] Fix template/template_php_test.phpNathaniel Guse2013-07-011-1/+10
| | | | | | | | | | 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
* [feature/twig] Fix includephp_from_subdir_test.phpNathaniel Guse2013-07-012-5/+7
| | | | PHPBB3-11598
* [feature/twig] Remove the twig loader class that I started (don't use it)Nathaniel Guse2013-07-011-51/+0
| | | | PHPBB3-11598
* [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-0110-14/+15
| | | | | | | Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598
* [feature/twig] Fix includephp nodeNathaniel Guse2013-07-011-8/+6
| | | | PHPBB3-11598
* [feature/twig] PHP test moved to a separate fileNathaniel Guse2013-07-011-0/+21
| | | | | | | 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
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0119-134/+174
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-2917-131/+169
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * [ticket/9341] Assert that page doesnt contain next or prev page postsDhruv2013-06-281-1/+3
| | | | | | | | | | | | PHPBB3-9341
| | * [ticket/9341] Follow the Next/Prev link in testsDhruv2013-06-281-5/+9
| | | | | | | | | | | | | | | | | | | | | follow the next/prev link and then assert if the page contains its last post or not PHPBB3-9341
| | * [ticket/9341] remove PREV_PAGE tpl var used for backward compatabilityDhruv2013-06-271-1/+0
| | | | | | | | | | | | PHPBB3-9341
| | * [ticket/9341] Add tests for checking Next and Previous template varsDhruv2013-06-271-0/+33
| | | | | | | | | | | | PHPBB3-9341
| | * [ticket/9341] Move create_topic and post into functional test caseDhruv2013-06-272-101/+101
| | | | | | | | | | | | | | | | | | | | | create_topic and create_post are moved into functional test case so that they can be used by other tests as well PHPBB3-9341
| | * [ticket/9341] Use U_PREVIOUS and U_NEXT in template filesDhruv2013-06-2213-27/+27
| | | | | | | | | | | | PHPBB3-9341
| | * [ticket/9341] Correctly named template varssakimahesh2013-06-221-2/+2
| | | | | | | | | | | | PHPBB3-9341
| * | Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into developAndreas Fischer2013-06-291-0/+1
| |\ \ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11593: [ticket/11593] initialize $is_expr as null before being passed to get_varref
| | * | [ticket/11593] initialize $is_expr as null before being passed to get_varrefDhruv2013-06-291-0/+1
| | |/ | | | | | | | | | PHPBB3-11593
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-271-4/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11618] Replace glob() with scandir() and string matching Conflicts: tests/template/template_test.php
| | * \ Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympusAndreas Fischer2013-06-271-4/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | * Hardolaf/ticket/11618: [ticket/11618] Replace glob() with scandir() and string matching
| | | * | [ticket/11618] Replace glob() with scandir() and string matchingJoseph Warner2013-06-261-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-270-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | * develop-olympus:
| | * | | Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into ↵Andreas Fischer2013-06-271-3/+4
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-271-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * \ \ \ Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into ↵Andreas Fischer2013-06-271-3/+4
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | [ticket/11615] Fix typo in creation_testAndy Chase2013-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11615
| | | * | | [ticket/11615] Remove magic number in creation_testAndy Chase2013-06-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing this magic number to its own variable with clean multiplication makes it clear what the number represents. PHPBB3-11615
| | | * | | [ticket/11615] Rename class in file to matchAndy Chase2013-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11615
| | | * | | [ticket/11615] Rename init_test to creation_test for clarityAndy Chase2013-06-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11615
* | | | | | [feature/twig] Fix template_test.phpNathaniel Guse2013-07-017-88/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various tests were broken completely, and some things such as whitespace changed with Twig PHPBB3-11598
* | | | | | [feature/twig] A bit of cleanup in twig.phpNathaniel Guse2013-07-011-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_blockNathaniel Guse2013-07-011-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Add addslashes filter (to use on LA_ instead of escape)Nathaniel Guse2013-07-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To match previous parser behavior PHPBB3-11598
* | | | | | [feature/twig] Remove the get_rootref and get_tpldata functions prev addedNathaniel Guse2013-07-012-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not really necessary PHPBB3-11598
* | | | | | [feature/twig] Transform {L_, {LA_ to use the lang() functionNathaniel Guse2013-07-013-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fixing include nodeNathaniel Guse2013-07-011-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fixing define nodeNathaniel Guse2013-07-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fixing div by replacementNathaniel Guse2013-07-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Adding ! operatorNathaniel Guse2013-07-011-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Add S_NUM_ROWS to loops in contextNathaniel Guse2013-06-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Adding some operators to the extensionNathaniel Guse2013-06-291-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fixing more stuff for DEFINE/INCLUDENathaniel Guse2013-06-292-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fixing DEFINE statementsNathaniel Guse2013-06-295-33/+196
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] New Twig filter, subsetNathaniel Guse2013-06-282-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This filter grabs a subset of a loop for output (according to past functionality). PHPBB3-11598
* | | | | | [feature/twig] Replace BEGIN with Twig for using LexerNathaniel Guse2013-06-265-213/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter)Nathaniel Guse2013-06-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNTNathaniel Guse2013-06-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Forgot to set up $config in node/php.phpNathaniel Guse2013-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Going back to Twig's handling of cache file names for nowNathaniel Guse2013-06-252-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My method was not working correctly, will work on it more later. PHPBB3-11598
* | | | | | [feature/twig] No longer using the phpbb_template_locatorNathaniel Guse2013-06-251-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functionality is handled by the Twig Filesystem Loader PHPBB3-11598