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
Nathan Guse
c84fc97e90
[ticket/11435] Create new template filter option (cleanup)
...
This allows us to only run cleanup on the last run of template compilation
and not cleanup during event parsing
PHPBB3-11435
2013-05-20 11:45:32 -05:00
Nathan Guse
9fab868f0f
Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into develop
...
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11482:
[ticket/11482] Use double quotes for code
[ticket/11482] Unit tests for advanced DEFINE
[ticket/11482] Implementation of advanced DEFINE tag
2013-05-20 10:47:45 -05:00
Oleg Pudeyev
32f247ed60
[ticket/11435] Fit comment into 80 columns and link to php manual.
...
PHPBB3-11435
2013-05-01 17:21:49 -04:00
Vjacheslav Trushkin
8567aaed32
[ticket/11482] Use double quotes for code
...
Use double quotes for code to avoid excessive escaping
PHPBB3-11482
2013-04-10 20:12:03 +03:00
Vjacheslav Trushkin
29a5db25ec
[ticket/11482] Implementation of advanced DEFINE tag
...
Implementation of advanced DEFINE tag and ENDDEFINE
PHPBB3-11482
2013-04-07 19:12:04 +03:00
Marc Alexander
1ebb17c698
[ticket/11323] Reduce additional code and revert regex to previous one
...
PHPBB3-11323
2013-02-26 21:43:39 +01:00
Marc Alexander
01a2622dc6
[ticket/11323] Correctly treat variables in template defines
...
Previously, any template variables that were used when defining a variable
were treated as strings. This is a regression to phpBB 3.0. With this
patch the template variables will be properly parsed.
PHPBB3-11323
2013-02-19 16:08:28 +01:00
David King
a9db155c28
Merge remote-tracking branch 'p/feature/template-events' into develop
...
# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Order extensions in mock extension manager.
[feature/template-events] Changes per imkingdavid's review.
[feature/template-events] Make style names private on template.
[feature/template-events] Test for event that is defined in parent style only.
[feature/template-events] Specify style names, add inheritance tests.
[feature/template-events] Normalize expected directory trees.
[feature/template-events] Allow dataset to be correctly selectable.
[feature/template-events] Dataset for template event testing with inheritance.
[feature/template-events] Use style names array in template filter.
[feature/template-events] Generate style names array in set_style.
[feature/template-events] Convert a single style name to array of them.
[feature/template-events] Chase dependency injection for template context.
[feature/template-events] Adjust template events test to use the dataset.
[feature/template-events] Create a dataset for template event tests.
[feature/template-events] Indentation fix.
[feature/template-events] Cosmetic changes.
[feature/template-events] Wording: wrongly -> improperly.
[feature/template-events] Indentation fix.
[feature/template-events] Rename template_name to style_name.
...
2012-12-10 14:09:10 -05:00
Oleg Pudeyev
318140b4d6
[ticket/10103] Convert the rest of the tree to flock class.
...
PHPBB3-10103
2012-12-04 02:26:55 -05:00
Oleg Pudeyev
ec4343c744
[ticket/11227] @return void -> @return null, per coding guidelines.
...
PHPBB3-11227
2012-11-30 23:03:06 -05:00
Oleg Pudeyev
47a90f815d
[feature/template-events] Changes per imkingdavid's review.
...
PHPBB3-9550
2012-11-17 16:43:40 -05:00
Oleg Pudeyev
da7d888448
[feature/template-events] Make style names private on template.
...
PHPBB3-9550
2012-11-17 16:43:38 -05:00
Oleg Pudeyev
af47779f51
[feature/template-events] Use style names array in template filter.
...
This provides a straightforward way of iterating over all styles
looking for templates in extensions.
PHPBB3-9550
2012-11-17 16:42:43 -05:00
Oleg Pudeyev
44d6dc4c4c
[feature/template-events] Convert a single style name to array of them.
...
This allows template code to know the entire style hierarchy for
templates being rendered.
PHPBB3-9550
2012-11-17 16:42:40 -05:00
Nathan Guse
0141154ceb
[feature/template-events] Indentation fix.
...
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Oleg Pudeyev
6c7f1f7bde
[feature/template-events] Cosmetic changes.
...
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Nathan Guse
4ed9e4124e
[feature/template-events] Wording: wrongly -> improperly.
...
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Nathan Guse
2fb4006056
[feature/template-events] Indentation fix.
...
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Oleg Pudeyev
9c31a0ffc7
[feature/template-events] Rename template_name to style_name.
...
"Style name" makes a lot more sense and should be in line with
recent style/template changes.
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
09b4cf2f4c
[feature/template-events] Report when templates cannot be compiled.
...
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
4b28b413f2
[feature/template-events] Update EVENT tag documentation.
...
It should now fairly closely reflect what actually happens.
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
faf96a1b40
[feature/template-events] Delete old comments/test code.
...
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
bd63b17d00
[feature/template-events] Move comment to the function docblock.
...
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
1b36fc3a60
[feature/template-events] Handle user access correctly.
...
Pass through $user from template to filter.
Allow $user to be null for standalone usage of the template engine.
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
45a1219886
[feature/template-events] Always commit suicide for invalid event names.
...
Note: suicide happens for syntactically invalid event names,
e.g. event names containing punctuation.
Event names for which there are no events are silently dropped.
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Oleg Pudeyev
f46f48a2cf
[feature/template-events] Chase template/style renames and changes.
...
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
7bd5f7641f
[feature/template-events] Fix typo (waring -> warning)
...
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
2add66c0eb
[feature/template-events] Add additional space for editors
...
Use `' ?'. '>'` rather than `' ?>'` as the latter causes problems
in some editors.
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
6fc0c889fd
[feature/template-events] Remove comment
...
Remove comment per Nils in the PR.
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
132bbede2b
[feature/template-events] Handle incorrect template event identifiers
...
If the template event identifier is wrongly formatted phpBB will
triggern an `E_USER_NOTICE` if the `DEBUG` constant is set, otherwise
the location is ignored.
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
f836277638
[feature/template-events] RUNHOOKS -> EVENT
...
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Nathan Guse
04f55ba306
[feature/template-events] Correct indentation
...
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Michael Cullum
8d58e69ed3
[feature/template-events] Rename RUNHOOKS to EVENT
...
Rename the way to add template events
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
ecdb54fc04
[feature/template-events] PHP does not parse <?php?>, avoid generating it.
...
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
bdbb382a26
[feature/template-events] Invoke template hooks that are template-specific.
...
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
a6c7fbc59d
[feature/template-events] Pass top-level template name to template filter.
...
This will be used to invoke template-specific hooks.
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
dd7c5183fb
[feature/template-events] Add template_compile to template filter params.
...
PHPBB3-9550
2012-11-17 16:39:57 -05:00