aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-021-0/+59
|\ \ | |/
| * [ticket/12661] Add new line at the end of filesPico2014-08-251-1/+1
| | | | | | | | PHPBB3-12661
| * [ticket/12661] Add template testPico882014-08-241-0/+59
| | | | | | | | PHPBB3-12661
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding Conflicts: phpBB/config/services.yml
| * [ticket/12932] Fix tests and calls to create_datetimeMarc Alexander2014-08-101-1/+1
| | | | | | | | PHPBB3-12932
* | [ticket/11649] Expose Twig through the containerTristan Darricau2014-08-093-3/+64
|/ | | | PHPBB3-11649
* Merge pull request #2676 from Nicofuma/ticket/12787Joas Schilling2014-07-083-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12787] Allow the route to say that the referer has to be used. * Nicofuma/ticket/12787: [ticket/12787] Updates phpbb_mock_controller_helper [ticket/12787] Add controller_helper::get_current_url() [ticket/12787] Remove one app.php when it's both in $path and $web_root_path [ticket/12787] Fix the absolute board url [ticket/12787] Use a parameter (_referer) instead of the Referer header [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer() [ticket/12099] Remove config again [ticket/12099] Correctly fix the path when performing AJAX requests [ticket/12099] Add request argument to path_helper service
| * [ticket/12099] Remove config againJoas Schilling2014-06-293-3/+0
| | | | | | | | PHPBB3-12099
| * [ticket/12099] Add request argument to path_helper servicePico882014-06-293-0/+6
| | | | | | | | PHPBB3-12099
* | [ticket/12781] Add testsTristan Darricau2014-06-272-0/+8
|/ | | | PHPBB3-12781
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2710-30/+70
| | | | PHPBB3-12594
* [ticket/12382] Event loop nesting inclusion applies to regular includes tooNils Adermann2014-05-032-3/+2
| | | | PHPBB3-12382
* [ticket/12382] Allow nested loops in included files.Nils Adermann2014-05-032-3/+2
| | | | | | They have to reference the fully qualified loop name in BEGIN and END. PHPBB3-12382
* [ticket/12382] Mark broken nested loop with include as incompleteJoas Schilling2014-04-142-2/+15
| | | | PHPBB3-12382
* [ticket/12382] Add template test for subloops inside includesJoas Schilling2014-04-123-0/+19
| | | | PHPBB3-12382
* [ticket/12382] Add template test for subloops inside eventsJoas Schilling2014-04-103-0/+18
| | | | PHPBB3-12382
* [ticket/7580] Add test for IF {VAR} is defined in templatesMatt Friedman2014-03-162-0/+11
| | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-7580 This test demonstrates that is possible to test if a variable exists and then use it if it does, similar to using isset(), but in template/twig syntax. <!— IF {VAR} is defined —>{VAR}<!— ENDIF —> PHPBB3-7580
* [ticket/10288] Test to make sure included templates have proper variable scopeNathan Guse2014-03-133-0/+12
| | | | PHPBB3-10288
* [ticket/12224] Add assign_block_vars_array() test.rxu2014-03-101-0/+34
| | | | | | Add tests, also change return value to null. PHPBB3-12224
* [ticket/11943] New line at EOF for define_error.htmlNathan Guse2013-11-111-1/+1
| | | | PHPBB3-11943
* [ticket/11943] Forgot template file for testNathan Guse2013-11-091-0/+2
| | | | PHPBB3-11943
* [ticket/11943] Throw an exception if DEFINE is setup improperlyNathan Guse2013-11-091-0/+8
| | | | PHPBB3-11943
* [ticket/11943] Add test for DEFINE $VAR = falseNathan Guse2013-11-042-1/+7
| | | | PHPBB3-11943
* [ticket/11874] Fix testsNathan Guse2013-10-102-15/+15
| | | | PHPBB3-11874
* [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-265-21/+24
| | | | PHPBB3-11852
* Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-262-1/+4
|\ | | | | | | | | * EXreaction/ticket/11816-2: [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
| * [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-192-1/+4
| | | | | | | | PHPBB3-11816
* | [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-173-5/+5
| | | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-175-18/+43
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving) Conflicts: phpBB/common.php phpBB/config/services.yml phpBB/includes/bbcode.php phpBB/includes/functions.php phpBB/includes/functions_messenger.php phpBB/install/index.php phpBB/phpbb/filesystem.php phpBB/phpbb/template/twig/environment.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/dbal/migrator_test.php tests/extension/manager_test.php tests/extension/metadata_manager_test.php tests/filesystem/clean_path_test.php tests/mock/extension_manager.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11832] Correct paths in testsNathan Guse2013-09-153-17/+19
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-133-3/+26
| | | | | | | | PHPBB3-11832
* | [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-161-1/+1
| | | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1626-74/+110
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11843] Added newlines and included numbers in the DEFINE vars testrechosen2013-09-132-1/+5
| | | | | | | | | | | | | | | | Per suggestion of nickvergessen, I added newlines in the DEFINE variables with underscores test. Now if the test fails, it's easier to spot which part is failing. Also added a test for DEFINE variables containing numbers. PHPBB3-11843
| * [ticket/11843] Add checking DEFINE variables with underscores to template_testrechosen2013-09-132-1/+3
| | | | | | | | | | | | | | | | To prevent the underscore in DEFINE variables from being forgotten again, the template tests now test INCLUDEing a file based on the contents of a DEFINE variable with underscores in it. PHPBB3-11843
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-122-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Nathan Guse (6) and others * 'develop' of github.com:phpbb/phpbb3: (195 commits) [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [feature/oauth] Fix tabindex [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [ticket/11822] Use namespace lookup order for asset loading [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-122-1/+2
| | | | | | | | | | | | | | | | | | Use lazy operators and use stricter validation PHPBB3-11828
| * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-067-18/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King (16) and others # Via David King (13) and others * 'develop' of github.com:phpbb/phpbb3: (67 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * [ticket/11812] Fix empty defineNathan Guse2013-09-022-1/+3
| | | | | | | | | | | | PHPBB3-11812
| | * Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-302-0/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11724: [ticket/11724] Handle ELSE IF separately [ticket/11724] Replace spaces with tabs [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
| | | * [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-272-0/+9
| | | | | | | | | | | | | | | | PHPBB3-11724
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2820-54/+68
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * | | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-245-9/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | [ticket/11628] Remove style path providerNathaniel Guse2013-07-243-11/+3
| | | |/ | | |/| | | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
| * | | [ticket/11816] !$DOESNT_EXIST testNathan Guse2013-09-062-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11816
| * | | [ticket/11816] Test !$DEFINITIONNathan Guse2013-09-022-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11816
| * | | [ticket/11816] Fix define/loop checks in IF statements containing parenthesisNathan Guse2013-08-292-1/+4
| | |/ | |/| | | | | | | PHPBB3-11816
| * | [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-1311-0/+0
| | | | | | | | | | | | PHPBB3-11784