From b579d5b9c26169695890ba5a47c520561c7f7468 Mon Sep 17 00:00:00 2001 From: Marco Stoll Date: Fri, 21 Jun 2019 08:46:03 +0200 Subject: [PATCH] [CHANGE] move factories to sub namespace --- src/Services/{ => Factories}/SF.php | 2 +- src/Services/{ => Factories}/ServicesFactory.php | 5 +++-- src/Services/ServiceLocatorTrait.php | 2 ++ tests/Services/{ => Factories}/SFTest.php | 4 ++-- tests/Services/{ => Factories}/ServicesFactoryTest.php | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) rename src/Services/{ => Factories}/SF.php (93%) rename src/Services/{ => Factories}/ServicesFactory.php (97%) rename tests/Services/{ => Factories}/SFTest.php (90%) rename tests/Services/{ => Factories}/ServicesFactoryTest.php (97%) diff --git a/src/Services/SF.php b/src/Services/Factories/SF.php similarity index 93% rename from src/Services/SF.php rename to src/Services/Factories/SF.php index 2fa7c42..51762dc 100644 --- a/src/Services/SF.php +++ b/src/Services/Factories/SF.php @@ -8,7 +8,7 @@ */ declare(strict_types=1); -namespace FF\Services; +namespace FF\Services\Factories; /** * Class SF diff --git a/src/Services/ServicesFactory.php b/src/Services/Factories/ServicesFactory.php similarity index 97% rename from src/Services/ServicesFactory.php rename to src/Services/Factories/ServicesFactory.php index b4e1fae..9c0b150 100644 --- a/src/Services/ServicesFactory.php +++ b/src/Services/Factories/ServicesFactory.php @@ -8,18 +8,19 @@ */ declare(strict_types=1); -namespace FF\Services; +namespace FF\Services\Factories; use FF\Factories\AbstractSingletonFactory; use FF\Factories\ClassLocators\ClassLocatorInterface; use FF\Factories\ClassLocators\NamespaceClassLocator; use FF\Factories\Exceptions\ClassNotFoundException; +use FF\Services\AbstractService; use FF\Services\Exceptions\ConfigurationException; /** * Class ServicesFactory * - * @package FF\Services + * @package FF\Services\Factories */ class ServicesFactory extends AbstractSingletonFactory { diff --git a/src/Services/ServiceLocatorTrait.php b/src/Services/ServiceLocatorTrait.php index 8373ceb..b32fc8a 100644 --- a/src/Services/ServiceLocatorTrait.php +++ b/src/Services/ServiceLocatorTrait.php @@ -10,6 +10,8 @@ declare(strict_types=1); namespace FF\Services; +use FF\Services\Factories\SF; + /** * Trait ServiceLocatorTrait * diff --git a/tests/Services/SFTest.php b/tests/Services/Factories/SFTest.php similarity index 90% rename from tests/Services/SFTest.php rename to tests/Services/Factories/SFTest.php index a4cc8dc..399d424 100644 --- a/tests/Services/SFTest.php +++ b/tests/Services/Factories/SFTest.php @@ -10,8 +10,8 @@ declare(strict_types=1); namespace FF\Tests\Services; -use FF\Services\ServicesFactory; -use FF\Services\SF; +use FF\Services\Factories\ServicesFactory; +use FF\Services\Factories\SF; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Services/ServicesFactoryTest.php b/tests/Services/Factories/ServicesFactoryTest.php similarity index 97% rename from tests/Services/ServicesFactoryTest.php rename to tests/Services/Factories/ServicesFactoryTest.php index 6e49311..4f7407b 100644 --- a/tests/Services/ServicesFactoryTest.php +++ b/tests/Services/Factories/ServicesFactoryTest.php @@ -8,12 +8,12 @@ */ declare(strict_types=1); -namespace FF\Tests\Services; +namespace FF\Tests\Services\Factories; use FF\Factories\Exceptions\ClassNotFoundException; use FF\Services\AbstractService; use FF\Services\Exceptions\ConfigurationException; -use FF\Services\ServicesFactory; +use FF\Services\Factories\ServicesFactory; use PHPUnit\Framework\TestCase; /**