* p/ticket/10933:
[ticket/10933] Prose for get_first_file_location.
[ticket/10933] Remaining documentation for added functions in resource locator
[ticket/10933] Update template locator test to use style resource locator.
[ticket/10933] Dispose of locate function in template class.
[ticket/10933] Add mutators for template_path to style resource locator.
[ticket/10933] Delete template_path assignment.
[ticket/10933] Delete template_path from template class.
[ticket/10933] Add get_first_template_location.
This was probably necessary all along, and the test happened to work
because state was not correctly reset between test runs and
a previous test set an empty template path.
PHPBB3-10933
A new method to handle this type of path was added and
compile_tag_include, compile_tag_include_php and
compile_tag_include_js were modified to use it appropriately.
Tests were added for these three macros also.
PHPBB3-10970
* upstream/develop:
[ticket/10733] Fixing test
[ticket/10733] Removing static from data providers
[ticket/10731] Fixed addquote() to work on opera browser.
[ticket/10731] Fixed addquote() to work on opera browser.
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
[ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
[ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
[ticket/10675] Add disk full language string when posting attachments
Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)
PHPBB3-10632
This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.
Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.
A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.
PHPBB3-10323
* 'develop' of git://github.com/phpbb/phpbb3:
[ticket/10392] Alter parent namespace stripping.
[ticket/10392] Test for magic loop variables with nested namespaces.
[ticket/10392] Missed fix for S_BLOCK_NAME.
[ticket/10392] Fix access to nested special block variables.
Most template variables can now have their PHP variable name resolved instead
of only compiling directly. This allows for the use of block vars in INCLUDE
statements. This does not work for language variables since they require
multiple checks. Added tests for the new types of allowed INCLUDEs.
PHPBB3-10322