aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/10933' into developIgor Wiedler2012-11-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10933: [ticket/10933] Prose for get_first_file_location. [ticket/10933] Remaining documentation for added functions in resource locator [ticket/10933] Update template locator test to use style resource locator. [ticket/10933] Dispose of locate function in template class. [ticket/10933] Add mutators for template_path to style resource locator. [ticket/10933] Delete template_path assignment. [ticket/10933] Delete template_path from template class. [ticket/10933] Add get_first_template_location.
| * [ticket/10933] Update template locator test to use style resource locator.Oleg Pudeyev2012-11-021-1/+1
| | | | | | | | | | | | | | There is no reason for it to go through a template instance to test resource locator functionality. PHPBB3-10933
* | Merge pull request #881 from Fyorl/ticket/10970Nils Adermann2012-11-109-3/+32
|\ \ | |/ |/| Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
| * [ticket/10970] Added support for forms such as {FOO}bar.{EXT}Fyorl2012-07-082-1/+3
| | | | | | | | PHPBB3-10970
| * [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctlyFyorl2012-07-089-3/+30
| | | | | | | | | | | | | | | | | | | | A new method to handle this type of path was added and compile_tag_include, compile_tag_include_php and compile_tag_include_js were modified to use it appropriately. Tests were added for these three macros also. PHPBB3-10970
* | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-022-2/+2
| | | | | | | | PHPBB3-10933
* | [ticket/10933] Specify empty template path for absolute includephp test.Oleg Pudeyev2012-11-021-1/+1
| | | | | | | | | | | | | | | | This was probably necessary all along, and the test happened to work because state was not correctly reset between test runs and a previous test set an empty template path. PHPBB3-10933
* | [ticket/10973] Drop all require_once for mocks. Use autoloading.Andreas Fischer2012-07-081-1/+0
|/ | | | PHPBB3-10973
* Merge PR #778 branch 'cyberalien/ticket/10800' into developOleg Pudeyev2012-06-1110-14/+19
|\ | | | | | | | | | | * cyberalien/ticket/10800: [ticket/10800] Changing html to js for includejs tests [ticket/10800] Changing template paths in tests
| * [ticket/10800] Changing html to js for includejs testsVjacheslav Trushkin2012-05-016-6/+10
| | | | | | | | | | | | Changing .html to .js files for includejs tests PHPBB3-10800
| * [ticket/10800] Changing template paths in testsVjacheslav Trushkin2012-04-295-11/+12
| | | | | | | | | | | | Changing template paths in tests from absolute to relative PHPBB3-10800
* | [ticket/10882] Fix test name - oops.Oleg Pudeyev2012-06-111-1/+1
| | | | | | | | PHPBB3-10882
* | [ticket/10882] Add a test for including a nonexistent file.Oleg Pudeyev2012-05-103-0/+34
| | | | | | | | PHPBB3-10882
* | [ticket/10882] Add test for an ENDIF without IF.Oleg Pudeyev2012-05-103-0/+14
| | | | | | | | PHPBB3-10882
* | [ticket/10882] Add test for an invalid template tag.Oleg Pudeyev2012-05-103-0/+45
|/ | | | PHPBB3-10882
* [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-192-2/+2
| | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
* [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-192-2/+2
| | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
* [ticket/10756] Renaming template classesVjacheslav Trushkin2012-04-192-3/+3
| | | | | | Renaming template classes from phpbb_style_template_ to phpbb_template_ PHPBB3-10756
* [ticket/10783] Correctly add assets_version config var to includejs urlsNils Adermann2012-04-131-4/+4
| | | | PHPBB3-10783
* [ticket/10665] New test class for templates with treeVjacheslav Trushkin2012-04-014-55/+35
| | | | | | New parent template test class for tests that use styles tree PHPBB3-10665
* Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-013-11/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/10733] Fixing test [ticket/10733] Removing static from data providers [ticket/10731] Fixed addquote() to work on opera browser. [ticket/10731] Fixed addquote() to work on opera browser. [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2 [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language [ticket/10675] Add disk full language string when posting attachments
| * [ticket/10733] Fixing testVjacheslav Trushkin2012-04-011-7/+7
| | | | | | | | | | | | Changing expected and result in locator test PHPBB3-10733
| * [ticket/10733] Removing static from data providersVjacheslav Trushkin2012-04-013-4/+4
| | | | | | | | | | | | Removing static from data provider functions PHPBB3-10733
* | [ticket/10665] INCLUDEJS unit testVjacheslav Trushkin2012-04-012-0/+53
| | | | | | | | | | | | Adding INLCUDEJS test PHPBB3-10665
* | [ticket/10665] Changing template compiler testVjacheslav Trushkin2012-04-011-1/+1
|/ | | | | | Adding new constructor parameters to template compiler test PHPBB3-10665
* [ticket/10733] Adding test for locatorVjacheslav Trushkin2012-04-011-0/+84
| | | | | | Adding test for $template->locate PHPBB3-10733
* [feature/merging-style-components] Fix for unit testsVjacheslav Trushkin2012-03-312-2/+2
| | | | | | Fixing typo in template unit tests PHPBB3-10632
* [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-312-4/+4
| | | | | | Moving template initialization out of style constructor PHPBB3-10632
* [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-312-2/+8
| | | | | | Moving locator and path provider initialization out of style class PHPBB3-10632
* [feature/merging-style-components] Updating test casesVjacheslav Trushkin2012-03-154-5/+5
| | | | | | Updating code in test cases for new template classes. PHPBB3-10632
* [feature/merging-style-components] Creating style classVjacheslav Trushkin2012-03-152-8/+5
| | | | | | Creating phpbb_style class, changing template initialization to style initialization PHPBB3-10632
* [feature/merging-style-components] Renaming template classesVjacheslav Trushkin2012-03-144-9/+9
| | | | | | Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates) PHPBB3-10632
* Merge remote-tracking branch 'cyberalien/feature/append_var' into developOleg Pudeyev2012-03-071-0/+36
|\ | | | | | | | | | | * cyberalien/feature/append_var: [feature/append_var] Adding test case [feature/append_var] Adding append_var template class function
| * [feature/append_var] Adding test caseVjacheslav Trushkin2012-03-081-0/+36
| | | | | | | | | | | | Adding test case for append_var PHPBB3-10666
* | [ticket/10685] Refactor template test defaults for php 5.4 compatibility.Oleg Pudeyev2012-03-062-5/+13
|/ | | | PHPBB3-10685
* [ticket/10655] Error in template inheritance testVjacheslav Trushkin2012-02-181-1/+1
| | | | | | Fixing error in template inheritance test PHPBB3-10655
* [ticket/9916] Updating license in non-distributed filesUnknown2012-01-026-6/+6
| | | | PHPBB3-9916
* Merge branch 'develop-olympus' into developAndreas Fischer2012-01-021-1/+1
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php
| * [ticket/9916] Updating License in the headerUnknown2012-01-021-1/+1
| | | | | | | | PHPBB3-9916
* | [feature/extension-manager] Refactoring the structure of extension providerNils Adermann2011-09-292-2/+2
| | | | | | | | PHPBB3-10323
* | [feature/extension-manager] Add support for templates in extensions.Nils Adermann2011-09-293-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a template path provider to separate the process of locating (cached) paths in extensions from the template engine. The locator is supplied with a list of paths from the path provider. Admin templates can now be created in ext/<ext>/adm/style/ and regular templates go into ext/<ext>/styles/<style>/template/. Extension templates override regular templates. So if an extension supplies a file with a name used in phpBB, the extension's file will be used. A side-effect of this commit: Locator and Provider are now able to deal with arbitrary levels of template inheritance. So we can expose this through phpbb_template if we choose to, and allow styles to inherit from inherited styles. PHPBB3-10323
* | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2011-09-272-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | * 'develop' of git://github.com/phpbb/phpbb3: [ticket/10392] Alter parent namespace stripping. [ticket/10392] Test for magic loop variables with nested namespaces. [ticket/10392] Missed fix for S_BLOCK_NAME. [ticket/10392] Fix access to nested special block variables.
| * | [ticket/10392] Test for magic loop variables with nested namespaces.Chris Smith2011-09-272-2/+3
| | | | | | | | | | | | PHPBB3-10392
* | | [ticket/10384] Update unit tests to test for failing variable.Chris Smith2011-09-242-5/+7
|/ / | | | | | | PHPBB3-10384
* | [ticket/10322] Separate template varref resolution from output generationPatrick Webster2011-09-167-3/+24
| | | | | | | | | | | | | | | | | | Most template variables can now have their PHP variable name resolved instead of only compiling directly. This allows for the use of block vars in INCLUDE statements. This does not work for language variables since they require multiple checks. Added tests for the new types of allowed INCLUDEs. PHPBB3-10322
* | [ticket/10322] Dynamic template include testPatrick Webster2011-09-082-0/+10
| | | | | | | | PHPBB3-10322
* | Merge remote-tracking branch 'cyberalien/ticket/10350' into developOleg Pudeyev2011-09-051-0/+31
|\ \ | | | | | | | | | | | | | | | * cyberalien/ticket/10350: [ticket/10350] Script for testing eval renderer [ticket/10350] Fix for class phpbb_template_renderer_eval
| * | [ticket/10350] Script for testing eval rendererVjacheslav Trushkin2011-09-051-0/+31
| | | | | | | | | | | | | | | | | | Script for testing eval renderer (fixed) PHPBB3-10350
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-09-051-2/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10354] Include cache directory path in unwritable message. Conflicts: tests/template/template_test.php
| * | [ticket/10354] Include cache directory path in unwritable message.Oleg Pudeyev2011-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | When template tests are skipped because cache directory is not writable, include path to the cache directory into the message saying it is not writable. PHPBB3-10354