symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Util/ServiceTypeHelper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Util/ServiceTypeHelper.php
+12-10Lines changed: 12 additions & 10 deletions b/‎src/Symfony/Component/DependencyInjection/Util/ServiceTypeHelper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Util/ServiceTypeHelper.php
+12-10Lines changed: 12 additions & 10 deletions
@@ -22,7 +22,7 @@
  */
 final class ServiceTypeHelper
 {
-    private static $classNames;
+    private static $classNames = array();
     private $container;
     private $typeMap;
 
@@ -69,12 +69,14 @@ private function populateAvailableTypes()
         };
         spl_autoload_register($throwingAutoloader);
 
-        $this->typeMap = array();
-        foreach ($this->container->getDefinitions() as $id => $definition) {
-            $this->populateAvailableType($id, $definition);
+        try {
+            $this->typeMap = array();
+            foreach ($this->container->getDefinitions() as $id => $definition) {
+                $this->populateAvailableType($id, $definition);
+            }
+        } finally {
+            spl_autoload_unregister($throwingAutoloader);
         }
-
-        spl_autoload_unregister($throwingAutoloader);
     }
 
     /**
@@ -128,16 +130,16 @@ private function getClass(Definition $definition)
 
         // Normalize the class name (`\Foo` -> `Foo`)
         $class = $this->container->getParameterBag()->resolveValue($class);
-        if (isset(self::$classNames[$class])) {
-            return self::$classNames[$class] ?: null;
+        if (array_key_exists($class, self::$classNames)) {
+            return self::$classNames[$class];
         }
 
         try {
             $name = (new \ReflectionClass($class))->name;
         } catch (\ReflectionException $e) {
-            $name = false;
+            $name = null;
         }
 
-        return self::$classNames[$class] = $name ?: null;
+        return self::$classNames[$class] = $name;
     }
 }