Provide compatibility with Symfony 3.4

Sylius · Aug 21, 2018 · ff0406b · ff0406b
1 parent bb77ad6
commit ff0406b
Show file tree

Hide file tree

Showing 42 changed files with 18 additions and 42 deletions.
diff --git a/tests/Controller/AddressBookCreateAddressApiTest.php b/tests/Controller/AddressBookCreateAddressApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use PHPUnit\Framework\Assert;
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Model\Customer;

diff --git a/tests/Controller/AddressBookRemoveAddressApiTest.php b/tests/Controller/AddressBookRemoveAddressApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use PHPUnit\Framework\Assert;
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;

diff --git a/tests/Controller/AddressBookSetDefaultAddressApiTest.php b/tests/Controller/AddressBookSetDefaultAddressApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use PHPUnit\Framework\Assert;
 use Sylius\Component\Core\Model\ShopUser;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;

diff --git a/tests/Controller/AddressBookShowApiTest.php b/tests/Controller/AddressBookShowApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\Utils\ShopUserLoginTrait;
 

diff --git a/tests/Controller/AddressBookUpdateAddressApiTest.php b/tests/Controller/AddressBookUpdateAddressApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use PHPUnit\Framework\Assert;
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;

diff --git a/tests/Controller/CartAddCouponShopApiTest.php b/tests/Controller/CartAddCouponShopApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\PickupCart;
 use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;

diff --git a/tests/Controller/CartApiTest.php b/tests/Controller/CartApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class CartApiTest extends JsonApiTestCase

diff --git a/tests/Controller/CartChangeItemQuantityApiTest.php b/tests/Controller/CartChangeItemQuantityApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;

diff --git a/tests/Controller/CartDropCartApiTest.php b/tests/Controller/CartDropCartApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\ShopApiPlugin\Command\AddressOrder;

diff --git a/tests/Controller/CartPickupApiTest.php b/tests/Controller/CartPickupApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\PickupCart;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/Controller/CartPutItemToCartApiTest.php b/tests/Controller/CartPutItemToCartApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\ShopApiPlugin\Command\AddressOrder;

diff --git a/tests/Controller/CartPutItemsToCartApiTest.php b/tests/Controller/CartPutItemsToCartApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\PickupCart;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/Controller/CartRemoveCouponShopApiTest.php b/tests/Controller/CartRemoveCouponShopApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\AddCoupon;
 use Sylius\ShopApiPlugin\Command\PickupCart;

diff --git a/tests/Controller/CartRemoveItemFromCartApiTest.php b/tests/Controller/CartRemoveItemFromCartApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;

diff --git a/tests/Controller/CartSummarizeApiTest.php b/tests/Controller/CartSummarizeApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\AddCoupon;
 use Sylius\ShopApiPlugin\Command\PickupCart;

diff --git a/tests/Controller/CheckoutAddressApiTest.php b/tests/Controller/CheckoutAddressApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\PickupCart;
 use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;

diff --git a/tests/Controller/CheckoutChoosePaymentMethodApiTest.php b/tests/Controller/CheckoutChoosePaymentMethodApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\AddressOrder;
 use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;

diff --git a/tests/Controller/CheckoutChooseShippingMethodApiTest.php b/tests/Controller/CheckoutChooseShippingMethodApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\AddressOrder;
 use Sylius\ShopApiPlugin\Command\PickupCart;

diff --git a/tests/Controller/CheckoutCompleteOrderApiTest.php b/tests/Controller/CheckoutCompleteOrderApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\AddressOrder;
 use Sylius\ShopApiPlugin\Command\ChoosePaymentMethod;

diff --git a/tests/Controller/CheckoutShowAvailablePaymentMethodsShopApiTest.php b/tests/Controller/CheckoutShowAvailablePaymentMethodsShopApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\AddressOrder;
 use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;

diff --git a/tests/Controller/CheckoutShowAvailableShippingMethodsShopApiTest.php b/tests/Controller/CheckoutShowAvailableShippingMethodsShopApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\ShopApiPlugin\Command\AddressOrder;
 use Sylius\ShopApiPlugin\Command\PickupCart;

diff --git a/tests/Controller/CheckoutSummarizeApiTest.php b/tests/Controller/CheckoutSummarizeApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;

diff --git a/tests/Controller/CustomerLoginApiTest.php b/tests/Controller/CustomerLoginApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\Utils\PurgeSpooledMessagesTrait;

diff --git a/tests/Controller/CustomerRegisterApiTest.php b/tests/Controller/CustomerRegisterApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use PHPUnit\Framework\Assert;
 use Sylius\Component\Core\Test\Services\EmailCheckerInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;

diff --git a/tests/Controller/CustomerRequestPasswordResettingApiTest.php b/tests/Controller/CustomerRequestPasswordResettingApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Sylius\Component\Core\Test\Services\EmailCheckerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/Controller/CustomerResendVerificationTokenApiTest.php b/tests/Controller/CustomerResendVerificationTokenApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Sylius\Component\Core\Test\Services\EmailCheckerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/Controller/CustomerResetPasswordApiTest.php b/tests/Controller/CustomerResetPasswordApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

diff --git a/tests/Controller/CustomerUpdateCustomerApiTest.php b/tests/Controller/CustomerUpdateCustomerApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use PHPUnit\Framework\Assert;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Repository\CustomerRepositoryInterface;

diff --git a/tests/Controller/CustomerVerifyApiTest.php b/tests/Controller/CustomerVerifyApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/Controller/JsonApiTestCase.php b/tests/Controller/JsonApiTestCase.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Sylius\ShopApiPlugin\Controller;
+
+abstract class JsonApiTestCase extends \Lakion\ApiTestCase\JsonApiTestCase
+{
+    protected function get($id)
+    {
+        if (property_exists(static::class, 'container')) {
+            return static::$container->get($id);
+        }
+
+        return parent::get($id);
+    }
+}
diff --git a/tests/Controller/LoggedInCustomerDetailsActionTest.php b/tests/Controller/LoggedInCustomerDetailsActionTest.php
@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-namespace Tests\Sylius\ShopApiPlugin\Controller\Customer;
+namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class LoggedInCustomerDetailsActionTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductAddReviewByCodeApiTest.php b/tests/Controller/ProductAddReviewByCodeApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductAddReviewByCodeApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductAddReviewBySlugApiTest.php b/tests/Controller/ProductAddReviewBySlugApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductAddReviewBySlugApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductShowCatalogByCodeApiTest.php b/tests/Controller/ProductShowCatalogByCodeApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductShowCatalogByCodeApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductShowCatalogBySlugApiTest.php b/tests/Controller/ProductShowCatalogBySlugApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductShowCatalogBySlugApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductShowDetailsByCodeApiTest.php b/tests/Controller/ProductShowDetailsByCodeApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductShowDetailsByCodeApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductShowDetailsBySlugApiTest.php b/tests/Controller/ProductShowDetailsBySlugApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductShowDetailsBySlugApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductShowLatestApiTest.php b/tests/Controller/ProductShowLatestApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductShowLatestApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductShowReviewsByCodeApiTest.php b/tests/Controller/ProductShowReviewsByCodeApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductShowReviewsByCodeApiTest extends JsonApiTestCase

diff --git a/tests/Controller/ProductShowReviewsBySlugApiTest.php b/tests/Controller/ProductShowReviewsBySlugApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class ProductShowReviewsBySlugApiTest extends JsonApiTestCase

diff --git a/tests/Controller/TaxonShowDetailsApiTest.php b/tests/Controller/TaxonShowDetailsApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class TaxonShowDetailsApiTest extends JsonApiTestCase

diff --git a/tests/Controller/TaxonShowTreeApiTest.php b/tests/Controller/TaxonShowTreeApiTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Sylius\ShopApiPlugin\Controller;
 
-use Lakion\ApiTestCase\JsonApiTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 final class TaxonShowTreeApiTest extends JsonApiTestCase