1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Commit Graph

185 Commits

Author SHA1 Message Date
ddaccaf63e [feature/twig] A bit of cleanup in twig.php
PHPBB3-11598
2013-07-01 11:52:03 -05:00
4ee7fb1a9d [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_block
PHPBB3-11598
2013-07-01 10:57:57 -05:00
42e3a4bfb9 [feature/twig] Add addslashes filter (to use on LA_ instead of escape)
To match previous parser behavior

PHPBB3-11598
2013-07-01 10:17:58 -05:00
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
9749405129 [feature/twig] Transform {L_, {LA_ to use the lang() function
PHPBB3-11598
2013-07-01 09:32:21 -05:00
658d1b6afe [feature/twig] Fixing include node
PHPBB3-11598
2013-07-01 09:20:46 -05:00
ecdc73a81a [feature/twig] Fixing define node
PHPBB3-11598
2013-07-01 09:19:54 -05:00
2c55671767 [feature/twig] Fixing div by replacement
PHPBB3-11598
2013-07-01 09:19:30 -05:00
c49d27329d [feature/twig] Adding ! operator
PHPBB3-11598
2013-07-01 09:18:58 -05:00
c477f865fb [feature/twig] Add S_NUM_ROWS to loops in context
PHPBB3-11598
2013-06-29 19:22:58 -05:00
82aa4edeab [feature/twig] Adding some operators to the extension
PHPBB3-11598
2013-06-29 19:22:01 -05:00
f18cbd50f0 [feature/twig] Fixing more stuff for DEFINE/INCLUDE
PHPBB3-11598
2013-06-29 19:19:18 -05:00
64963b5962 [feature/twig] Fixing DEFINE statements
PHPBB3-11598
2013-06-29 11:07:10 -05:00
abb7901edb [feature/twig] New Twig filter, subset
This filter grabs a subset of a loop for output (according to past
functionality).

PHPBB3-11598
2013-06-28 15:40:30 -05:00
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
6d709525c3 [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter)
PHPBB3-11598
2013-06-26 12:27:32 -05:00
15e4b33495 [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNT
PHPBB3-11598
2013-06-26 09:09:11 -05:00
040186418a [feature/twig] Forgot to set up $config in node/php.php
PHPBB3-11598
2013-06-25 20:52:04 -05:00
6c771a38de [feature/twig] Going back to Twig's handling of cache file names for now
My method was not working correctly, will work on it more later.

PHPBB3-11598
2013-06-25 19:24:32 -05:00
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
3766b736da [feature/twig] Don't require phpbb_config, some tests pass null
PHPBB3-11598
2013-06-25 18:06:45 -05:00
1c8c03c4db [feature/twig] INCLUDEPHP token abs paths & fix test
PHPBB3-11598
2013-06-25 16:51:50 -05:00
8bccba1a2f [feature/twig] INCLUDEPHP token, replace variable usage with $context
I could find no better way to do this...

PHPBB3-11598
2013-06-25 16:27:58 -05:00
e227f05e9a [feature/twig] INCLUDEPHP token support
PHPBB3-11598
2013-06-25 15:02:55 -05:00
99b776a4e5 [feature/twig] Add a comment to tpl output if PHP used, but disabled
PHPBB3-11598
2013-06-25 14:59:41 -05:00
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
ea785efb30 [feature/twig] PHP token support
PHPBB3-11598
2013-06-25 14:22:40 -05:00
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
a1f957af84 [feature/twig] Working on fixing tests
PHPBB3-11598
2013-06-24 15:28:54 -05:00
2819a2641b [feature/twig] Only set extensions if extension manager is loaded
PHPBB3-11598
2013-06-24 13:45:23 -05:00
309ed5e5c3 [feature/twig] Fixing file header copyrights
PHPBB3-11598
2013-06-24 13:37:22 -05:00
1a0819bdc4 [feature/twig] Changing INCLUDEJS behavior
Was:
<!-- INCLUDEJS template/foo.js -->

Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->

Reasons for this:
1. INCLUDEJS is 3.1-dev only

2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)

3. INCLUDEJS could not include files from outside directories or anywhere
else

4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.

PHPBB3-11598
2013-06-24 13:32:31 -05:00
63143a1a57 [feature/twig] Fix <!-- .blah since the being node was changed
PHPBB3-11598
2013-06-24 12:52:55 -05:00
c958155fb6 [feature/twig] Able to set chain of namespaces to search for loadTemplate()
This is done so that when event template files are included, if they
include files themselves, that namespace is checked first, then __main__
is checked to include the correct template file.

Also, when template files are included from a particular namespace, this is
done so that the files from that namespace are included first, then the
main namespace is checked.

We may want to change this behavior in the future to allow choosing which
locations have priority, but for now, this is what I am doing to make sure
the behavior is simple and always the same.

PHPBB3-11598
2013-06-24 12:39:28 -05:00
4881085f13 [feature/twig] Use twig->display rather than echo twig->render
PHPBB3-11598
2013-06-24 11:19:54 -05:00
3bd281fa27 [feature/twig] Event template tag
PHPBB3-11598
2013-06-24 11:18:29 -05:00
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
93d94d5cbe [feature/twig] Setup the style chain/loader properly
PHPBB3-11598
2013-06-18 10:37:25 -05:00
c5db8be580 [feature/twig] Fix begin loops & subloops
PHPBB3-11598
2013-06-15 11:20:10 -05:00
8561e187f0 [feature/twig] Throw exceptions (don't catch and ignore)
PHPBB3-11598
2013-06-14 09:41:29 -05:00
9eb3ad4d90 [feature/twig] Add && and || support
PHPBB3-11598
2013-06-14 09:41:02 -05:00
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
fa86f45f62 [feature/twig] Use phpBB's resource locator to find templates
PHPBB3-11598
2013-06-12 13:26:20 -05:00
74f19830f3 [feature/twig] Some additional operators, more stuff for IF
PHPBB3-11598
2013-06-12 12:48:37 -05:00
95884edf08 [feature/twig] Correcting output of INCLUDEJS
PHPBB3-11598
2013-06-12 12:32:56 -05:00
612dbad63f [feature/twig] Fixing IF .blah correctly
PHPBB3-11598
2013-06-11 10:57:00 -05:00
9acde23a05 [feature/twig] Language output assignments, using context class again
PHPBB3-11598
2013-06-11 09:41:15 -05:00
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
eac3c1f75c [feature/twig] BEGIN loops now work
PHPBB3-11598
2013-06-10 11:57:51 -05:00
15114067e6 [feature/twig] Replace phpBB template code with Twig syntax, then parse w/Twig
Fixing begin token/node, adding includejs token/node

PHPBB3-11598
2013-06-10 11:17:11 -05:00