Merge pull request #196 from smuggli/optimize_opcodes

Ocramius · web-flow · commit 1afca738d66d · 2017-08-01T13:39:28.000+02:00
Optimize PHP function calls
diff --git a/src/AbstractFactory/ConfigAbstractFactory.php b/src/AbstractFactory/ConfigAbstractFactory.php
@@ -27,13 +27,13 @@ final class ConfigAbstractFactory implements AbstractFactoryInterface
      */
     public function canCreate(\Interop\Container\ContainerInterface $container, $requestedName)
     {
-        if (! $container->has('config') || ! array_key_exists(self::class, $container->get('config'))) {
+        if (! $container->has('config') || ! \array_key_exists(self::class, $container->get('config'))) {
             return false;
         }
         $config = $container->get('config');
         $dependencies = $config[self::class];
 
-        return is_array($dependencies) && array_key_exists($requestedName, $dependencies);
+        return \is_array($dependencies) && \array_key_exists($requestedName, $dependencies);
     }
 
     /**
@@ -47,31 +47,31 @@ public function __invoke(\Interop\Container\ContainerInterface $container, $requ
 
         $config = $container->get('config');
 
-        if (! (is_array($config) || $config instanceof ArrayObject)) {
+        if (! (\is_array($config) || $config instanceof ArrayObject)) {
             throw new ServiceNotCreatedException('Config must be an array or an instance of ArrayObject');
         }
 
-        if (! array_key_exists(self::class, $config)) {
+        if (! \array_key_exists(self::class, $config)) {
             throw new ServiceNotCreatedException('Cannot find a `' . self::class . '` key in the config array');
         }
 
         $dependencies = $config[self::class];
 
-        if (! is_array($dependencies)
-            || ! array_key_exists($requestedName, $dependencies)
-            || ! is_array($dependencies[$requestedName])
+        if (! \is_array($dependencies)
+            || ! \array_key_exists($requestedName, $dependencies)
+            || ! \is_array($dependencies[$requestedName])
         ) {
             throw new ServiceNotCreatedException('Dependencies config must exist and be an array');
         }
 
         $serviceDependencies = $dependencies[$requestedName];
 
-        if ($serviceDependencies !== array_values(array_map('strval', $serviceDependencies))) {
-            $problem = json_encode(array_map('gettype', $serviceDependencies));
+        if ($serviceDependencies !== \array_values(\array_map('strval', $serviceDependencies))) {
+            $problem = \json_encode(\array_map('gettype', $serviceDependencies));
             throw new ServiceNotCreatedException('Service message must be an array of strings, ' . $problem . ' given');
         }
 
-        $arguments = array_map([$container, 'get'], $serviceDependencies);
+        $arguments = \array_map([$container, 'get'], $serviceDependencies);
 
         return new $requestedName(...$arguments);
     }
diff --git a/src/AbstractFactory/ReflectionBasedAbstractFactory.php b/src/AbstractFactory/ReflectionBasedAbstractFactory.php
@@ -220,7 +220,7 @@ private function resolveParameter(ReflectionParameter $parameter, ContainerInter
         }
 
         $type = $parameter->getClass()->getName();
-        $type = isset($this->aliases[$type]) ? $this->aliases[$type] : $type;
+        $type = $this->aliases[$type] ?? $type;
 
         if (! $container->has($type)) {
             throw new ServiceNotFoundException(sprintf(
diff --git a/src/Config.php b/src/Config.php
@@ -68,7 +68,7 @@ class Config implements ConfigInterface
     public function __construct(array $config = [])
     {
         // Only merge keys we're interested in
-        foreach (array_keys($config) as $key) {
+        foreach (\array_keys($config) as $key) {
             if (! isset($this->allowedKeys[$key])) {
                 unset($config[$key]);
             }
@@ -103,12 +103,12 @@ private function merge(array $a, array $b)
         foreach ($b as $key => $value) {
             if ($value instanceof MergeReplaceKeyInterface) {
                 $a[$key] = $value->getData();
-            } elseif (isset($a[$key]) || array_key_exists($key, $a)) {
+            } elseif (isset($a[$key]) || \array_key_exists($key, $a)) {
                 if ($value instanceof MergeRemoveKey) {
                     unset($a[$key]);
-                } elseif (is_int($key)) {
+                } elseif (\is_int($key)) {
                     $a[] = $value;
-                } elseif (is_array($value) && is_array($a[$key])) {
+                } elseif (\is_array($value) && \is_array($a[$key])) {
                     $a[$key] = $this->merge($a[$key], $value);
                 } else {
                     $a[$key] = $value;
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -199,7 +199,7 @@ public function get($name)
             return $this->services[$requestedName];
         }
 
-        $name = isset($this->resolvedAliases[$name]) ? $this->resolvedAliases[$name] : $name;
+        $name = $this->resolvedAliases[$name] ?? $name;
 
         // Next, if the alias should be shared, and we have cached the resolved
         // service, use it.
@@ -239,7 +239,7 @@ public function get($name)
     public function build($name, array $options = null)
     {
         // We never cache when using "build"
-        $name = isset($this->resolvedAliases[$name]) ? $this->resolvedAliases[$name] : $name;
+        $name = $this->resolvedAliases[$name] ?? $name;
         return $this->doCreate($name, $options);
     }
 
@@ -248,7 +248,7 @@ public function build($name, array $options = null)
      */
     public function has($name)
     {
-        $name  = isset($this->resolvedAliases[$name]) ? $this->resolvedAliases[$name] : $name;
+        $name  = $this->resolvedAliases[$name] ?? $name;
         $found = isset($this->services[$name]) || isset($this->factories[$name]);
 
         if ($found) {
@@ -339,12 +339,12 @@ public function configure(array $config)
 
             if (! empty($aliases)) {
                 $config['aliases'] = (isset($config['aliases']))
-                    ? array_merge($config['aliases'], $aliases)
+                    ? \array_merge($config['aliases'], $aliases)
                     : $aliases;
             }
 
             $config['factories'] = (isset($config['factories']))
-                ? array_merge($config['factories'], $factories)
+                ? \array_merge($config['factories'], $factories)
                 : $factories;
         }
 
@@ -353,7 +353,7 @@ public function configure(array $config)
         }
 
         if (isset($config['delegators'])) {
-            $this->delegators = array_merge_recursive($this->delegators, $config['delegators']);
+            $this->delegators = \array_merge_recursive($this->delegators, $config['delegators']);
         }
 
         if (isset($config['shared'])) {
@@ -373,7 +373,7 @@ public function configure(array $config)
         // If lazy service configuration was provided, reset the lazy services
         // delegator factory.
         if (isset($config['lazy_services']) && ! empty($config['lazy_services'])) {
-            $this->lazyServices          = array_merge_recursive($this->lazyServices, $config['lazy_services']);
+            $this->lazyServices          = \array_merge_recursive($this->lazyServices, $config['lazy_services']);
             $this->lazyServicesDelegator = null;
         }
 
@@ -532,7 +532,7 @@ public function setShared($name, $flag)
     private function resolveAbstractFactories(array $abstractFactories)
     {
         foreach ($abstractFactories as $abstractFactory) {
-            if (is_string($abstractFactory) && class_exists($abstractFactory)) {
+            if (\is_string($abstractFactory) && \class_exists($abstractFactory)) {
                 //Cached string
                 if (! isset($this->cachedAbstractFactories[$abstractFactory])) {
                     $this->cachedAbstractFactories[$abstractFactory] = new $abstractFactory();
@@ -542,15 +542,15 @@ private function resolveAbstractFactories(array $abstractFactories)
             }
 
             if ($abstractFactory instanceof Factory\AbstractFactoryInterface) {
-                $abstractFactoryObjHash = spl_object_hash($abstractFactory);
+                $abstractFactoryObjHash = \spl_object_hash($abstractFactory);
                 $this->abstractFactories[$abstractFactoryObjHash] = $abstractFactory;
                 continue;
             }
 
             // Error condition; let's find out why.
 
             // If we still have a string, we have a class name that does not resolve
-            if (is_string($abstractFactory)) {
+            if (\is_string($abstractFactory)) {
                 throw new InvalidArgumentException(
                     sprintf(
                         'An invalid abstract factory was registered; resolved to class "%s" ' .
@@ -584,18 +584,18 @@ private function resolveAbstractFactories(array $abstractFactories)
     private function resolveInitializers(array $initializers)
     {
         foreach ($initializers as $initializer) {
-            if (is_string($initializer) && class_exists($initializer)) {
+            if (\is_string($initializer) && \class_exists($initializer)) {
                 $initializer = new $initializer();
             }
 
-            if (is_callable($initializer)) {
+            if (\is_callable($initializer)) {
                 $this->initializers[] = $initializer;
                 continue;
             }
 
             // Error condition; let's find out why.
 
-            if (is_string($initializer)) {
+            if (\is_string($initializer)) {
                 throw new InvalidArgumentException(
                     sprintf(
                         'An invalid initializer was registered; resolved to class or function "%s" ' .
@@ -672,15 +672,15 @@ private function resolveNewAliasesWithPreviouslyResolvedAliases(array $aliases)
      */
     private function getFactory($name)
     {
-        $factory = isset($this->factories[$name]) ? $this->factories[$name] : null;
+        $factory = $this->factories[$name] ?? null;
 
         $lazyLoaded = false;
-        if (is_string($factory) && class_exists($factory)) {
+        if (\is_string($factory) && \class_exists($factory)) {
             $factory = new $factory();
             $lazyLoaded = true;
         }
 
-        if (is_callable($factory)) {
+        if (\is_callable($factory)) {
             if ($lazyLoaded) {
                 $this->factories[$name] = $factory;
             }
@@ -720,13 +720,13 @@ private function createDelegatorFromName($name, array $options = null)
                 $delegatorFactory = $this->createLazyServiceDelegatorFactory();
             }
 
-            if (is_string($delegatorFactory) && class_exists($delegatorFactory)) {
+            if (\is_string($delegatorFactory) && \class_exists($delegatorFactory)) {
                 $delegatorFactory = new $delegatorFactory();
             }
 
-            if (! is_callable($delegatorFactory)) {
-                if (is_string($delegatorFactory)) {
-                    throw new ServiceNotCreatedException(sprintf(
+            if (! \is_callable($delegatorFactory)) {
+                if (\is_string($delegatorFactory)) {
+                    throw new ServiceNotCreatedException(\sprintf(
                         'An invalid delegator factory was registered; resolved to class or function "%s" '
                         . 'which does not exist; please provide a valid function name or class name resolving '
                         . 'to an implementation of %s',
@@ -735,9 +735,9 @@ private function createDelegatorFromName($name, array $options = null)
                     ));
                 }
 
-                throw new ServiceNotCreatedException(sprintf(
+                throw new ServiceNotCreatedException(\sprintf(
                     'A non-callable delegator, "%s", was provided; expected a callable or instance of "%s"',
-                    is_object($delegatorFactory) ? get_class($delegatorFactory) : gettype($delegatorFactory),
+                    \is_object($delegatorFactory) ? \get_class($delegatorFactory) : \gettype($delegatorFactory),
                     DelegatorFactoryInterface::class
                 ));
             }
@@ -830,7 +830,7 @@ private function createLazyServiceDelegatorFactory()
             ));
         }
 
-        spl_autoload_register($factoryConfig->getProxyAutoloader());
+        \spl_autoload_register($factoryConfig->getProxyAutoloader());
 
         $this->lazyServicesDelegator = new Proxy\LazyServiceFactory(
             new LazyLoadingValueHolderFactory($factoryConfig),
@@ -908,31 +908,31 @@ private function validateOverrides(array $config)
         }
 
         if (isset($config['services'])) {
-            $this->validateOverrideSet(array_keys($config['services']), 'service');
+            $this->validateOverrideSet(\array_keys($config['services']), 'service');
         }
 
         if (isset($config['aliases'])) {
-            $this->validateOverrideSet(array_keys($config['aliases']), 'alias');
+            $this->validateOverrideSet(\array_keys($config['aliases']), 'alias');
         }
 
         if (isset($config['invokables'])) {
-            $this->validateOverrideSet(array_keys($config['invokables']), 'invokable class');
+            $this->validateOverrideSet(\array_keys($config['invokables']), 'invokable class');
         }
 
         if (isset($config['factories'])) {
-            $this->validateOverrideSet(array_keys($config['factories']), 'factory');
+            $this->validateOverrideSet(\array_keys($config['factories']), 'factory');
         }
 
         if (isset($config['delegators'])) {
-            $this->validateOverrideSet(array_keys($config['delegators']), 'delegator');
+            $this->validateOverrideSet(\array_keys($config['delegators']), 'delegator');
         }
 
         if (isset($config['shared'])) {
-            $this->validateOverrideSet(array_keys($config['shared']), 'sharing rule');
+            $this->validateOverrideSet(\array_keys($config['shared']), 'sharing rule');
         }
 
         if (isset($config['lazy_services']['class_map'])) {
-            $this->validateOverrideSet(array_keys($config['lazy_services']['class_map']), 'lazy service');
+            $this->validateOverrideSet(\array_keys($config['lazy_services']['class_map']), 'lazy service');
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ final class ConfigAbstractFactory implements AbstractFactoryInterface`
`27`	`27`	`*/`
`28`	`28`	`public function canCreate(\Interop\Container\ContainerInterface $container, $requestedName)`
`29`	`29`	`{`
`30`		`- if (! $container->has('config') \|\| ! array_key_exists(self::class, $container->get('config'))) {`
	`30`	`+ if (! $container->has('config') \|\| ! \array_key_exists(self::class, $container->get('config'))) {`
`31`	`31`	`return false;`
`32`	`32`	`}`
`33`	`33`	`$config = $container->get('config');`
`34`	`34`	`$dependencies = $config[self::class];`
`35`	`35`
`36`		`- return is_array($dependencies) && array_key_exists($requestedName, $dependencies);`
	`36`	`+ return \is_array($dependencies) && \array_key_exists($requestedName, $dependencies);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`@@ -47,31 +47,31 @@ public function __invoke(\Interop\Container\ContainerInterface $container, $requ`
`47`	`47`
`48`	`48`	`$config = $container->get('config');`
`49`	`49`
`50`		`- if (! (is_array($config) \|\| $config instanceof ArrayObject)) {`
	`50`	`+ if (! (\is_array($config) \|\| $config instanceof ArrayObject)) {`
`51`	`51`	`throw new ServiceNotCreatedException('Config must be an array or an instance of ArrayObject');`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (! array_key_exists(self::class, $config)) {`
	`54`	`+ if (! \array_key_exists(self::class, $config)) {`
`55`	`55`	throw new ServiceNotCreatedException('Cannot find a `' . self::class . '` key in the config array');
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`$dependencies = $config[self::class];`
`59`	`59`
`60`		`- if (! is_array($dependencies)`
`61`		`- \|\| ! array_key_exists($requestedName, $dependencies)`
`62`		`- \|\| ! is_array($dependencies[$requestedName])`
	`60`	`+ if (! \is_array($dependencies)`
	`61`	`+ \|\| ! \array_key_exists($requestedName, $dependencies)`
	`62`	`+ \|\| ! \is_array($dependencies[$requestedName])`
`63`	`63`	`) {`
`64`	`64`	`throw new ServiceNotCreatedException('Dependencies config must exist and be an array');`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`$serviceDependencies = $dependencies[$requestedName];`
`68`	`68`
`69`		`- if ($serviceDependencies !== array_values(array_map('strval', $serviceDependencies))) {`
`70`		`- $problem = json_encode(array_map('gettype', $serviceDependencies));`
	`69`	`+ if ($serviceDependencies !== \array_values(\array_map('strval', $serviceDependencies))) {`
	`70`	`+ $problem = \json_encode(\array_map('gettype', $serviceDependencies));`
`71`	`71`	`throw new ServiceNotCreatedException('Service message must be an array of strings, ' . $problem . ' given');`
`72`	`72`	`}`
`73`	`73`
`74`		`- $arguments = array_map([$container, 'get'], $serviceDependencies);`
	`74`	`+ $arguments = \array_map([$container, 'get'], $serviceDependencies);`
`75`	`75`
`76`	`76`	`return new $requestedName(...$arguments);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ private function resolveParameter(ReflectionParameter $parameter, ContainerInter`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`$type = $parameter->getClass()->getName();`
`223`		`- $type = isset($this->aliases[$type]) ? $this->aliases[$type] : $type;`
	`223`	`+ $type = $this->aliases[$type] ?? $type;`
`224`	`224`
`225`	`225`	`if (! $container->has($type)) {`
`226`	`226`	`throw new ServiceNotFoundException(sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function get($name)`
`199`	`199`	`return $this->services[$requestedName];`
`200`	`200`	`}`
`201`	`201`
`202`		`- $name = isset($this->resolvedAliases[$name]) ? $this->resolvedAliases[$name] : $name;`
	`202`	`+ $name = $this->resolvedAliases[$name] ?? $name;`
`203`	`203`
`204`	`204`	`// Next, if the alias should be shared, and we have cached the resolved`
`205`	`205`	`// service, use it.`
`@@ -239,7 +239,7 @@ public function get($name)`
`239`	`239`	`public function build($name, array $options = null)`
`240`	`240`	`{`
`241`	`241`	`// We never cache when using "build"`
`242`		`- $name = isset($this->resolvedAliases[$name]) ? $this->resolvedAliases[$name] : $name;`
	`242`	`+ $name = $this->resolvedAliases[$name] ?? $name;`
`243`	`243`	`return $this->doCreate($name, $options);`
`244`	`244`	`}`
`245`	`245`
`@@ -248,7 +248,7 @@ public function build($name, array $options = null)`
`248`	`248`	`*/`
`249`	`249`	`public function has($name)`
`250`	`250`	`{`
`251`		`- $name = isset($this->resolvedAliases[$name]) ? $this->resolvedAliases[$name] : $name;`
	`251`	`+ $name = $this->resolvedAliases[$name] ?? $name;`
`252`	`252`	`$found = isset($this->services[$name]) \|\| isset($this->factories[$name]);`
`253`	`253`
`254`	`254`	`if ($found) {`
`@@ -339,12 +339,12 @@ public function configure(array $config)`
`339`	`339`
`340`	`340`	`if (! empty($aliases)) {`
`341`	`341`	`$config['aliases'] = (isset($config['aliases']))`
`342`		`- ? array_merge($config['aliases'], $aliases)`
	`342`	`+ ? \array_merge($config['aliases'], $aliases)`
`343`	`343`	`: $aliases;`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`$config['factories'] = (isset($config['factories']))`
`347`		`- ? array_merge($config['factories'], $factories)`
	`347`	`+ ? \array_merge($config['factories'], $factories)`
`348`	`348`	`: $factories;`
`349`	`349`	`}`
`350`	`350`
`@@ -353,7 +353,7 @@ public function configure(array $config)`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`if (isset($config['delegators'])) {`
`356`		`- $this->delegators = array_merge_recursive($this->delegators, $config['delegators']);`
	`356`	`+ $this->delegators = \array_merge_recursive($this->delegators, $config['delegators']);`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`if (isset($config['shared'])) {`
`@@ -373,7 +373,7 @@ public function configure(array $config)`
`373`	`373`	`// If lazy service configuration was provided, reset the lazy services`
`374`	`374`	`// delegator factory.`
`375`	`375`	`if (isset($config['lazy_services']) && ! empty($config['lazy_services'])) {`
`376`		`- $this->lazyServices = array_merge_recursive($this->lazyServices, $config['lazy_services']);`
	`376`	`+ $this->lazyServices = \array_merge_recursive($this->lazyServices, $config['lazy_services']);`
`377`	`377`	`$this->lazyServicesDelegator = null;`
`378`	`378`	`}`
`379`	`379`
`@@ -532,7 +532,7 @@ public function setShared($name, $flag)`
`532`	`532`	`private function resolveAbstractFactories(array $abstractFactories)`
`533`	`533`	`{`
`534`	`534`	`foreach ($abstractFactories as $abstractFactory) {`
`535`		`- if (is_string($abstractFactory) && class_exists($abstractFactory)) {`
	`535`	`+ if (\is_string($abstractFactory) && \class_exists($abstractFactory)) {`
`536`	`536`	`//Cached string`
`537`	`537`	`if (! isset($this->cachedAbstractFactories[$abstractFactory])) {`
`538`	`538`	`$this->cachedAbstractFactories[$abstractFactory] = new $abstractFactory();`
`@@ -542,15 +542,15 @@ private function resolveAbstractFactories(array $abstractFactories)`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`if ($abstractFactory instanceof Factory\AbstractFactoryInterface) {`
`545`		`- $abstractFactoryObjHash = spl_object_hash($abstractFactory);`
	`545`	`+ $abstractFactoryObjHash = \spl_object_hash($abstractFactory);`
`546`	`546`	`$this->abstractFactories[$abstractFactoryObjHash] = $abstractFactory;`
`547`	`547`	`continue;`
`548`	`548`	`}`
`549`	`549`
`550`	`550`	`// Error condition; let's find out why.`
`551`	`551`
`552`	`552`	`// If we still have a string, we have a class name that does not resolve`
`553`		`- if (is_string($abstractFactory)) {`
	`553`	`+ if (\is_string($abstractFactory)) {`
`554`	`554`	`throw new InvalidArgumentException(`
`555`	`555`	`sprintf(`
`556`	`556`	`'An invalid abstract factory was registered; resolved to class "%s" ' .`
`@@ -584,18 +584,18 @@ private function resolveAbstractFactories(array $abstractFactories)`
`584`	`584`	`private function resolveInitializers(array $initializers)`
`585`	`585`	`{`
`586`	`586`	`foreach ($initializers as $initializer) {`
`587`		`- if (is_string($initializer) && class_exists($initializer)) {`
	`587`	`+ if (\is_string($initializer) && \class_exists($initializer)) {`
`588`	`588`	`$initializer = new $initializer();`
`589`	`589`	`}`
`590`	`590`
`591`		`- if (is_callable($initializer)) {`
	`591`	`+ if (\is_callable($initializer)) {`
`592`	`592`	`$this->initializers[] = $initializer;`
`593`	`593`	`continue;`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`// Error condition; let's find out why.`
`597`	`597`
`598`		`- if (is_string($initializer)) {`
	`598`	`+ if (\is_string($initializer)) {`
`599`	`599`	`throw new InvalidArgumentException(`
`600`	`600`	`sprintf(`
`601`	`601`	`'An invalid initializer was registered; resolved to class or function "%s" ' .`
`@@ -672,15 +672,15 @@ private function resolveNewAliasesWithPreviouslyResolvedAliases(array $aliases)`
`672`	`672`	`*/`
`673`	`673`	`private function getFactory($name)`
`674`	`674`	`{`
`675`		`- $factory = isset($this->factories[$name]) ? $this->factories[$name] : null;`
	`675`	`+ $factory = $this->factories[$name] ?? null;`
`676`	`676`
`677`	`677`	`$lazyLoaded = false;`
`678`		`- if (is_string($factory) && class_exists($factory)) {`
	`678`	`+ if (\is_string($factory) && \class_exists($factory)) {`
`679`	`679`	`$factory = new $factory();`
`680`	`680`	`$lazyLoaded = true;`
`681`	`681`	`}`
`682`	`682`
`683`		`- if (is_callable($factory)) {`
	`683`	`+ if (\is_callable($factory)) {`
`684`	`684`	`if ($lazyLoaded) {`
`685`	`685`	`$this->factories[$name] = $factory;`
`686`	`686`	`}`
`@@ -720,13 +720,13 @@ private function createDelegatorFromName($name, array $options = null)`
`720`	`720`	`$delegatorFactory = $this->createLazyServiceDelegatorFactory();`
`721`	`721`	`}`
`722`	`722`
`723`		`- if (is_string($delegatorFactory) && class_exists($delegatorFactory)) {`
	`723`	`+ if (\is_string($delegatorFactory) && \class_exists($delegatorFactory)) {`
`724`	`724`	`$delegatorFactory = new $delegatorFactory();`
`725`	`725`	`}`
`726`	`726`
`727`		`- if (! is_callable($delegatorFactory)) {`
`728`		`- if (is_string($delegatorFactory)) {`
`729`		`- throw new ServiceNotCreatedException(sprintf(`
	`727`	`+ if (! \is_callable($delegatorFactory)) {`
	`728`	`+ if (\is_string($delegatorFactory)) {`
	`729`	`+ throw new ServiceNotCreatedException(\sprintf(`
`730`	`730`	`'An invalid delegator factory was registered; resolved to class or function "%s" '`
`731`	`731`	`. 'which does not exist; please provide a valid function name or class name resolving '`
`732`	`732`	`. 'to an implementation of %s',`
`@@ -735,9 +735,9 @@ private function createDelegatorFromName($name, array $options = null)`
`735`	`735`	`));`
`736`	`736`	`}`
`737`	`737`
`738`		`- throw new ServiceNotCreatedException(sprintf(`
	`738`	`+ throw new ServiceNotCreatedException(\sprintf(`
`739`	`739`	`'A non-callable delegator, "%s", was provided; expected a callable or instance of "%s"',`
`740`		`- is_object($delegatorFactory) ? get_class($delegatorFactory) : gettype($delegatorFactory),`
	`740`	`+ \is_object($delegatorFactory) ? \get_class($delegatorFactory) : \gettype($delegatorFactory),`
`741`	`741`	`DelegatorFactoryInterface::class`
`742`	`742`	`));`
`743`	`743`	`}`
`@@ -830,7 +830,7 @@ private function createLazyServiceDelegatorFactory()`
`830`	`830`	`));`
`831`	`831`	`}`
`832`	`832`
`833`		`- spl_autoload_register($factoryConfig->getProxyAutoloader());`
	`833`	`+ \spl_autoload_register($factoryConfig->getProxyAutoloader());`
`834`	`834`
`835`	`835`	`$this->lazyServicesDelegator = new Proxy\LazyServiceFactory(`
`836`	`836`	`new LazyLoadingValueHolderFactory($factoryConfig),`
`@@ -908,31 +908,31 @@ private function validateOverrides(array $config)`
`908`	`908`	`}`
`909`	`909`
`910`	`910`	`if (isset($config['services'])) {`
`911`		`- $this->validateOverrideSet(array_keys($config['services']), 'service');`
	`911`	`+ $this->validateOverrideSet(\array_keys($config['services']), 'service');`
`912`	`912`	`}`
`913`	`913`
`914`	`914`	`if (isset($config['aliases'])) {`
`915`		`- $this->validateOverrideSet(array_keys($config['aliases']), 'alias');`
	`915`	`+ $this->validateOverrideSet(\array_keys($config['aliases']), 'alias');`
`916`	`916`	`}`
`917`	`917`
`918`	`918`	`if (isset($config['invokables'])) {`
`919`		`- $this->validateOverrideSet(array_keys($config['invokables']), 'invokable class');`
	`919`	`+ $this->validateOverrideSet(\array_keys($config['invokables']), 'invokable class');`
`920`	`920`	`}`
`921`	`921`
`922`	`922`	`if (isset($config['factories'])) {`
`923`		`- $this->validateOverrideSet(array_keys($config['factories']), 'factory');`
	`923`	`+ $this->validateOverrideSet(\array_keys($config['factories']), 'factory');`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`if (isset($config['delegators'])) {`
`927`		`- $this->validateOverrideSet(array_keys($config['delegators']), 'delegator');`
	`927`	`+ $this->validateOverrideSet(\array_keys($config['delegators']), 'delegator');`
`928`	`928`	`}`
`929`	`929`
`930`	`930`	`if (isset($config['shared'])) {`
`931`		`- $this->validateOverrideSet(array_keys($config['shared']), 'sharing rule');`
	`931`	`+ $this->validateOverrideSet(\array_keys($config['shared']), 'sharing rule');`
`932`	`932`	`}`
`933`	`933`
`934`	`934`	`if (isset($config['lazy_services']['class_map'])) {`
`935`		`- $this->validateOverrideSet(array_keys($config['lazy_services']['class_map']), 'lazy service');`
	`935`	`+ $this->validateOverrideSet(\array_keys($config['lazy_services']['class_map']), 'lazy service');`
`936`	`936`	`}`
`937`	`937`	`}`
`938`	`938`