Skip to content

Commit 7997985

Browse files
Merge branch '3.0'
* 3.0: (28 commits) [Console] Fix an autocompletion question helper issue with non-sequentially indexed choices [Process] Fix pipes handling [Finder] Partially revert #17134 to fix a regression Mentioned the deprecation of deep parameters in UPGRADE files [HttpKernel] Fix mem usage when stripping the prod container [Filesystem] Fix false positive in ->remove() [Filesystem] Cleanup/sync with 2.3 [Validator] Fix the locale validator so it treats a locale alias as a valid locale [HttpFoundation] Fix transient test [HttpFoundation] Add a dependency on the mbstring polyfill [2.7] update readme files for new components add readme files where missing [2.8] update readme files for new components fix lowest TwigBridge deps versions reference form type by name on Symfony 2.7 [EventDispatcher] fix syntax error Don't use reflections when possible Don't use reflections when possible [Form] Update form tests after the ICU data update [Intl] Update tests and the number formatter to match behaviour of the intl extension ... Conflicts: src/Symfony/Component/Ldap/README.md src/Symfony/Component/Security/Core/README.md src/Symfony/Component/Security/Csrf/README.md src/Symfony/Component/Security/Http/README.md
2 parents 6484625 + c78ea6b commit 7997985

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

DataCollector/ConfigDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function collect(Request $request, Response $response, \Exception $except
7575
'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
7676
'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
7777
'bundles' => array(),
78-
'sapi_name' => php_sapi_name(),
78+
'sapi_name' => PHP_SAPI,
7979
);
8080

8181
if (isset($this->kernel)) {

DependencyInjection/FragmentRendererPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public function process(ContainerBuilder $container)
5151
throw new \InvalidArgumentException(sprintf('The service "%s" must not be abstract as fragment renderer are lazy-loaded.', $id));
5252
}
5353

54-
$refClass = new \ReflectionClass($container->getParameterBag()->resolveValue($def->getClass()));
54+
$class = $container->getParameterBag()->resolveValue($def->getClass());
5555
$interface = 'Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface';
56-
if (!$refClass->implementsInterface($interface)) {
56+
if (!is_subclass_of($class, $interface)) {
5757
throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
5858
}
5959

Kernel.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -629,10 +629,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
629629
$dumper->setProxyDumper(new ProxyDumper(md5($cache->getPath())));
630630
}
631631

632-
$content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath()));
633-
if (!$this->debug) {
634-
$content = static::stripComments($content);
635-
}
632+
$content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath(), 'debug' => $this->debug));
636633

637634
$cache->write($content, $container->getResources());
638635
}

0 commit comments

Comments
 (0)