Skip to content

Commit 34eab4e

Browse files
Merge branch '3.4' into 4.0
* 3.4: (37 commits) Remove some unused variables and properties [appveyor] disable memory limit on composer up [HttpFoundation] don't prefix cookies with "Set-Cookie:" Remove some unused variables and properties Fix debug:form definition Remove some unused variables, properties and methods fix some edge cases with indented blocks [ExpressionLanguage] Fix parse error on 5.3 [HttpKernel] remove noisy frame in controller stack traces [DI] Force root-namespace for function calls in the dumper container [DI] Fix circular-aliases message register system cache clearer only if it's used doc : Namespace prefix must end with a "\" [ExpressionLanguage] throw an SyntaxError instead of letting a undefined index notice Prevent a loop in aliases within the `findDefinition` method [HttpKernel] Disable inlining on PHP 5 Ensure that inlined services with parameterized class name can be dumped [DI] Fix non-string class handling in PhpDumper Throw a sensible exception when controller has been removed Remove LOCK_EX That Breaks Cache Usage on NFS ...
2 parents 35df025 + 8c22c97 commit 34eab4e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Command/ContainerDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public function filterToServiceTypes($serviceId)
247247
}
248248

249249
try {
250-
$r = new \ReflectionClass($serviceId);
250+
new \ReflectionClass($serviceId);
251251

252252
return true;
253253
} catch (\ReflectionException $e) {

DependencyInjection/Compiler/CachePoolPass.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ public function process(ContainerBuilder $container)
112112
$clearer->setArgument(0, $pools);
113113
}
114114
$clearer->addTag('cache.pool.clearer');
115+
116+
if ('cache.system_clearer' === $id) {
117+
$clearer->addTag('kernel.cache_clearer');
118+
}
115119
}
116120
}
117121

Resources/config/cache.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@
104104
<argument type="collection" />
105105
</service>
106106

107-
<service id="cache.system_clearer" parent="cache.default_clearer" public="true">
108-
<tag name="kernel.cache_clearer" />
109-
</service>
107+
<service id="cache.system_clearer" parent="cache.default_clearer" public="true" />
110108

111109
<service id="cache.global_clearer" parent="cache.default_clearer" public="true" />
112110
<service id="cache.app_clearer" alias="cache.default_clearer" public="true" />

0 commit comments

Comments
 (0)