Merge pull request #198 from webimpress/feature/import-internal-functions

Ocramius · web-flow · commit 93b78c5ea111 · 2017-07-10T00:22:18.000+02:00
Import PHP internal functions
diff --git a/benchmarks/BenchAsset/AbstractFactoryFoo.php b/benchmarks/BenchAsset/AbstractFactoryFoo.php
@@ -7,8 +7,8 @@
 
 namespace ZendBench\ServiceManager\BenchAsset;
 
-use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 
 class AbstractFactoryFoo implements AbstractFactoryInterface
 {
diff --git a/benchmarks/BenchAsset/FactoryFoo.php b/benchmarks/BenchAsset/FactoryFoo.php
@@ -7,8 +7,8 @@
 
 namespace ZendBench\ServiceManager\BenchAsset;
 
-use Zend\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class FactoryFoo implements FactoryInterface
 {
diff --git a/src/AbstractFactory/ConfigAbstractFactory.php b/src/AbstractFactory/ConfigAbstractFactory.php
@@ -11,6 +11,12 @@
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 
+use function array_key_exists;
+use function array_map;
+use function array_values;
+use function is_array;
+use function json_encode;
+
 final class ConfigAbstractFactory implements AbstractFactoryInterface
 {
 
diff --git a/src/AbstractFactory/ReflectionBasedAbstractFactory.php b/src/AbstractFactory/ReflectionBasedAbstractFactory.php
@@ -13,6 +13,10 @@
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 
+use function array_map;
+use function class_exists;
+use function sprintf;
+
 /**
  * Reflection-based factory.
  *
diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
@@ -10,6 +10,14 @@
 use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 
+use function class_exists;
+use function get_class;
+use function gettype;
+use function is_object;
+use function method_exists;
+use function sprintf;
+use function trigger_error;
+
 /**
  * Abstract plugin manager.
  *
diff --git a/src/Config.php b/src/Config.php
@@ -10,6 +10,11 @@
 use Zend\Stdlib\ArrayUtils\MergeRemoveKey;
 use Zend\Stdlib\ArrayUtils\MergeReplaceKeyInterface;
 
+use function array_key_exists;
+use function array_keys;
+use function is_array;
+use function is_int;
+
 /**
  * Object for defining configuration and configuring an existing service manager instance.
  *
diff --git a/src/Exception/CyclicAliasException.php b/src/Exception/CyclicAliasException.php
@@ -7,6 +7,16 @@
 
 namespace Zend\ServiceManager\Exception;
 
+use function array_filter;
+use function array_keys;
+use function array_map;
+use function array_values;
+use function implode;
+use function reset;
+use function serialize;
+use function sort;
+use function sprintf;
+
 class CyclicAliasException extends InvalidArgumentException
 {
     /**
diff --git a/src/Proxy/LazyServiceFactory.php b/src/Proxy/LazyServiceFactory.php
@@ -13,6 +13,8 @@
 use Zend\ServiceManager\Exception;
 use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
 
+use function sprintf;
+
 /**
  * Delegator factory responsible of instantiating lazy loading value holder proxies of
  * given services at runtime
diff --git a/src/ServiceLocatorInterface.php b/src/ServiceLocatorInterface.php
@@ -7,9 +7,9 @@
 
 namespace Zend\ServiceManager;
 
-use Psr\Container\ContainerInterface as PsrContainerInterface;
-use Psr\Container\ContainerExceptionInterface;
 use Interop\Container\ContainerInterface as InteropContainerInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
 
 /**
  * Interface for service locator
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -21,6 +21,22 @@
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 
+use function array_intersect_key;
+use function array_keys;
+use function array_merge;
+use function array_merge_recursive;
+use function class_exists;
+use function get_class;
+use function gettype;
+use function implode;
+use function is_callable;
+use function is_object;
+use function is_string;
+use function spl_autoload_register;
+use function spl_object_hash;
+use function sprintf;
+use function trigger_error;
+
 /**
  * Service Manager.
  *
@@ -392,8 +408,8 @@ private function configureAliases(array $aliases)
         }
 
         // Performance optimization. If there are no collisions, then we don't need to recompute loops
-        $intersecting  = $this->aliases && \array_intersect_key($this->aliases, $aliases);
-        $this->aliases = $this->aliases ? \array_merge($this->aliases, $aliases) : $aliases;
+        $intersecting  = $this->aliases && array_intersect_key($this->aliases, $aliases);
+        $this->aliases = $this->aliases ? array_merge($this->aliases, $aliases) : $aliases;
 
         if ($intersecting) {
             $this->resolveAliases($this->aliases);
diff --git a/src/Test/CommonPluginManagerTrait.php b/src/Test/CommonPluginManagerTrait.php
@@ -11,6 +11,9 @@
 use ReflectionProperty;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 
+use function get_class;
+use function method_exists;
+
 /**
  * Trait for testing plugin managers for v2-v3 compatibility
  *
diff --git a/src/Tool/ConfigDumper.php b/src/Tool/ConfigDumper.php
@@ -14,6 +14,22 @@
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
 
+use function array_filter;
+use function array_key_exists;
+use function class_exists;
+use function date;
+use function get_class;
+use function gettype;
+use function implode;
+use function interface_exists;
+use function is_array;
+use function is_int;
+use function is_null;
+use function is_string;
+use function sprintf;
+use function str_repeat;
+use function var_export;
+
 class ConfigDumper
 {
     const CONFIG_TEMPLATE = <<<EOC
diff --git a/src/Tool/ConfigDumperCommand.php b/src/Tool/ConfigDumperCommand.php
@@ -10,6 +10,17 @@
 use Zend\ServiceManager\Exception;
 use Zend\Stdlib\ConsoleHelper;
 
+use function array_shift;
+use function class_exists;
+use function count;
+use function dirname;
+use function file_exists;
+use function file_put_contents;
+use function in_array;
+use function is_array;
+use function is_writable;
+use function sprintf;
+
 class ConfigDumperCommand
 {
     const COMMAND_DUMP = 'dump';
diff --git a/src/Tool/FactoryCreator.php b/src/Tool/FactoryCreator.php
@@ -11,6 +11,17 @@
 use ReflectionParameter;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
 
+use function array_filter;
+use function array_map;
+use function array_shift;
+use function count;
+use function implode;
+use function sprintf;
+use function str_repeat;
+use function str_replace;
+use function strrpos;
+use function substr;
+
 class FactoryCreator
 {
     const FACTORY_TEMPLATE = <<<'EOT'
diff --git a/src/Tool/FactoryCreatorCommand.php b/src/Tool/FactoryCreatorCommand.php
@@ -10,6 +10,12 @@
 use Zend\ServiceManager\Exception;
 use Zend\Stdlib\ConsoleHelper;
 
+use function array_shift;
+use function class_exists;
+use function count;
+use function in_array;
+use function sprintf;
+
 class FactoryCreatorCommand
 {
     const COMMAND_DUMP = 'dump';
diff --git a/test/AbstractFactory/ReflectionBasedAbstractFactoryTest.php b/test/AbstractFactory/ReflectionBasedAbstractFactoryTest.php
@@ -12,6 +12,8 @@
 use Zend\ServiceManager\AbstractFactory\ReflectionBasedAbstractFactory;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 
+use function sprintf;
+
 class ReflectionBasedAbstractFactoryTest extends TestCase
 {
     public function setUp()
diff --git a/test/AbstractPluginManagerTest.php b/test/AbstractPluginManagerTest.php
@@ -22,6 +22,10 @@
 use ZendTest\ServiceManager\TestAsset\SimplePluginManager;
 use ZendTest\ServiceManager\TestAsset\V2v3PluginManager;
 
+use function get_class;
+use function restore_error_handler;
+use function set_error_handler;
+
 /**
  * @covers \Zend\ServiceManager\AbstractPluginManager
  */
diff --git a/test/CommonServiceLocatorBehaviorsTrait.php b/test/CommonServiceLocatorBehaviorsTrait.php
@@ -21,11 +21,15 @@
 use Zend\ServiceManager\ServiceLocatorInterface;
 use ZendTest\ServiceManager\TestAsset\CallTimesAbstractFactory;
 use ZendTest\ServiceManager\TestAsset\FailingAbstractFactory;
-use ZendTest\ServiceManager\TestAsset\FailingFactory;
 use ZendTest\ServiceManager\TestAsset\FailingExceptionWithStringAsCodeFactory;
+use ZendTest\ServiceManager\TestAsset\FailingFactory;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
 use ZendTest\ServiceManager\TestAsset\SimpleAbstractFactory;
 
+use function call_user_func_array;
+use function restore_error_handler;
+use function set_error_handler;
+
 trait CommonServiceLocatorBehaviorsTrait
 {
     /**
diff --git a/test/LazyServiceIntegrationTest.php b/test/LazyServiceIntegrationTest.php
@@ -21,6 +21,21 @@
 use Zend\ServiceManager\ServiceManager;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
 
+use function array_filter;
+use function closedir;
+use function get_class;
+use function is_dir;
+use function is_file;
+use function iterator_to_array;
+use function mkdir;
+use function opendir;
+use function readdir;
+use function rmdir;
+use function spl_autoload_functions;
+use function spl_autoload_unregister;
+use function sys_get_temp_dir;
+use function unlink;
+
 /**
  * @covers \Zend\ServiceManager\ServiceManager
  */
diff --git a/test/Proxy/LazyServiceFactoryTest.php b/test/Proxy/LazyServiceFactoryTest.php
@@ -8,8 +8,8 @@
 namespace ZendTest\ServiceManager\Proxy;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use ProxyManager\Proxy\VirtualProxyInterface;
diff --git a/test/TestAsset/V2ValidationPluginManager.php b/test/TestAsset/V2ValidationPluginManager.php
@@ -10,6 +10,10 @@
 use RuntimeException;
 use Zend\ServiceManager\AbstractPluginManager;
 
+use function call_user_func;
+use function is_callable;
+use function sprintf;
+
 class V2ValidationPluginManager extends AbstractPluginManager
 {
     public $assertion;
diff --git a/test/TestAsset/V2v3PluginManager.php b/test/TestAsset/V2v3PluginManager.php
@@ -11,6 +11,9 @@
 use Zend\ServiceManager\Exception\InvalidServiceException;
 use Zend\ServiceManager\Factory\InvokableFactory;
 
+use function get_class;
+use function sprintf;
+
 class V2v3PluginManager extends AbstractPluginManager
 {
     protected $aliases = [
diff --git a/test/Tool/ConfigDumperCommandTest.php b/test/Tool/ConfigDumperCommandTest.php
@@ -18,6 +18,10 @@
 use ZendTest\ServiceManager\TestAsset\ObjectWithScalarDependency;
 use ZendTest\ServiceManager\TestAsset\SimpleDependencyObject;
 
+use function file_get_contents;
+use function realpath;
+use function sprintf;
+
 class ConfigDumperCommandTest extends TestCase
 {
     public function setUp()
diff --git a/test/Tool/ConfigDumperTest.php b/test/Tool/ConfigDumperTest.php
@@ -22,6 +22,11 @@
 use ZendTest\ServiceManager\TestAsset\SecondComplexDependencyObject;
 use ZendTest\ServiceManager\TestAsset\SimpleDependencyObject;
 
+use function file_put_contents;
+use function sys_get_temp_dir;
+use function tempnam;
+use function unlink;
+
 class ConfigDumperTest extends TestCase
 {
     /**
diff --git a/test/Tool/FactoryCreatorCommandTest.php b/test/Tool/FactoryCreatorCommandTest.php
@@ -15,6 +15,9 @@
 use ZendTest\ServiceManager\TestAsset\ObjectWithScalarDependency;
 use ZendTest\ServiceManager\TestAsset\SimpleDependencyObject;
 
+use function file_get_contents;
+use function sprintf;
+
 class FactoryCreatorCommandTest extends TestCase
 {
     public function setUp()
diff --git a/test/Tool/FactoryCreatorTest.php b/test/Tool/FactoryCreatorTest.php
@@ -13,6 +13,8 @@
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
 use ZendTest\ServiceManager\TestAsset\SimpleDependencyObject;
 
+use function file_get_contents;
+
 class FactoryCreatorTest extends TestCase
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`
`8`	`8`	`namespace ZendBench\ServiceManager\BenchAsset;`
`9`	`9`
`10`		`-use Zend\ServiceManager\Factory\AbstractFactoryInterface;`
`11`	`10`	`use Interop\Container\ContainerInterface;`
	`11`	`+use Zend\ServiceManager\Factory\AbstractFactoryInterface;`
`12`	`12`
`13`	`13`	`class AbstractFactoryFoo implements AbstractFactoryInterface`
`14`	`14`	`{`