bug #41233 [DependencyInjection][ProxyManagerBridge] Don't call class_exists() on null (derrabus)

nicolas-grekas · nicolas-grekas · commit 9e12a383ee0a · 2021-05-15T10:05:00.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection][ProxyManagerBridge] Don't call class_exists() on null | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A PHP 8.1 complains if we pass `null` to `class_exists()` or `interface_exists()`: > class_exists(): Passing null to parameter `#1` ($class) of type string is deprecated Commits ------- 88520e5 Don't call class_exists() on null
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php
@@ -43,7 +43,7 @@ public function generate(\ReflectionClass $originalClass, ClassGenerator $classG
     public function getProxifiedClass(Definition $definition): ?string
     {
         if (!$definition->hasTag('proxy')) {
-            return class_exists($class = $definition->getClass()) || interface_exists($class, false) ? $class : null;
+            return ($class = $definition->getClass()) && (class_exists($class) || interface_exists($class, false)) ? $class : null;
         }
         if (!$definition->isLazy()) {
             throw new \InvalidArgumentException(sprintf('Invalid definition for service of class "%s": setting the "proxy" tag on a service requires it to be "lazy".', $definition->getClass()));
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -88,8 +88,13 @@ protected function processValue($value, $isRoot = false)
             return parent::processValue($value, $isRoot);
         }
 
-        if (!$this->autoload && !class_exists($class = $value->getClass(), false) && !interface_exists($class, false)) {
-            return parent::processValue($value, $isRoot);
+        if (!$this->autoload) {
+            if (!$class = $value->getClass()) {
+                return parent::processValue($value, $isRoot);
+            }
+            if (!class_exists($class, false) && !interface_exists($class, false)) {
+                return parent::processValue($value, $isRoot);
+            }
         }
 
         if (ServiceLocator::class === $value->getClass()) {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function generate(\ReflectionClass $originalClass, ClassGenerator $classG`
`43`	`43`	`public function getProxifiedClass(Definition $definition): ?string`
`44`	`44`	`{`
`45`	`45`	`if (!$definition->hasTag('proxy')) {`
`46`		`- return class_exists($class = $definition->getClass()) \|\| interface_exists($class, false) ? $class : null;`
	`46`	`+ return ($class = $definition->getClass()) && (class_exists($class) \|\| interface_exists($class, false)) ? $class : null;`
`47`	`47`	`}`
`48`	`48`	`if (!$definition->isLazy()) {`
`49`	`49`	`throw new \InvalidArgumentException(sprintf('Invalid definition for service of class "%s": setting the "proxy" tag on a service requires it to be "lazy".', $definition->getClass()));`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,13 @@ protected function processValue($value, $isRoot = false)`
`88`	`88`	`return parent::processValue($value, $isRoot);`
`89`	`89`	`}`
`90`	`90`
`91`		`- if (!$this->autoload && !class_exists($class = $value->getClass(), false) && !interface_exists($class, false)) {`
`92`		`- return parent::processValue($value, $isRoot);`
	`91`	`+ if (!$this->autoload) {`
	`92`	`+ if (!$class = $value->getClass()) {`
	`93`	`+ return parent::processValue($value, $isRoot);`
	`94`	`+ }`
	`95`	`+ if (!class_exists($class, false) && !interface_exists($class, false)) {`
	`96`	`+ return parent::processValue($value, $isRoot);`
	`97`	`+ }`
`93`	`98`	`}`
`94`	`99`
`95`	`100`	`if (ServiceLocator::class === $value->getClass()) {`