1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

17004 Commits

Author SHA1 Message Date
Nathaniel Guse
884a5b06fa [feature/twig] Add set_style function to controller helper
PHPBB3-11598
2013-07-04 10:13:05 -05:00
Nathaniel Guse
36f25ea09b [feature/twig] Change style->set_style to accept a list of base directories
set_style now accepts an array containing a list of paths, e.g. array(
'ext/foo/bar/styles', 'styles'). Default: array('styles')

Using this option allows us to set the style based on the user's preferred
style (including the full tree), but use one or more base directories to
add the paths from.

The main use for this ability is so that extensions can call set_style,
including their path and the phpBB styles path (or any others) and have
their template files loaded from those directories (in the order given).

PHPBB3-11598
2013-07-04 10:12:09 -05:00
Nathaniel Guse
f1717412f3 [feature/twig] Debugging test failures
PHPBB3-11598
2013-07-03 09:31:35 -05:00
Nathaniel Guse
9652483ef4 [feature/twig] Fix begin loop var regex
PHPBB3-11598
2013-07-02 14:24:48 -05:00
Nathaniel Guse
52bce2ce11 [feature/twig] Prevent errors from mkdir if the dir already exists
PHPBB3-11598
2013-07-02 13:43:02 -05:00
Nathaniel Guse
2507c648fe [feature/twig] template->cachepath is now private, missed checking tests
PHPBB3-11598
2013-07-02 12:59:23 -05:00
Nathaniel Guse
6bbe92a8d0 [feature/twig] Move test_php back to template_test
Was originally moved because I thought that a new test file might mean a new
instance and the memory would be cleared, fixing the original problem, but
that isn't true and it was fixed another way.

PHPBB3-11598
2013-07-02 12:50:55 -05:00
Nathaniel Guse
b4947f94ed [feature/twig] Should compare to $this->test_path rather than hardcoded path
PHPBB3-11598
2013-07-02 12:43:26 -05:00
Nathaniel Guse
57c2d99e65 [feature/twig] Fix indentation
PHPBB3-11598
2013-07-02 12:34:16 -05:00
Nathaniel Guse
f102f609f5 [feature/twig] Remove getCacheFilename function I was working on
This can be addressed later if we decide we want to have more nicely named
cache files. It does not need to be addressed now

PHPBB3-11598
2013-07-02 12:23:42 -05:00
Nathaniel Guse
985a233a78 [feature/twig] Remove reference to cachepath, it is not used publicly anymore
PHPBB3-11598
2013-07-02 12:22:42 -05:00
Nathaniel Guse
f39edcea3f [feature/twig] Check the template context for language vars
We output some language vars to the context (e.g. L_TITLE in the ACP). These
do not exist in user->lang, so we must check the context vars first, if not
in context, we output the result of user->lang.

PHPBB3-11598
2013-07-02 12:17:56 -05:00
Nathaniel Guse
709b3e9803 [feature/twig] Fix BBCode parser
PHPBB3-11598
2013-07-02 11:29:32 -05:00
Nathaniel Guse
c6c064a136 [feature/twig] Fix includejs test
PHPBB3-11598
2013-07-02 11:21:31 -05:00
Nathaniel Guse
9dce2b28af [feature/twig] Fix template test case
PHPBB3-11598
2013-07-02 11:21:05 -05:00
Nathaniel Guse
02a8150bb6 [feature/twig] INCLUDEPHP behavior now supports local relative paths
As a last resort, now we use the Twig Loader to find the correct file to
include to (most specific file first, then parent styles). Also allows
using @namespace convention. This is ONLY done if the specified path is not
an absolute path AND the file does not exist relative to the phpBB root path.

PHPBB3-11598
2013-07-02 11:08:52 -05:00
Nathaniel Guse
59d13d0535 [feature/twig] INCLUDEJS behavior now supports local relative paths
This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention

PHPBB3-11598
2013-07-02 11:07:12 -05:00
Nathaniel Guse
156d5c671f [feature/twig] INCLUDEJS now uses the definition class
This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.

PHPBB3-11598
2013-07-02 10:13:16 -05:00
Nathaniel Guse
883b0a9f8c [feature/twig] Update phpbb_template interface
Return $this wherever possible

PHPBB3-11598
2013-07-01 21:44:00 -05:00
Nathaniel Guse
f249a527e5 [feature/twig] Should have been else
PHPBB3-11598
2013-07-01 21:32:10 -05:00
Nathaniel Guse
3b9cb7faa7 [feature/twig] Fix call for previous change to var name case
PHPBB3-11598
2013-07-01 21:29:15 -05:00
Nathaniel Guse
f902523956 [feature/twig] Comments
PHPBB3-11598
2013-07-01 21:24:27 -05:00
Nathaniel Guse
3dc40ad844 [feature/twig] Use correct case for variable name
PHPBB3-11598
2013-07-01 21:22:50 -05:00
Nathaniel Guse
e0f5e23032 [feature/twig] Fixed tabs in environment.php
PHPBB3-11598
2013-07-01 21:21:37 -05:00
Nathaniel Guse
16ebf14653 [feature/twig] Clean up the messenger a little bit
This should fix at least one bug, noticed we were using:
$this->vars = &$this->tpl_obj->_rootref;

Which hasn't been valid for a long+ time

PHPBB3-11598
2013-07-01 21:18:09 -05:00
Nathaniel Guse
8f303b376b [feature/twig] Don't forget to set the context when rendering!
PHPBB3-11598
2013-07-01 21:16:36 -05:00
Nathaniel Guse
1c7e077fea [feature/twig] Remove get_lang function (it's not used anywhere)
PHPBB3-11598
2013-07-01 21:11:24 -05:00
Nathaniel Guse
46d6899b46 [feature/twig] Do not assign var by reference
PHPBB3-11598
2013-07-01 20:41:36 -05:00
Nathaniel Guse
87e4e05220 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Dhruv
# Via Andreas Fischer (3) and Dhruv (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [ticket/10838] Updated RUNNING_TESTS.md
2013-07-01 20:38:29 -05:00
Nathaniel Guse
943728d3ef [feature/twig] Fix length replace in lexer
PHPBB3-11598
2013-07-01 14:58:20 -05:00
Nathaniel Guse
1a58d188aa [feature/twig] Prevent errors from empty user->style
PHPBB3-11598
2013-07-01 14:42:05 -05:00
Andreas Fischer
fb777b3e20 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
2013-07-01 21:23:07 +02:00
Andreas Fischer
1a292750f2 Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympus
* dhruvgoel92/ticket/10838:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
2013-07-01 21:22:51 +02:00
Dhruv
440986dc3f [ticket/10838] Fix URL for wiki and remove irrelevant line
PHPBB3-10838
2013-07-02 00:50:16 +05:30
Dhruv
89393e11e8 [ticket/10838] Remove php 5.4 and builtin server references
PHPBB3-10838
2013-07-02 00:50:15 +05:30
Dhruv
9c9f09d640 [ticket/10838] Fix missing data
PHPBB3-10838
2013-07-02 00:50:14 +05:30
Dhruv
5ed4dbb5b7 [ticket/10838] separate database used mentioned in unit tests
Separate database used for tests which is deleted each time
tests are run information is added to unit tests.

PHPBB3-10838
2013-07-02 00:47:32 +05:30
Andreas Fischer
60e474c551 Merge remote-tracking branch 'dhruvgoel92/ticket/11585' into develop
* dhruvgoel92/ticket/11585:
  [ticket/11585] Make $auth_admin class property
2013-07-01 20:43:34 +02:00
Dhruv
9e3d5420ad [ticket/11585] Make $auth_admin class property
$auth_admin is class property and used via $this reference in all
methods

PHPBB3-11585
2013-07-02 00:10:30 +05:30
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