From b238e6655aeae4682b7c73f2c4abc8d8f7707387 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 11 Jun 2020 20:21:51 +0100 Subject: [PATCH] Re-organise the src and tests directories --- composer.json | 2 +- src/{Glassboxx => }/Config.php | 0 src/{Glassboxx => }/Enum/InteractionType.php | 0 src/{Glassboxx => }/Request/AbstractRequest.php | 0 src/{Glassboxx => }/Request/AuthTokenRequest.php | 0 src/{Glassboxx => }/Request/AuthTokenRequestInterface.php | 0 src/{Glassboxx => }/Request/CustomerRequest.php | 0 src/{Glassboxx => }/Request/CustomerRequestInterface.php | 0 src/{Glassboxx => }/Request/OrderRequest.php | 0 src/{Glassboxx => }/Request/OrderRequestInterface.php | 0 src/{Glassboxx => }/Traits/UsesAuthTokenTrait.php | 0 src/{Glassboxx => }/Traits/UsesConfigTrait.php | 0 src/{Glassboxx => }/Traits/UsesCreatedAtTrait.php | 0 src/{Glassboxx => }/ValueObject/Customer.php | 0 src/{Glassboxx => }/ValueObject/CustomerInterface.php | 0 src/{Glassboxx => }/ValueObject/Order.php | 0 src/{Glassboxx => }/ValueObject/OrderInterface.php | 0 src/{Glassboxx => }/ValueObject/OrderItem.php | 0 src/{Glassboxx => }/ValueObject/OrderItemInterface.php | 0 tests/{Glassboxx => }/ConfigTest.php | 2 +- tests/{Glassboxx => }/Request/AuthTokenRequestTest.php | 4 ++-- tests/{Glassboxx => }/Request/CustomerRequestTest.php | 4 ++-- tests/{Glassboxx => }/Request/OrderRequestTest.php | 4 ++-- tests/{Glassboxx => }/TestCase.php | 2 +- tests/{Glassboxx => }/ValueObject/CustomerTest.php | 4 ++-- tests/{Glassboxx => }/ValueObject/OrderTest.php | 4 ++-- 26 files changed, 13 insertions(+), 13 deletions(-) rename src/{Glassboxx => }/Config.php (100%) rename src/{Glassboxx => }/Enum/InteractionType.php (100%) rename src/{Glassboxx => }/Request/AbstractRequest.php (100%) rename src/{Glassboxx => }/Request/AuthTokenRequest.php (100%) rename src/{Glassboxx => }/Request/AuthTokenRequestInterface.php (100%) rename src/{Glassboxx => }/Request/CustomerRequest.php (100%) rename src/{Glassboxx => }/Request/CustomerRequestInterface.php (100%) rename src/{Glassboxx => }/Request/OrderRequest.php (100%) rename src/{Glassboxx => }/Request/OrderRequestInterface.php (100%) rename src/{Glassboxx => }/Traits/UsesAuthTokenTrait.php (100%) rename src/{Glassboxx => }/Traits/UsesConfigTrait.php (100%) rename src/{Glassboxx => }/Traits/UsesCreatedAtTrait.php (100%) rename src/{Glassboxx => }/ValueObject/Customer.php (100%) rename src/{Glassboxx => }/ValueObject/CustomerInterface.php (100%) rename src/{Glassboxx => }/ValueObject/Order.php (100%) rename src/{Glassboxx => }/ValueObject/OrderInterface.php (100%) rename src/{Glassboxx => }/ValueObject/OrderItem.php (100%) rename src/{Glassboxx => }/ValueObject/OrderItemInterface.php (100%) rename tests/{Glassboxx => }/ConfigTest.php (91%) rename tests/{Glassboxx => }/Request/AuthTokenRequestTest.php (91%) rename tests/{Glassboxx => }/Request/CustomerRequestTest.php (94%) rename tests/{Glassboxx => }/Request/OrderRequestTest.php (96%) rename tests/{Glassboxx => }/TestCase.php (97%) rename tests/{Glassboxx => }/ValueObject/CustomerTest.php (83%) rename tests/{Glassboxx => }/ValueObject/OrderTest.php (86%) diff --git a/composer.json b/composer.json index e56c289..82105dd 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ }, "autoload": { "psr-4": { - "Opdavies\\Glassboxx\\": "src/Glassboxx/" + "Opdavies\\Glassboxx\\": "src/" } }, "autoload-dev": { diff --git a/src/Glassboxx/Config.php b/src/Config.php similarity index 100% rename from src/Glassboxx/Config.php rename to src/Config.php diff --git a/src/Glassboxx/Enum/InteractionType.php b/src/Enum/InteractionType.php similarity index 100% rename from src/Glassboxx/Enum/InteractionType.php rename to src/Enum/InteractionType.php diff --git a/src/Glassboxx/Request/AbstractRequest.php b/src/Request/AbstractRequest.php similarity index 100% rename from src/Glassboxx/Request/AbstractRequest.php rename to src/Request/AbstractRequest.php diff --git a/src/Glassboxx/Request/AuthTokenRequest.php b/src/Request/AuthTokenRequest.php similarity index 100% rename from src/Glassboxx/Request/AuthTokenRequest.php rename to src/Request/AuthTokenRequest.php diff --git a/src/Glassboxx/Request/AuthTokenRequestInterface.php b/src/Request/AuthTokenRequestInterface.php similarity index 100% rename from src/Glassboxx/Request/AuthTokenRequestInterface.php rename to src/Request/AuthTokenRequestInterface.php diff --git a/src/Glassboxx/Request/CustomerRequest.php b/src/Request/CustomerRequest.php similarity index 100% rename from src/Glassboxx/Request/CustomerRequest.php rename to src/Request/CustomerRequest.php diff --git a/src/Glassboxx/Request/CustomerRequestInterface.php b/src/Request/CustomerRequestInterface.php similarity index 100% rename from src/Glassboxx/Request/CustomerRequestInterface.php rename to src/Request/CustomerRequestInterface.php diff --git a/src/Glassboxx/Request/OrderRequest.php b/src/Request/OrderRequest.php similarity index 100% rename from src/Glassboxx/Request/OrderRequest.php rename to src/Request/OrderRequest.php diff --git a/src/Glassboxx/Request/OrderRequestInterface.php b/src/Request/OrderRequestInterface.php similarity index 100% rename from src/Glassboxx/Request/OrderRequestInterface.php rename to src/Request/OrderRequestInterface.php diff --git a/src/Glassboxx/Traits/UsesAuthTokenTrait.php b/src/Traits/UsesAuthTokenTrait.php similarity index 100% rename from src/Glassboxx/Traits/UsesAuthTokenTrait.php rename to src/Traits/UsesAuthTokenTrait.php diff --git a/src/Glassboxx/Traits/UsesConfigTrait.php b/src/Traits/UsesConfigTrait.php similarity index 100% rename from src/Glassboxx/Traits/UsesConfigTrait.php rename to src/Traits/UsesConfigTrait.php diff --git a/src/Glassboxx/Traits/UsesCreatedAtTrait.php b/src/Traits/UsesCreatedAtTrait.php similarity index 100% rename from src/Glassboxx/Traits/UsesCreatedAtTrait.php rename to src/Traits/UsesCreatedAtTrait.php diff --git a/src/Glassboxx/ValueObject/Customer.php b/src/ValueObject/Customer.php similarity index 100% rename from src/Glassboxx/ValueObject/Customer.php rename to src/ValueObject/Customer.php diff --git a/src/Glassboxx/ValueObject/CustomerInterface.php b/src/ValueObject/CustomerInterface.php similarity index 100% rename from src/Glassboxx/ValueObject/CustomerInterface.php rename to src/ValueObject/CustomerInterface.php diff --git a/src/Glassboxx/ValueObject/Order.php b/src/ValueObject/Order.php similarity index 100% rename from src/Glassboxx/ValueObject/Order.php rename to src/ValueObject/Order.php diff --git a/src/Glassboxx/ValueObject/OrderInterface.php b/src/ValueObject/OrderInterface.php similarity index 100% rename from src/Glassboxx/ValueObject/OrderInterface.php rename to src/ValueObject/OrderInterface.php diff --git a/src/Glassboxx/ValueObject/OrderItem.php b/src/ValueObject/OrderItem.php similarity index 100% rename from src/Glassboxx/ValueObject/OrderItem.php rename to src/ValueObject/OrderItem.php diff --git a/src/Glassboxx/ValueObject/OrderItemInterface.php b/src/ValueObject/OrderItemInterface.php similarity index 100% rename from src/Glassboxx/ValueObject/OrderItemInterface.php rename to src/ValueObject/OrderItemInterface.php diff --git a/tests/Glassboxx/ConfigTest.php b/tests/ConfigTest.php similarity index 91% rename from tests/Glassboxx/ConfigTest.php rename to tests/ConfigTest.php index f391e51..2196733 100644 --- a/tests/Glassboxx/ConfigTest.php +++ b/tests/ConfigTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Opdavies\Glassboxx\Tests\Glassboxx; +namespace Opdavies\Glassboxx\Tests; use Opdavies\Glassboxx\Config; use PHPUnit\Framework\TestCase; diff --git a/tests/Glassboxx/Request/AuthTokenRequestTest.php b/tests/Request/AuthTokenRequestTest.php similarity index 91% rename from tests/Glassboxx/Request/AuthTokenRequestTest.php rename to tests/Request/AuthTokenRequestTest.php index ad3c5bd..9584a49 100644 --- a/tests/Glassboxx/Request/AuthTokenRequestTest.php +++ b/tests/Request/AuthTokenRequestTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Opdavies\Glassboxx\Tests\Glassboxx\Request; +namespace Opdavies\Glassboxx\Tests\Request; use Opdavies\Glassboxx\Request\AuthTokenRequest; -use Opdavies\Glassboxx\Tests\Glassboxx\TestCase; +use Opdavies\Glassboxx\Tests\TestCase; use Symfony\Component\HttpClient\MockHttpClient; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/tests/Glassboxx/Request/CustomerRequestTest.php b/tests/Request/CustomerRequestTest.php similarity index 94% rename from tests/Glassboxx/Request/CustomerRequestTest.php rename to tests/Request/CustomerRequestTest.php index f1ac89e..d2e8d4d 100644 --- a/tests/Glassboxx/Request/CustomerRequestTest.php +++ b/tests/Request/CustomerRequestTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Opdavies\Glassboxx\Tests\Glassboxx\Request; +namespace Opdavies\Glassboxx\Tests\Request; use Opdavies\Glassboxx\Request\AuthTokenRequestInterface; use Opdavies\Glassboxx\Request\CustomerRequest; -use Opdavies\Glassboxx\Tests\Glassboxx\TestCase; +use Opdavies\Glassboxx\Tests\TestCase; use Opdavies\Glassboxx\Traits\UsesCreatedAtTrait; use Opdavies\Glassboxx\ValueObject\CustomerInterface; use Symfony\Component\HttpClient\MockHttpClient; diff --git a/tests/Glassboxx/Request/OrderRequestTest.php b/tests/Request/OrderRequestTest.php similarity index 96% rename from tests/Glassboxx/Request/OrderRequestTest.php rename to tests/Request/OrderRequestTest.php index e6256e3..ffb642c 100644 --- a/tests/Glassboxx/Request/OrderRequestTest.php +++ b/tests/Request/OrderRequestTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Opdavies\Glassboxx\Tests\Glassboxx\Request; +namespace Opdavies\Glassboxx\Tests\Request; use DateTime; use Opdavies\Glassboxx\Request\OrderRequest; -use Opdavies\Glassboxx\Tests\Glassboxx\TestCase; +use Opdavies\Glassboxx\Tests\TestCase; use Opdavies\Glassboxx\ValueObject\OrderItemInterface; use Symfony\Component\HttpClient\MockHttpClient; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/tests/Glassboxx/TestCase.php b/tests/TestCase.php similarity index 97% rename from tests/Glassboxx/TestCase.php rename to tests/TestCase.php index 897ed35..b04e12d 100644 --- a/tests/Glassboxx/TestCase.php +++ b/tests/TestCase.php @@ -1,6 +1,6 @@