Cleanup (#24)

yiisoft · Nov 19, 2021 · 1cb41cf · 1cb41cf
1 parent 8afadcd
commit 1cb41cf
Show file tree

Hide file tree

Showing 46 changed files with 89 additions and 92 deletions.
diff --git a/README.md b/README.md
@@ -189,7 +189,7 @@ Definition storage could be used to hold and obtain definitions and check if a c
 Usually it is used by an implementation using the definitions:
 
 ```php
-use Yiisoft\Definitions\Infrastructure\DefinitionStorage;
+use Yiisoft\Definitions\DefinitionStorage;
 
 $storage = new DefinitionStorage([
     MyInterface::class => MyClass::class,

diff --git a/src/ArrayDefinition.php b/src/ArrayDefinition.php
@@ -8,8 +8,8 @@
 use Yiisoft\Definitions\Contract\DefinitionInterface;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
 
-use Yiisoft\Definitions\Infrastructure\DefinitionExtractor;
-use Yiisoft\Definitions\Infrastructure\DefinitionResolver;
+use Yiisoft\Definitions\Helpers\DefinitionExtractor;
+use Yiisoft\Definitions\Helpers\DefinitionResolver;
 use function count;
 
 /**

diff --git a/src/CallableDefinition.php b/src/CallableDefinition.php
@@ -11,8 +11,8 @@
 use ReflectionMethod;
 use Yiisoft\Definitions\Contract\DefinitionInterface;
 use Yiisoft\Definitions\Exception\NotInstantiableException;
-use Yiisoft\Definitions\Infrastructure\DefinitionExtractor;
-use Yiisoft\Definitions\Infrastructure\DefinitionResolver;
+use Yiisoft\Definitions\Helpers\DefinitionExtractor;
+use Yiisoft\Definitions\Helpers\DefinitionResolver;
 
 use function is_array;
 use function is_object;

diff --git a/src/Infrastructure/DefinitionStorage.php → src/DefinitionStorage.php b/src/Infrastructure/DefinitionStorage.php → src/DefinitionStorage.php
@@ -2,14 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Infrastructure;
+namespace Yiisoft\Definitions;
 
 use Psr\Container\ContainerInterface;
 use ReflectionNamedType;
 use ReflectionUnionType;
 use RuntimeException;
 use Throwable;
 use Yiisoft\Definitions\Exception\CircularReferenceException;
+use Yiisoft\Definitions\Helpers\DefinitionExtractor;
 
 /**
  * Stores service definitions and checks if a definition could be instantiated.

diff --git a/src/DynamicReference.php b/src/DynamicReference.php
@@ -8,7 +8,7 @@
 use Yiisoft\Definitions\Contract\DefinitionInterface;
 use Yiisoft\Definitions\Contract\ReferenceInterface;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
-use Yiisoft\Definitions\Infrastructure\Normalizer;
+use Yiisoft\Definitions\Helpers\Normalizer;
 
 use function is_callable;
 use function is_object;

diff --git a/src/Infrastructure/DefinitionExtractor.php → src/Helpers/DefinitionExtractor.php b/src/Infrastructure/DefinitionExtractor.php → src/Helpers/DefinitionExtractor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Infrastructure;
+namespace Yiisoft\Definitions\Helpers;
 
 use ReflectionClass;
 use ReflectionException;
@@ -24,10 +24,6 @@ final class DefinitionExtractor
      */
     private static array $dependencies = [];
 
-    private function __construct()
-    {
-    }
-
     /**
      * Extract dependency definitions from type hints of a class constructor parameters.
      *

diff --git a/src/Infrastructure/DefinitionResolver.php → src/Helpers/DefinitionResolver.php b/src/Infrastructure/DefinitionResolver.php → src/Helpers/DefinitionResolver.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Infrastructure;
+namespace Yiisoft\Definitions\Helpers;
 
 use Psr\Container\ContainerInterface;
 use Yiisoft\Definitions\Contract\DefinitionInterface;

diff --git a/src/Infrastructure/DefinitionValidator.php → src/Helpers/DefinitionValidator.php b/src/Infrastructure/DefinitionValidator.php → src/Helpers/DefinitionValidator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Infrastructure;
+namespace Yiisoft\Definitions\Helpers;
 
 use Yiisoft\Definitions\ArrayDefinition;
 use Yiisoft\Definitions\Contract\DefinitionInterface;

diff --git a/src/Infrastructure/Normalizer.php → src/Helpers/Normalizer.php b/src/Infrastructure/Normalizer.php → src/Helpers/Normalizer.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Infrastructure;
+namespace Yiisoft\Definitions\Helpers;
 
 use Yiisoft\Definitions\ArrayDefinition;
 use Yiisoft\Definitions\CallableDefinition;

diff --git a/...nfrastructure/DefinitionExtractorTest.php → .../Php8/Helpers/DefinitionExtractorTest.php b/...nfrastructure/DefinitionExtractorTest.php → .../Php8/Helpers/DefinitionExtractorTest.php
@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Php8\Infrastructure;
+namespace Yiisoft\Definitions\Tests\Php8\Helpers;
 
 use DateTime;
 use PHPUnit\Framework\TestCase;
 use ReflectionFunction;
 use Yiisoft\Definitions\ParameterDefinition;
 use Yiisoft\Definitions\Contract\DefinitionInterface;
-use Yiisoft\Definitions\Infrastructure\DefinitionExtractor;
-use Yiisoft\Definitions\Tests\Objects\ColorInterface;
-use Yiisoft\Definitions\Tests\Objects\EngineMarkOne;
-use Yiisoft\Definitions\Tests\Objects\UnionCar;
-use Yiisoft\Definitions\Tests\Objects\UnionSelfDependency;
+use Yiisoft\Definitions\Helpers\DefinitionExtractor;
+use Yiisoft\Definitions\Tests\Support\ColorInterface;
+use Yiisoft\Definitions\Tests\Support\EngineMarkOne;
+use Yiisoft\Definitions\Tests\Support\UnionCar;
+use Yiisoft\Definitions\Tests\Support\UnionSelfDependency;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class DefinitionExtractorTest extends TestCase

diff --git a/tests/Php8/ParameterDefinitionTest.php b/tests/Php8/ParameterDefinitionTest.php
@@ -13,8 +13,8 @@
 use stdClass;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
 use Yiisoft\Definitions\ParameterDefinition;
-use Yiisoft\Definitions\Tests\Objects\GearBox;
-use Yiisoft\Definitions\Tests\Objects\UnionCar;
+use Yiisoft\Definitions\Tests\Support\GearBox;
+use Yiisoft\Definitions\Tests\Support\UnionCar;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class ParameterDefinitionTest extends TestCase

diff --git a/tests/Objects/Car.php → tests/Support/Car.php b/tests/Objects/Car.php → tests/Support/Car.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class Car
 {

diff --git a/tests/Objects/CarFactory.php → tests/Support/CarFactory.php b/tests/Objects/CarFactory.php → tests/Support/CarFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class CarFactory
 {

diff --git a/tests/Objects/ColorInterface.php → tests/Support/ColorInterface.php b/tests/Objects/ColorInterface.php → tests/Support/ColorInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 /**
  * Interface ColorInterface defines car color

diff --git a/tests/Objects/ColorPink.php → tests/Support/ColorPink.php b/tests/Objects/ColorPink.php → tests/Support/ColorPink.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 /**
  * Class ColorPink

diff --git a/.../ServiceWithBuiltinTypeWithoutDefault.php → .../ServiceWithBuiltinTypeWithoutDefault.php b/.../ServiceWithBuiltinTypeWithoutDefault.php → .../ServiceWithBuiltinTypeWithoutDefault.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects\DefinitionStorage;
+namespace Yiisoft\Definitions\Tests\Support\DefinitionStorage;
 
 final class ServiceWithBuiltinTypeWithoutDefault
 {

diff --git a/...rage/ServiceWithNonExistingDependency.php → ...rage/ServiceWithNonExistingDependency.php b/...rage/ServiceWithNonExistingDependency.php → ...rage/ServiceWithNonExistingDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects\DefinitionStorage;
+namespace Yiisoft\Definitions\Tests\Support\DefinitionStorage;
 
 final class ServiceWithNonExistingDependency
 {

diff --git a/...e/ServiceWithNonExistingSubDependency.php → ...e/ServiceWithNonExistingSubDependency.php b/...e/ServiceWithNonExistingSubDependency.php → ...e/ServiceWithNonExistingSubDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects\DefinitionStorage;
+namespace Yiisoft\Definitions\Tests\Support\DefinitionStorage;
 
 final class ServiceWithNonExistingSubDependency
 {

diff --git a/...ge/ServiceWithNonResolvableUnionTypes.php → ...ge/ServiceWithNonResolvableUnionTypes.php b/...ge/ServiceWithNonResolvableUnionTypes.php → ...ge/ServiceWithNonResolvableUnionTypes.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects\DefinitionStorage;
+namespace Yiisoft\Definitions\Tests\Support\DefinitionStorage;
 
 final class ServiceWithNonResolvableUnionTypes
 {

diff --git a/...Storage/ServiceWithPrivateConstructor.php → ...Storage/ServiceWithPrivateConstructor.php b/...Storage/ServiceWithPrivateConstructor.php → ...Storage/ServiceWithPrivateConstructor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects\DefinitionStorage;
+namespace Yiisoft\Definitions\Tests\Support\DefinitionStorage;
 
 final class ServiceWithPrivateConstructor
 {

diff --git a/...ceWithPrivateConstructorSubDependency.php → ...ceWithPrivateConstructorSubDependency.php b/...ceWithPrivateConstructorSubDependency.php → ...ceWithPrivateConstructorSubDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects\DefinitionStorage;
+namespace Yiisoft\Definitions\Tests\Support\DefinitionStorage;
 
 final class ServiceWithPrivateConstructorSubDependency
 {

diff --git a/tests/Objects/EngineInterface.php → tests/Support/EngineInterface.php b/tests/Objects/EngineInterface.php → tests/Support/EngineInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 /**
  * EngineInterface defines car engine interface

diff --git a/tests/Objects/EngineMarkOne.php → tests/Support/EngineMarkOne.php b/tests/Objects/EngineMarkOne.php → tests/Support/EngineMarkOne.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class EngineMarkOne implements EngineInterface
 {

diff --git a/tests/Objects/EngineMarkTwo.php → tests/Support/EngineMarkTwo.php b/tests/Objects/EngineMarkTwo.php → tests/Support/EngineMarkTwo.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class EngineMarkTwo implements EngineInterface
 {

diff --git a/tests/Objects/GearBox.php → tests/Support/GearBox.php b/tests/Objects/GearBox.php → tests/Support/GearBox.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 /**
  * A gear box.

diff --git a/tests/Objects/NullableConcreteDependency.php → tests/Support/NullableConcreteDependency.php b/tests/Objects/NullableConcreteDependency.php → tests/Support/NullableConcreteDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class NullableConcreteDependency
 {

diff --git a/...s/Objects/NullableInterfaceDependency.php → ...s/Support/NullableInterfaceDependency.php b/...s/Objects/NullableInterfaceDependency.php → ...s/Support/NullableInterfaceDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class NullableInterfaceDependency
 {

diff --git a/...ts/NullableOptionalConcreteDependency.php → ...rt/NullableOptionalConcreteDependency.php b/...ts/NullableOptionalConcreteDependency.php → ...rt/NullableOptionalConcreteDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class NullableOptionalConcreteDependency
 {

diff --git a/...s/NullableOptionalInterfaceDependency.php → ...t/NullableOptionalInterfaceDependency.php b/...s/NullableOptionalInterfaceDependency.php → ...t/NullableOptionalInterfaceDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class NullableOptionalInterfaceDependency
 {

diff --git a/tests/Objects/OptionalConcreteDependency.php → tests/Support/OptionalConcreteDependency.php b/tests/Objects/OptionalConcreteDependency.php → tests/Support/OptionalConcreteDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class OptionalConcreteDependency
 {

diff --git a/...s/Objects/OptionalInterfaceDependency.php → ...s/Support/OptionalInterfaceDependency.php b/...s/Objects/OptionalInterfaceDependency.php → ...s/Support/OptionalInterfaceDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class OptionalInterfaceDependency
 {

diff --git a/tests/Objects/Phone.php → tests/Support/Phone.php b/tests/Objects/Phone.php → tests/Support/Phone.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class Phone
 {

diff --git a/tests/Objects/SelfDependency.php → tests/Support/SelfDependency.php b/tests/Objects/SelfDependency.php → tests/Support/SelfDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class SelfDependency
 {

diff --git a/tests/Objects/Table.php → tests/Support/Table.php b/tests/Objects/Table.php → tests/Support/Table.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class Table
 {

diff --git a/tests/Objects/UnionCar.php → tests/Support/UnionCar.php b/tests/Objects/UnionCar.php → tests/Support/UnionCar.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class UnionCar
 {

diff --git a/tests/Objects/UnionSelfDependency.php → tests/Support/UnionSelfDependency.php b/tests/Objects/UnionSelfDependency.php → tests/Support/UnionSelfDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Definitions\Tests\Objects;
+namespace Yiisoft\Definitions\Tests\Support;
 
 final class UnionSelfDependency
 {

diff --git a/tests/Unit/ArrayDefinitionTest.php b/tests/Unit/ArrayDefinitionTest.php
@@ -7,7 +7,7 @@
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Definitions\ArrayDefinition;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
-use Yiisoft\Definitions\Tests\Objects\Phone;
+use Yiisoft\Definitions\Tests\Support\Phone;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class ArrayDefinitionTest extends TestCase

diff --git a/tests/Unit/CallableDefinitionTest.php b/tests/Unit/CallableDefinitionTest.php
@@ -7,10 +7,10 @@
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Definitions\CallableDefinition;
 use Yiisoft\Definitions\Exception\NotInstantiableException;
-use Yiisoft\Definitions\Tests\Objects\Car;
-use Yiisoft\Definitions\Tests\Objects\CarFactory;
-use Yiisoft\Definitions\Tests\Objects\ColorInterface;
-use Yiisoft\Definitions\Tests\Objects\ColorPink;
+use Yiisoft\Definitions\Tests\Support\Car;
+use Yiisoft\Definitions\Tests\Support\CarFactory;
+use Yiisoft\Definitions\Tests\Support\ColorInterface;
+use Yiisoft\Definitions\Tests\Support\ColorPink;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class CallableDefinitionTest extends TestCase

diff --git a/tests/Unit/DynamicReferenceTest.php b/tests/Unit/DynamicReferenceTest.php
@@ -9,8 +9,8 @@
 use stdClass;
 use Yiisoft\Definitions\DynamicReference;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
-use Yiisoft\Definitions\Tests\Objects\EngineInterface;
-use Yiisoft\Definitions\Tests\Objects\EngineMarkOne;
+use Yiisoft\Definitions\Tests\Support\EngineInterface;
+use Yiisoft\Definitions\Tests\Support\EngineMarkOne;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class DynamicReferenceTest extends TestCase