Skip to content

Commit 1b68930

Browse files
committed
Merge branch '3.1'
* 3.1: fixed bad merge Fix PHP 7.1 related failures [VarDumper] Fix for 7.1 fixed CS Added class existence check if is_subclass_of() fails in compiler passes Fix the DBAL session handler version check for Postgresql
2 parents ee8b99f + 2c37389 commit 1b68930

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

CacheWarmer/CacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ abstract class CacheWarmer implements CacheWarmerInterface
2020
{
2121
protected function writeCacheFile($file, $content)
2222
{
23-
$tmpFile = tempnam(dirname($file), basename($file));
23+
$tmpFile = @tempnam(dirname($file), basename($file));
2424
if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
2525
@chmod($file, 0666 & ~umask());
2626

DependencyInjection/FragmentRendererPass.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ public function process(ContainerBuilder $container)
5353

5454
$class = $container->getParameterBag()->resolveValue($def->getClass());
5555
$interface = 'Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface';
56+
5657
if (!is_subclass_of($class, $interface)) {
58+
if (!class_exists($class, false)) {
59+
throw new \InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
60+
}
61+
5762
throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
5863
}
5964

0 commit comments

Comments
 (0)