add feedback

Signed-off-by: gennadigennadigennadi <gennadijanzen@icloud.com>
laminas · Oct 8, 2020 · 1afd29a · 1afd29a
2 parents b3d2e35 + f927ac0
commit 1afd29a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -10,9 +10,9 @@
 
 namespace Laminas\Di;
 
-use Zend\Di\CodeGenerator\InjectorGenerator;
-use Zend\Di\ConfigInterface as ZendDiConfigInterface;
-use Zend\Di\InjectorInterface as ZendDiInjectorInterface;
+use Zend\Di\CodeGenerator\InjectorGenerator as LegacyInjectorGenerator;
+use Zend\Di\ConfigInterface as LegacyConfigInterface;
+use Zend\Di\InjectorInterface as LegacyInjectorInterfae;
 
 /**
  * Implements the config provider for mezzio
@@ -39,9 +39,9 @@ public function getDependencyConfig(): array
         return [
             // Legacy Zend Framework aliases
             'aliases'            => [
-                ZendDiInjectorInterface::class => InjectorInterface::class,
-                ZendDiConfigInterface::class   => ConfigInterface::class,
-                InjectorGenerator::class       => CodeGenerator\InjectorGenerator::class,
+                LegacyInjectorInterfae::class  => InjectorInterface::class,
+                LegacyConfigInterface::class   => ConfigInterface::class,
+                LegacyInjectorGenerator::class => CodeGenerator\InjectorGenerator::class,
             ],
             'factories'          => [
                 InjectorInterface::class               => Container\InjectorFactory::class,

diff --git a/src/Injector.php b/src/Injector.php
@@ -51,17 +51,14 @@ class Injector implements InjectorInterface
     /**
      * Constructor
      *
-     * @param ConfigInterface|null             $config A custom configuration to utilize. An empty configuration
-     *                                         is used when null is passed or the parameter is omitted.
+     * @param ConfigInterface|null             $config A custom configuration to utilize. An empty configuration is used
+     *                  when null is passed or the parameter is omitted.
      * @param ContainerInterface|null          $container The IoC container to retrieve dependency instances.
-     *                                         `Laminas\Di\DefaultContainer` is used when null is passed or the
-     *                                         parameter is omitted.
-     * @param DefinitionInterface|null         $definition A custom definition instance for creating
-     *                                         requested instances. The runtime definition is used when null is
-     *                                         passed or the parameter is omitted.
+     *               `Laminas\Di\DefaultContainer` is used when null is passed or the parameter is omitted.
+     * @param null|DefinitionInterface         $definition A custom definition instance for creating requested
+     *               instances. The runtime definition is used when null is passed or the parameter is omitted.
      * @param DependencyResolverInterface|null $resolver A custom resolver instance to resolve dependencies.
-     *                                         The default resolver is used when null is passed
-     *                                         or the parameter is omitted.
+     *      The default resolver is used when null is passed or the parameter is omitted
      */
     public function __construct(
         ?ConfigInterface $config = null,

diff --git a/src/LegacyConfig.php b/src/LegacyConfig.php
@@ -10,6 +10,7 @@
 
 namespace Laminas\Di;
 
+use ArrayAccess;
 use Laminas\Stdlib\ArrayUtils;
 use Laminas\Stdlib\Parameters;
 use Traversable;

diff --git a/test/Container/ConfigFactoryTest.php b/test/Container/ConfigFactoryTest.php
@@ -13,8 +13,8 @@
 use Laminas\Di\ConfigInterface;
 use Laminas\Di\Container\ConfigFactory;
 use PHPUnit\Framework\Error\Deprecated as DeprecatedError;
+use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockBuilder;
 use Psr\Container\ContainerInterface;
 
 use function restore_error_handler;
@@ -29,7 +29,7 @@
  */
 class ConfigFactoryTest extends TestCase
 {
-    /** @var PHPUnit_Framework_MockObject_MockBuilder */
+    /** @var MockBuilder */
     private $containerBuilder;
 
     protected function setUp(): void

diff --git a/test/DefaultContainerTest.php b/test/DefaultContainerTest.php
@@ -12,8 +12,8 @@
 
 use Laminas\Di\DefaultContainer;
 use Laminas\Di\InjectorInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 use stdClass;
 
 use function uniqid;
@@ -24,7 +24,7 @@
 class DefaultContainerTest extends TestCase
 {
     /**
-     * @return PHPUnit_Framework_MockObject_MockObject|InjectorInterface
+     * @return MockObject|InjectorInterface
      */
     private function mockInjector()
     {

diff --git a/test/TestAsset/CircularClasses/X.php b/test/TestAsset/CircularClasses/X.php
@@ -1,5 +1,7 @@
 <?php
 
+// phpcs:disable
+
 /**
  * @see       https://github.com/laminas/laminas-di for the canonical source repository
  * @copyright https://github.com/laminas/laminas-di/blob/master/COPYRIGHT.md

diff --git a/test/TestAsset/CircularClasses/Y.php b/test/TestAsset/CircularClasses/Y.php
@@ -1,5 +1,7 @@
 <?php
 
+// phpcs:disable
+
 /**
  * @see       https://github.com/laminas/laminas-di for the canonical source repository
  * @copyright https://github.com/laminas/laminas-di/blob/master/COPYRIGHT.md