aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-11-15 18:21:38 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-11-15 18:21:38 +0100
commit4db6ded8f0bccdd8684bd869d4779bd98bff69de (patch)
treef9e5c48403a186c95be64ef284efe07a0d91678a /phpBB/includes
parent60d831c392a78fceb4ae737a3141573c4b2427d8 (diff)
parentceae276cd6fb82ed2b4403cea0cb54f3be5a5b6d (diff)
downloadforums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar
forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar.gz
forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar.bz2
forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar.xz
forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3: [ticket/11198] Remove additional asterix as /** is doc-block only [ticket/11200] Add a reminder comment. [ticket/11200] Make cache available during container construction [ticket/11199] Match cache purge container files against container_* [ticket/11199] Purge dumped container correctly on cache purge. [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop [ticket/11199] Cache purge does not remove dumped container [ticket/11198] Store the swapping partners in vars and simplify the logic [ticket/11198] Correctly set links after an item is moved up/down with AJAX [ticket/11197] Prefix the css classes for the small arrow with "arrow" [ticket/10879] Remove arrow icon from attachment link in editor [ticket/11195] Condense logic, remove improperly formatted if() [ticket/11194] Service tag data is stored in an array so access it correctly [ticket/11193] Instantiate a single collection_pass for all collections [ticket/11190-develop] Functional tests purge cache before running. [ticket/11190] Functional tests purge cache before running.
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/cache/driver/file.php2
-rw-r--r--phpBB/includes/cache/driver/memory.php2
-rw-r--r--phpBB/includes/di/pass/collection_pass.php25
-rw-r--r--phpBB/includes/functions_container.php16
4 files changed, 23 insertions, 22 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php
index b20c0064ea..32bdb1918a 100644
--- a/phpBB/includes/cache/driver/file.php
+++ b/phpBB/includes/cache/driver/file.php
@@ -214,7 +214,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
while (($entry = readdir($dir)) !== false)
{
- if (strpos($entry, 'container') !== 0 &&
+ if (strpos($entry, 'container_') !== 0 &&
strpos($entry, 'sql_') !== 0 &&
strpos($entry, 'data_') !== 0 &&
strpos($entry, 'ctpl_') !== 0 &&
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php
index 98ac02b161..1ea9a3e9e7 100644
--- a/phpBB/includes/cache/driver/memory.php
+++ b/phpBB/includes/cache/driver/memory.php
@@ -162,7 +162,7 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base
while (($entry = readdir($dir)) !== false)
{
- if (strpos($entry, 'container') !== 0 &&
+ if (strpos($entry, 'container_') !== 0 &&
strpos($entry, 'sql_') !== 0 &&
strpos($entry, 'data_') !== 0 &&
strpos($entry, 'ctpl_') !== 0 &&
diff --git a/phpBB/includes/di/pass/collection_pass.php b/phpBB/includes/di/pass/collection_pass.php
index 70a44d1d51..63a5c7dfc4 100644
--- a/phpBB/includes/di/pass/collection_pass.php
+++ b/phpBB/includes/di/pass/collection_pass.php
@@ -18,17 +18,13 @@ if (!defined('IN_PHPBB'))
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+/**
+* Appends an add method call to the definition of each collection service for
+* the services tagged with the appropriate name defined in the collection's
+* service_collection tag.
+*/
class phpbb_di_pass_collection_pass implements CompilerPassInterface
{
- private $collection_service;
- private $service_tag;
-
- public function __construct($collection_service, $service_tag)
- {
- $this->collection_service = $collection_service;
- $this->service_tag = $service_tag;
- }
-
/**
* Modify the container before it is passed to the rest of the code
*
@@ -37,11 +33,14 @@ class phpbb_di_pass_collection_pass implements CompilerPassInterface
*/
public function process(ContainerBuilder $container)
{
- $definition = $container->getDefinition($this->collection_service);
-
- foreach ($container->findTaggedServiceIds($this->service_tag) as $id => $data)
+ foreach ($container->findTaggedServiceIds('service_collection') as $id => $data)
{
- $definition->addMethodCall('add', array($id));
+ $definition = $container->getDefinition($id);
+
+ foreach ($container->findTaggedServiceIds($data[0]['tag']) as $service_id => $service_data)
+ {
+ $definition->addMethodCall('add', array($service_id));
+ }
}
}
}
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 1de1d9f7ea..8014574443 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -84,8 +84,13 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb
$tmp_container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
$tmp_container->compile();
+ // XXX stop writing to global $cache when
+ // http://tracker.phpbb.com/browse/PHPBB3-11203 is fixed
+ $GLOBALS['cache'] = $tmp_container->get('cache');
+ $installed_exts = $tmp_container->get('ext.manager')->all_enabled();
+
// Now pass the enabled extension paths into the ext compiler extension
- $extensions[] = new phpbb_di_extension_ext($tmp_container->get('ext.manager')->all_enabled());
+ $extensions[] = new phpbb_di_extension_ext($installed_exts);
// Create the final container to be compiled and cached
$container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
@@ -126,15 +131,12 @@ function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_
function phpbb_create_dumped_container_unless_debug(array $extensions, array $passes, $phpbb_root_path, $php_ext)
{
- if (defined('DEBUG')) {
- return phpbb_create_compiled_container($extensions, $passes, $phpbb_root_path, $php_ext);
- }
-
- return phpbb_create_dumped_container($extensions, $passes, $phpbb_root_path, $php_ext);
+ $container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container';
+ return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext);
}
function phpbb_container_filename($phpbb_root_path, $php_ext)
{
$filename = str_replace(array('/', '.'), array('slash', 'dot'), $phpbb_root_path);
- return $phpbb_root_path . 'cache/' . $filename . '_container.' . $php_ext;
+ return $phpbb_root_path . 'cache/container_' . $filename . '.' . $php_ext;
}
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-26 02:40:19 +0000