Merge branch '1.1'

* 1.1:
  Update ApiTestCase to ^2.0
  Use "^" instead of "~" wherever possible
  Update SymfonyTest libraries in packages
  Update packages PHPUnit to ^6.5
  Upgrade tests to PHPUnit 6 and fix the broken ones

src/Sylius/Bundle/AddressingBundle/composer.json

@@ -33,9 +33,9 @@
         "symfony/dependency-injection": "^3.4",
         "symfony/form": "^3.4",
         "symfony/validator": "^3.4",
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^6.5",
         "symfony/browser-kit": "^3.4",
-        "incenteev/composer-parameter-handler": "~2.0",
+        "incenteev/composer-parameter-handler": "^2.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0"
     },
     "conflict": {

src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\AdminApiBundle\Fixture\ApiAccessTokenFixture;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 
-final class ApiAccessTokenFixtureTest extends \PHPUnit_Framework_TestCase
+final class ApiAccessTokenFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php → src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiClientFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\AdminApiBundle\Fixture\ApiClientFixture;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 
-class OAuthCredentialsFixtureTest extends \PHPUnit_Framework_TestCase
+final class ApiClientFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/AdminApiBundle/composer.json

@@ -31,7 +31,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^4.0",
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^6.5",
         "symfony/dependency-injection": "^3.4",
         "twig/twig": "^2.0"
     },

src/Sylius/Bundle/AdminBundle/Tests/Controller/NotificationControllerTest.php

@@ -16,6 +16,7 @@
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ConnectException;
 use Http\Message\MessageFactory;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -24,7 +25,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
-final class NotificationControllerTest extends \PHPUnit_Framework_TestCase
+final class NotificationControllerTest extends TestCase
 {
     /**
      * @var ClientInterface

src/Sylius/Bundle/AdminBundle/composer.json

@@ -28,7 +28,7 @@
         "symfony/framework-bundle": "^3.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^6.5",
         "phpspec/phpspec": "^4.0",
         "symfony/dependency-injection": "^3.4"
     },

src/Sylius/Bundle/AttributeBundle/composer.json

@@ -32,11 +32,11 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^4.0",
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^6.5",
         "symfony/dependency-injection": "^3.4",
         "symfony/form": "^3.4",
         "symfony/browser-kit": "^3.4",
-        "incenteev/composer-parameter-handler": "~2.0",
+        "incenteev/composer-parameter-handler": "^2.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0"
     },
     "config": {

src/Sylius/Bundle/ChannelBundle/Tests/DependencyInjection/Compiler/CompositeChannelContextPassTest.php

@@ -15,6 +15,7 @@
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\DefinitionHasMethodCallConstraint;
+use PHPUnit\Framework\Constraint\LogicalNot;
 use Sylius\Bundle\ChannelBundle\DependencyInjection\Compiler\CompositeChannelContextPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -128,7 +129,7 @@ private function assertContainerBuilderNotHasServiceDefinitionWithMethodCall(
 
         self::assertThat(
             $definition,
-            new \PHPUnit_Framework_Constraint_Not(new DefinitionHasMethodCallConstraint($method, $arguments))
+            new LogicalNot(new DefinitionHasMethodCallConstraint($method, $arguments))
         );
     }
 }

src/Sylius/Bundle/ChannelBundle/Tests/DependencyInjection/Compiler/CompositeRequestResolverPassTest.php

@@ -15,6 +15,7 @@
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\DefinitionHasMethodCallConstraint;
+use PHPUnit\Framework\Constraint\LogicalNot;
 use Sylius\Bundle\ChannelBundle\DependencyInjection\Compiler\CompositeRequestResolverPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -126,7 +127,7 @@ private function assertContainerBuilderNotHasServiceDefinitionWithMethodCall(
 
         self::assertThat(
             $definition,
-            new \PHPUnit_Framework_Constraint_Not(new DefinitionHasMethodCallConstraint($method, $arguments))
+            new LogicalNot(new DefinitionHasMethodCallConstraint($method, $arguments))
         );
     }
 }

src/Sylius/Bundle/ChannelBundle/composer.json

@@ -27,15 +27,15 @@
         "symfony/framework-bundle": "^3.4"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^1.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
         "phpspec/phpspec": "^4.0",
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^6.5",
         "twig/twig": "^2.0",
         "doctrine/orm": "^2.5",
         "symfony/dependency-injection": "^3.4",
         "symfony/form": "^3.4",
         "symfony/browser-kit": "^3.4",
-        "incenteev/composer-parameter-handler": "~2.0",
+        "incenteev/composer-parameter-handler": "^2.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0"
     },
     "config": {

src/Sylius/Bundle/CoreBundle/Tests/Fixture/AddressFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\AddressFixture;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 
-final class AddressFixtureTest extends \PHPUnit_Framework_TestCase
+final class AddressFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/AdminUserFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\AdminUserFixture;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 
-final class AdminUserFixtureTest extends \PHPUnit_Framework_TestCase
+final class AdminUserFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ChannelFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\ChannelFixture;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 
-final class ChannelFixtureTest extends \PHPUnit_Framework_TestCase
+final class ChannelFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/CurrencyFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\CurrencyFixture;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 
-final class CurrencyFixtureTest extends \PHPUnit_Framework_TestCase
+final class CurrencyFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/CustomerGroupFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\CustomerGroupFixture;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 
-final class CustomerGroupFixtureTest extends \PHPUnit_Framework_TestCase
+final class CustomerGroupFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/GeographicalFixtureTest.php

@@ -15,12 +15,13 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\GeographicalFixture;
 use Sylius\Component\Addressing\Factory\ZoneFactoryInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Symfony\Component\Intl\Intl;
 
-final class GeographicalFixtureTest extends \PHPUnit_Framework_TestCase
+final class GeographicalFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/LocaleFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\LocaleFixture;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 
-final class LocaleFixtureTest extends \PHPUnit_Framework_TestCase
+final class LocaleFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/PaymentMethodFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\PaymentMethodFixture;
 
-final class PaymentMethodFixtureTest extends \PHPUnit_Framework_TestCase
+final class PaymentMethodFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ProductAssociationFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ProductAssociationFixture;
 
-final class ProductAssociationFixtureTest extends \PHPUnit_Framework_TestCase
+final class ProductAssociationFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ProductAssociationTypeFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ProductAssociationTypeFixture;
 
-final class ProductAssociationTypeFixtureTest extends \PHPUnit_Framework_TestCase
+final class ProductAssociationTypeFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ProductAttributeFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ProductAttributeFixture;
 
-final class ProductAttributeFixtureTest extends \PHPUnit_Framework_TestCase
+final class ProductAttributeFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ProductFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ProductFixture;
 
-final class ProductFixtureTest extends \PHPUnit_Framework_TestCase
+final class ProductFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ProductOptionFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ProductOptionFixture;
 
-final class ProductOptionFixtureTest extends \PHPUnit_Framework_TestCase
+final class ProductOptionFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ProductReviewFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ProductReviewFixture;
 
-final class ProductReviewFixtureTest extends \PHPUnit_Framework_TestCase
+final class ProductReviewFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/PromotionFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\PromotionFixture;
 
-final class PromotionFixtureTest extends \PHPUnit_Framework_TestCase
+final class PromotionFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ShippingCategoryFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ShippingCategoryFixture;
 
-final class ShippingCategoryFixtureTest extends \PHPUnit_Framework_TestCase
+final class ShippingCategoryFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ShippingMethodFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ShippingMethodFixture;
 
-final class ShippingMethodFixtureTest extends \PHPUnit_Framework_TestCase
+final class ShippingMethodFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/ShopUserFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\ShopUserFixture;
 
-final class ShopUserFixtureTest extends \PHPUnit_Framework_TestCase
+final class ShopUserFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 

src/Sylius/Bundle/CoreBundle/Tests/Fixture/TaxCategoryFixtureTest.php

@@ -15,10 +15,11 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
+use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\TaxCategoryFixture;
 
-final class TaxCategoryFixtureTest extends \PHPUnit_Framework_TestCase
+final class TaxCategoryFixtureTest extends TestCase
 {
     use ConfigurationTestCaseTrait;