Merged
Conversation
Ported to the new develop, hopefully this is still sensible. PHPBB3-9550
Template class passes extension manager to template compiler. Template compiler passes extension manager to template filter. Template filter will use extension manager to locate hooks as it is compiling templates. All extension manager arguments are optional. If an extension manager is not given, template hooks will not be invoked. PHPBB3-9550
This is needed for hooks in order for the filter to compile template files from extensions. PHPBB3-9550
…ents). PHPBB3-9550
…lter. This will be used to invoke template-specific hooks. PHPBB3-9550
…cific. PHPBB3-9550
…g it. PHPBB3-9550
Rename the way to add template events PHPBB3-9550
PHPBB3-9550
PHPBB3-9550
Adding template events test PHPBB3-9550
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
Remove comment per Nils in the PR. PHPBB3-9550
Use `' ?'. '>'` rather than `' ?>'` as the latter causes problems in some editors. PHPBB3-9550
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
Pass through $user from template to filter. Allow $user to be null for standalone usage of the template engine. PHPBB3-9550
It should now fairly closely reflect what actually happens. PHPBB3-9550
Also drop the irrelevant includejs code and add a simple template event test. The simple test is not working yet however due to the template engine not correctly tracking which template it is rendering. PHPBB3-9550
"Style name" makes a lot more sense and should be in line with recent style/template changes. PHPBB3-9550
PHPBB3-9550
Thank you imkingdavid. PHPBB3-9550
# 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. ...
* p/feature/template-events: [feature/template-events] Pass arguments in correct order. Conflicts: phpBB/includes/style/style.php
…chments PHPBB3-11243
…customise Instead of being separated, these related ACP modules are now grouped intuitively. PHPBB3-11088
PHPBB3-11088
PHPBB3-11088
PHPBB3-11088
This should rename Styles category to Customise, move language packs, and add extension management PHPBB3-11088
…reation PHPBB3-11088
…odules PHPBB3-11088
* imkingdavid/ticket/11088: [ticket/11088] Pass required objects in as arguments [ticket/11088] Globalize objects in new permission function [ticket/11088] Move permission creation to a function [ticket/11088] Copy a_styles permission for a_extensions [ticket/11088] Remove extraneous word from sentence in comment [ticket/11088] Changed "file extensions" to "attachment extensions" [ticket/11088] Fix the database updater to correctly manipulate the modules [ticket/11088] Put language pack module move below extension module creation [ticket/11088] Untested, progress on update script [ticket/11088] Fix typo (period instead of comma) [ticket/11088] Untested progress for update script [ticket/11088] Added missing comma [ticket/11088] Removed added space [ticket/11088] Move style, extension and language pack management to customise
PHPBB3-10491
* p/ticket/10491: [ticket/10491] Make recreate_database static. [ticket/10491] Install board once per test run. [ticket/10491] Move board installation into setup before class. [ticket/10491] Set up functional tests sensibly.
While merging into develop, also move self::$config['table_prefix'] initialization into setup before class from install_board, as install_board is only called to install the board and not for each test case. * develop-olympus: [ticket/10491] Make recreate_database static. [ticket/10491] Install board once per test run. [ticket/10491] Move board installation into setup before class. [ticket/10491] Set up functional tests sensibly. Conflicts: tests/test_framework/phpbb_functional_test_case.php
…lop. PHPBB3-11015
* upstream/develop: (101 commits) [ticket/10491] Make recreate_database static. [ticket/11088] Pass required objects in as arguments [ticket/11088] Globalize objects in new permission function [ticket/11088] Move permission creation to a function [ticket/11088] Copy a_styles permission for a_extensions [ticket/11088] Remove extraneous word from sentence in comment [ticket/11088] Changed "file extensions" to "attachment extensions" [ticket/11088] Fix the database updater to correctly manipulate the modules [ticket/11088] Put language pack module move below extension module creation [ticket/11088] Untested, progress on update script [ticket/11088] Fix typo (period instead of comma) [ticket/11088] Untested progress for update script [ticket/11088] Added missing comma [ticket/11088] Removed added space [ticket/11088] Move style, extension and language pack management to customise [ticket/11243] Show download all link on all pages of topic with attachments [feature/template-events] Pass arguments in correct order. [feature/template-events] Pass arguments in correct order. [ticket/10491] Install board once per test run. [ticket/11257] Do not require set_name() method to exist ...
… sync. PHPBB3-11015
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.