Commit graph

41 commits

Author SHA1 Message Date
Nathaniel Guse
dd7f9f08d5 [ticket/11388] Remove typehints (causing tests to fail)
PHPBB3-11388
2013-07-11 11:24:45 -05:00
Nathaniel Guse
a846048918 [ticket/11388] Disable cache if IN_INSTALL defined
PHPBB3-11388
2013-07-11 11:03:28 -05:00
Nathaniel Guse
ac6b4319b3 [ticket/11388] typehits
PHPBB3-11388
2013-07-11 10:32:13 -05:00
Nathaniel Guse
864465761f [feature/twig] Fix debug code
PHPBB3-11598
2013-07-04 13:19:03 -05:00
Nathaniel Guse
5f03321fac [feature/twig] Support using Twig filters on {VAR}, add masks for Twig tags
Now we can do {L_TITLE|upper}, {SITENAME|lower}, etc

We can also use all the Twig tags in our own syntax. E.g. <!-- BLOCK foo -->
= {% block foo %]. All tags are the same as the Twig tag names, but are
in uppercase.

PHPBB3-11598
2013-07-04 12:44:12 -05:00
Nathaniel Guse
84e0943c7b [feature/twig] Indentation and comments
PHPBB3-11598
2013-07-04 10:22:12 -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
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
883b0a9f8c [feature/twig] Update phpbb_template interface
Return $this wherever possible

PHPBB3-11598
2013-07-01 21:44:00 -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
1a58d188aa [feature/twig] Prevent errors from empty user->style
PHPBB3-11598
2013-07-01 14:42:05 -05:00
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
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
ddaccaf63e [feature/twig] A bit of cleanup in twig.php
PHPBB3-11598
2013-07-01 11:52:03 -05:00
Nathaniel Guse
8d3fd1fcdd [feature/twig] Remove the get_rootref and get_tpldata functions prev added
These are not really necessary

PHPBB3-11598
2013-07-01 09:38:51 -05:00
Nathaniel Guse
9749405129 [feature/twig] Transform {L_, {LA_ to use the lang() function
PHPBB3-11598
2013-07-01 09:32:21 -05:00
Nathaniel Guse
64963b5962 [feature/twig] Fixing DEFINE statements
PHPBB3-11598
2013-06-29 11:07:10 -05:00
Nathaniel Guse
09ed0dd7bc [feature/twig] Replace BEGIN with Twig for using Lexer
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
2013-06-26 12:30:59 -05:00
Nathaniel Guse
7a9aec5fda [feature/twig] No longer using the phpbb_template_locator
This functionality is handled by the Twig Filesystem Loader

PHPBB3-11598
2013-06-25 19:23:42 -05:00
Nathaniel Guse
68225d9f29 [feature/twig] Pass parameters required to twig env via constructor
Instead of creating set functions

PHPBB3-11598
2013-06-25 14:58:55 -05:00
Nathaniel Guse
3ca99f8122 [feature/twig] Append assets_version to includejs tag
Some fixes for main template parser

PHPBB3-11598
2013-06-24 22:37:58 -05:00
Nathan Guse
a1f957af84 [feature/twig] Working on fixing tests
PHPBB3-11598
2013-06-24 15:28:54 -05:00
Nathan Guse
2819a2641b [feature/twig] Only set extensions if extension manager is loaded
PHPBB3-11598
2013-06-24 13:45:23 -05:00
Nathan Guse
63143a1a57 [feature/twig] Fix <!-- .blah since the being node was changed
PHPBB3-11598
2013-06-24 12:52:55 -05:00
Nathan Guse
4881085f13 [feature/twig] Use twig->display rather than echo twig->render
PHPBB3-11598
2013-06-24 11:19:54 -05:00
Nathan Guse
3bd281fa27 [feature/twig] Event template tag
PHPBB3-11598
2013-06-24 11:18:29 -05:00
Nathan Guse
62fda07dd4 [feature/twig] Changing method for begin node to not use anonymous function
The way it was setup would actually require PHP 5.4, which isn't an option
right now. Leaving the old code there, just commented out, for now at least.

PHPBB3-11598
2013-06-23 22:28:39 -05:00
Nathaniel Guse
93d94d5cbe [feature/twig] Setup the style chain/loader properly
PHPBB3-11598
2013-06-18 10:37:25 -05:00
Nathaniel Guse
c5db8be580 [feature/twig] Fix begin loops & subloops
PHPBB3-11598
2013-06-15 11:20:10 -05:00
Nathaniel Guse
8561e187f0 [feature/twig] Throw exceptions (don't catch and ignore)
PHPBB3-11598
2013-06-14 09:41:29 -05:00
Nathaniel Guse
30a1f21735 [feature/twig] Use twig loader filesystem with namespaces to add paths
Twig now handles loading style files on its own

PHPBB3-11598
2013-06-14 01:00:38 -05:00
Nathan Guse
fa86f45f62 [feature/twig] Use phpBB's resource locator to find templates
PHPBB3-11598
2013-06-12 13:26:20 -05:00
Nathan Guse
74f19830f3 [feature/twig] Some additional operators, more stuff for IF
PHPBB3-11598
2013-06-12 12:48:37 -05:00
Nathan Guse
612dbad63f [feature/twig] Fixing IF .blah correctly
PHPBB3-11598
2013-06-11 10:57:00 -05:00
Nathan Guse
9acde23a05 [feature/twig] Language output assignments, using context class again
PHPBB3-11598
2013-06-11 09:41:15 -05:00
Nathan Guse
b035697800 [feature/twig] Replace phpBB template with Twig
Move phpbb_template class to phpbb_template_phpbb
Changed phpbb_template class to an interface
Switch services.yml to load phpbb_template_twig instead of phpbb_template

PHPBB3-11598
2013-06-10 12:59:47 -05:00