mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00
Code Issues Releases Wiki Activity
28,347 Commits 17 Branches 190 Tags
Commit Graph

273 Commits

Author SHA1 Message Date
Nils Adermann
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970 
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
 2012-11-10 07:46:50 -08:00
Oleg Pudeyev
a7babc211c [ticket/11159] static public is the currently approved order. 
PHPBB3-11159
 2012-11-06 10:41:06 -05:00
Oleg Pudeyev
b878d5daa9 [ticket/10933] Update template locator test to use style resource locator. 
There is no reason for it to go through a template instance to test
resource locator functionality.

PHPBB3-10933
 2012-11-02 19:39:07 -04:00
Oleg Pudeyev
767d09227b [ticket/10933] Dependency inject template context. 
PHPBB3-10933
 2012-11-02 18:51:35 -04:00
Oleg Pudeyev
c3fb0f359c [ticket/10933] Specify empty template path for absolute includephp test. 
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
 2012-11-02 18:06:21 -04:00
Andreas Fischer
d3bbde69c4 [ticket/10973] Drop all require_once for mocks. Use autoloading. 
PHPBB3-10973
 2012-07-08 22:57:23 +02:00
Fyorl
d0cb5bb093 [ticket/10970] Added support for forms such as {FOO}bar.{EXT} 
PHPBB3-10970
 2012-07-08 20:41:22 +01:00
Fyorl
d589623906 [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctly 
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
 2012-07-08 20:41:00 +01:00
Oleg Pudeyev
d8946e74de Merge PR #778 branch 'cyberalien/ticket/10800' into develop 
* cyberalien/ticket/10800:
  [ticket/10800] Changing html to js for includejs tests
  [ticket/10800] Changing template paths in tests
 2012-06-11 20:02:35 -04:00
Oleg Pudeyev
241033ae88 [ticket/10882] Fix test name - oops. 
PHPBB3-10882
 2012-06-11 18:50:05 -04:00
Oleg Pudeyev
56b2b87423 [ticket/10882] Add a test for including a nonexistent file. 
PHPBB3-10882
 2012-05-10 03:36:58 -04:00
Oleg Pudeyev
720d07c9b3 [ticket/10882] Add test for an ENDIF without IF. 
PHPBB3-10882
 2012-05-10 03:28:54 -04:00
Oleg Pudeyev
9a38a034e5 [ticket/10882] Add test for an invalid template tag. 
PHPBB3-10882
 2012-05-10 03:28:35 -04:00
Vjacheslav Trushkin
5114edcafe [ticket/10800] Changing html to js for includejs tests 
Changing .html to .js files for includejs tests

PHPBB3-10800
 2012-05-01 17:41:46 +03:00
Vjacheslav Trushkin
51347ebc09 [ticket/10800] Changing template paths in tests 
Changing template paths in tests from absolute to relative

PHPBB3-10800
 2012-04-29 00:30:08 +03:00
Vjacheslav Trushkin
d91abbb146 [ticket/10756] Renaming phpbb_style_template to phpbb_template 
Renaming phpbb_style_template to phpbb_template

PHPBB3-10756
 2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
6cecc91326 [ticket/10756] Removing path provider from template class 
Removing path provider from template class because it is not used by template class

PHPBB3-10756
 2012-04-19 04:21:56 +02:00
Vjacheslav Trushkin
ef295a2860 [ticket/10756] Renaming template classes 
Renaming template classes from phpbb_style_template_ to phpbb_template_

PHPBB3-10756
 2012-04-19 04:15:11 +02:00
Nils Adermann
8a1d084d6d [ticket/10783] Correctly add assets_version config var to includejs urls 
PHPBB3-10783
 2012-04-13 04:08:21 +02:00
Vjacheslav Trushkin
2d9d8d3673 [ticket/10665] New test class for templates with tree 
New parent template test class for tests that use styles tree

PHPBB3-10665
 2012-04-01 20:37:45 +03:00
Vjacheslav Trushkin
b548389207 Merge remote-tracking branch 'upstream/develop' into ticket/10665 
* 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
 2012-04-01 19:28:37 +03:00
Vjacheslav Trushkin
eaba2ed9ca [ticket/10733] Fixing test 
Changing expected and result in locator test

PHPBB3-10733
 2012-04-01 19:20:42 +03:00
Vjacheslav Trushkin
f5bac7686b [ticket/10733] Removing static from data providers 
Removing static from data provider functions

PHPBB3-10733
 2012-04-01 19:14:53 +03:00
Vjacheslav Trushkin
4b2ede433e [ticket/10665] INCLUDEJS unit test 
Adding INLCUDEJS test

PHPBB3-10665
 2012-04-01 11:17:13 +03:00
Vjacheslav Trushkin
38c988fb59 [ticket/10665] Changing template compiler test 
Adding new constructor parameters to template compiler test

PHPBB3-10665
 2012-04-01 11:16:57 +03:00
Vjacheslav Trushkin
2509853ca5 [ticket/10733] Adding test for locator 
Adding test for $template->locate

PHPBB3-10733
 2012-04-01 09:53:23 +03:00
Vjacheslav Trushkin
377db78dca [feature/merging-style-components] Fix for unit tests 
Fixing typo in template unit tests

PHPBB3-10632
 2012-03-31 18:16:53 +03:00
Vjacheslav Trushkin
17989c17a0 [feature/merging-style-components] Moving template initialization out of style 
Moving template initialization out of style constructor

PHPBB3-10632
 2012-03-31 18:10:00 +03:00
Vjacheslav Trushkin
360312f599 [feature/merging-style-components] Initializing locator and provider separately 
Moving locator and path provider initialization out of style class

PHPBB3-10632
 2012-03-31 17:38:30 +03:00
Vjacheslav Trushkin
d25b607ca1 [feature/merging-style-components] Updating test cases 
Updating code in test cases for new template classes.

PHPBB3-10632
 2012-03-15 21:12:13 +02:00
Vjacheslav Trushkin
3997ffac2a [feature/merging-style-components] Creating style class 
Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
 2012-03-15 13:13:21 +02:00
Vjacheslav Trushkin
b7d84a586c [feature/merging-style-components] Renaming template classes 
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
 2012-03-14 23:12:11 +02:00
Oleg Pudeyev
65e711cbb0 Merge remote-tracking branch 'cyberalien/feature/append_var' into develop 
* cyberalien/feature/append_var:
  [feature/append_var] Adding test case
  [feature/append_var] Adding append_var template class function
 2012-03-07 18:20:49 -05:00
Vjacheslav Trushkin
ebdd03872a [feature/append_var] Adding test case 
Adding test case for append_var

PHPBB3-10666
 2012-03-08 01:01:16 +02:00
Oleg Pudeyev
6e5fc53f0d [ticket/10685] Refactor template test defaults for php 5.4 compatibility. 
PHPBB3-10685
 2012-03-06 19:34:20 -05:00
Vjacheslav Trushkin
9f2a2a03a8 [ticket/10655] Error in template inheritance test 
Fixing error in template inheritance test

PHPBB3-10655
 2012-02-18 00:04:32 +02:00
Unknown
66c50f6b30 [ticket/9916] Updating license in non-distributed files 
PHPBB3-9916
 2012-01-02 19:10:36 +01:00
Andreas Fischer
a01e916737 Merge branch 'develop-olympus' into develop 
* 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
 2012-01-02 17:36:21 +01:00
Unknown
17991823ea [ticket/9916] Updating License in the header 
PHPBB3-9916
 2012-01-02 16:18:32 +00:00
Nils Adermann
520a5f9295 [feature/extension-manager] Refactoring the structure of extension provider 
PHPBB3-10323
 2011-09-29 16:15:53 +02:00
Nils Adermann
ea46feb115 [feature/extension-manager] Add support for templates in extensions. 
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
 2011-09-29 16:15:53 +02:00
Andreas Fischer
af66fbb93b Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop 
* '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.
 2011-09-27 20:24:16 +02:00
Chris Smith
118bc6198e [ticket/10392] Test for magic loop variables with nested namespaces. 
PHPBB3-10392
 2011-09-27 01:02:58 +01:00
Chris Smith
fbb5c641b8 [ticket/10384] Update unit tests to test for failing variable. 
PHPBB3-10384
 2011-09-24 20:48:37 +01:00
Patrick Webster
b5a79009ce [ticket/10322] Separate template varref resolution from output generation 
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
 2011-09-16 01:46:42 -05:00
Patrick Webster
b5ecb2f7a8 [ticket/10322] Dynamic template include test 
PHPBB3-10322
 2011-09-08 17:54:59 -05:00
Oleg Pudeyev
367fe0b4cf Merge remote-tracking branch 'cyberalien/ticket/10350' into develop 
* cyberalien/ticket/10350:
  [ticket/10350] Script for testing eval renderer
  [ticket/10350] Fix for class phpbb_template_renderer_eval
 2011-09-05 05:21:19 -04:00
Vjacheslav Trushkin
d8f4f92dae [ticket/10350] Script for testing eval renderer 
Script for testing eval renderer (fixed)

PHPBB3-10350
 2011-09-05 11:57:18 +03:00
Igor Wiedler
bbb10f576f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10354] Include cache directory path in unwritable message.

Conflicts:
	tests/template/template_test.php
 2011-09-05 09:20:06 +02:00
Oleg Pudeyev
511f2e0435 [ticket/10355] Correctly end output buffering in template tests. 
This code was copied verbatim from develop-olympus.

PHPBB3-10355
 2011-09-05 02:07:44 -04:00