1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:01:48 +02:00
Commit Graph

24 Commits

Author SHA1 Message Date
Nathan Guse
309ed5e5c3 [feature/twig] Fixing file header copyrights
PHPBB3-11598
2013-06-24 13:37:22 -05:00
Nathan Guse
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
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
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
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
9eb3ad4d90 [feature/twig] Add && and || support
PHPBB3-11598
2013-06-14 09:41:02 -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
95884edf08 [feature/twig] Correcting output of INCLUDEJS
PHPBB3-11598
2013-06-12 12:32:56 -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
Nathan Guse
eac3c1f75c [feature/twig] BEGIN loops now work
PHPBB3-11598
2013-06-10 11:57:51 -05:00
Nathan Guse
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
Nathan Guse
b775f67128 [feature/twig] More work on the lexer
Committing what I have now to save it as I'm trying another method next

PHPBB3-11598
2013-06-10 10:00:22 -05:00
Nathan Guse
9f8f500ba3 [feature/twig] Working on DEFINE
PHPBB3-11598
2013-06-10 00:59:06 -05:00
Nathan Guse
87cc8af265 [feature/twig] Support our old INCLUDE statements (no quotes)
Better code for handling IF .blah

PHPBB3-11598
2013-06-09 23:32:39 -05:00
Nathan Guse
1da4be04b0 [feature/twig] WIP extension/lexer/some tokenparsers/nodes
PHPBB3-11598
2013-06-09 22:11:12 -05:00