diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6370aa72168..8da398dd32b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q               | A
 | --------------- | -----
-| Branch?         | 1.2, 1.3 or master <!-- see the comment below -->
+| Branch?         | 1.3, 1.4 or master <!-- see the comment below -->
 | Bug fix?        | no/yes
 | New feature?    | no/yes
 | BC breaks?      | no/yes
diff --git a/composer.json b/composer.json
index 5bcf14727bc..fff1df88d1b 100644
--- a/composer.json
+++ b/composer.json
@@ -104,16 +104,16 @@
         "hwi/oauth-bundle": "^0.6",
         "lchrusciel/api-test-case": "^3.1.0",
         "lakion/mink-debug-extension": "^1.2.3",
-        "matthiasnoback/symfony-config-test": "^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
-        "mikey179/vfsStream": "^1.6",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
+        "mikey179/vfsstream": "^1.6",
         "pamil/phpspec-skip-example-extension": "^4.0",
         "pamil/prophecy-common": "^0.1",
         "phpspec/phpspec": "^5.0",
         "phpstan/phpstan-doctrine": "^0.10",
         "phpstan/phpstan-shim": "^0.10",
         "phpstan/phpstan-webmozart-assert": "^0.10",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "sensiolabs/security-checker": "^5.0",
         "stripe/stripe-php": "^4.1",
         "sylius-labs/coding-standard": "^3.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ad0a95adc39..c855f2e329e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
          bootstrap="config/bootstrap.php"
 >
diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json
index c94302940c3..3cc86b5f862 100644
--- a/src/Sylius/Bundle/AddressingBundle/composer.json
+++ b/src/Sylius/Bundle/AddressingBundle/composer.json
@@ -33,7 +33,7 @@
         "symfony/dependency-injection": "^3.4|^4.1.1",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/validator": "^3.4|^4.1.1",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0"
     },
diff --git a/src/Sylius/Bundle/AddressingBundle/phpunit.xml.dist b/src/Sylius/Bundle/AddressingBundle/phpunit.xml.dist
index 6f8a895e79d..567508d4110 100644
--- a/src/Sylius/Bundle/AddressingBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/AddressingBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/AdminApiBundle/composer.json b/src/Sylius/Bundle/AdminApiBundle/composer.json
index 1d48844e5cd..cd1e560244c 100644
--- a/src/Sylius/Bundle/AdminApiBundle/composer.json
+++ b/src/Sylius/Bundle/AdminApiBundle/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1",
         "twig/twig": "^2.0"
     },
diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json
index 976fa2fdbd5..954d1bb97f0 100644
--- a/src/Sylius/Bundle/AdminBundle/composer.json
+++ b/src/Sylius/Bundle/AdminBundle/composer.json
@@ -29,7 +29,7 @@
     },
     "require-dev": {
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1"
     },
     "conflict": {
diff --git a/src/Sylius/Bundle/AdminBundle/phpunit.xml.dist b/src/Sylius/Bundle/AdminBundle/phpunit.xml.dist
index 8e948485a42..7762e2fbcb1 100644
--- a/src/Sylius/Bundle/AdminBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/AdminBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <testsuites>
diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json
index 8b5578ebac4..b2492d99446 100644
--- a/src/Sylius/Bundle/AttributeBundle/composer.json
+++ b/src/Sylius/Bundle/AttributeBundle/composer.json
@@ -32,7 +32,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/browser-kit": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/AttributeBundle/phpunit.xml.dist b/src/Sylius/Bundle/AttributeBundle/phpunit.xml.dist
index 515f1ccf8f7..4d7097ece20 100644
--- a/src/Sylius/Bundle/AttributeBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/AttributeBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json
index 811836d0e29..6cc1f318eb8 100644
--- a/src/Sylius/Bundle/ChannelBundle/composer.json
+++ b/src/Sylius/Bundle/ChannelBundle/composer.json
@@ -27,9 +27,9 @@
         "symfony/framework-bundle": "^3.4|^4.1.1"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "twig/twig": "^2.0",
         "doctrine/orm": "^2.5",
         "symfony/dependency-injection": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/ChannelBundle/phpunit.xml.dist b/src/Sylius/Bundle/ChannelBundle/phpunit.xml.dist
index 596a077a0e7..8084b6f3fc8 100644
--- a/src/Sylius/Bundle/ChannelBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/ChannelBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json
index 11f412c16c1..9467232395c 100644
--- a/src/Sylius/Bundle/CoreBundle/composer.json
+++ b/src/Sylius/Bundle/CoreBundle/composer.json
@@ -56,10 +56,10 @@
     },
     "require-dev": {
         "hwi/oauth-bundle": "^0.6",
-        "matthiasnoback/symfony-config-test": "^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1"
     },
     "conflict": {
diff --git a/src/Sylius/Bundle/CoreBundle/phpunit.xml.dist b/src/Sylius/Bundle/CoreBundle/phpunit.xml.dist
index 1167b623b89..3b1103301cc 100644
--- a/src/Sylius/Bundle/CoreBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/CoreBundle/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <testsuites>
diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json
index 61de777c467..35c3f8d7121 100644
--- a/src/Sylius/Bundle/CurrencyBundle/composer.json
+++ b/src/Sylius/Bundle/CurrencyBundle/composer.json
@@ -30,7 +30,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "twig/twig": "^2.0",
         "symfony/dependency-injection": "^3.4|^4.1.1",
         "symfony/form": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/CurrencyBundle/phpunit.xml.dist b/src/Sylius/Bundle/CurrencyBundle/phpunit.xml.dist
index ee9a3ec3541..e271a5486f8 100644
--- a/src/Sylius/Bundle/CurrencyBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/CurrencyBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json
index 1d58632e36a..f0c683acaf7 100644
--- a/src/Sylius/Bundle/CustomerBundle/composer.json
+++ b/src/Sylius/Bundle/CustomerBundle/composer.json
@@ -43,7 +43,7 @@
     },
     "require-dev": {
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/browser-kit": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/CustomerBundle/phpunit.xml.dist b/src/Sylius/Bundle/CustomerBundle/phpunit.xml.dist
index b88be054af5..e69f08ab04a 100644
--- a/src/Sylius/Bundle/CustomerBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/CustomerBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/FixturesBundle/composer.json b/src/Sylius/Bundle/FixturesBundle/composer.json
index 24c4f40214d..c4ae7579928 100644
--- a/src/Sylius/Bundle/FixturesBundle/composer.json
+++ b/src/Sylius/Bundle/FixturesBundle/composer.json
@@ -32,10 +32,10 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.3",
-        "matthiasnoback/symfony-config-test": "^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "twig/twig": "^2.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "symfony/dependency-injection": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/FixturesBundle/phpunit.xml.dist b/src/Sylius/Bundle/FixturesBundle/phpunit.xml.dist
index 809783fc9a5..80f735f9741 100644
--- a/src/Sylius/Bundle/FixturesBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/FixturesBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/GridBundle/composer.json b/src/Sylius/Bundle/GridBundle/composer.json
index c60caa53ca0..e02599b2bab 100644
--- a/src/Sylius/Bundle/GridBundle/composer.json
+++ b/src/Sylius/Bundle/GridBundle/composer.json
@@ -33,12 +33,12 @@
         "doctrine/orm": "^2.5",
         "doctrine/phpcr-odm": "^1.3",
         "jackalope/jackalope-doctrine-dbal": "^1.2",
-        "matthiasnoback/symfony-config-test": "^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "ocramius/proxy-manager": "^2.1",
         "pagerfanta/pagerfanta": "^1.0|^2.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "symfony/dependency-injection": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/GridBundle/phpunit.xml.dist b/src/Sylius/Bundle/GridBundle/phpunit.xml.dist
index 66c7f0b297c..fc6ca0e2bb0 100644
--- a/src/Sylius/Bundle/GridBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/GridBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json
index 5703326bbd0..c4d141a031b 100644
--- a/src/Sylius/Bundle/InventoryBundle/composer.json
+++ b/src/Sylius/Bundle/InventoryBundle/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "twig/twig": "^2.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "symfony/dependency-injection": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/InventoryBundle/phpunit.xml.dist b/src/Sylius/Bundle/InventoryBundle/phpunit.xml.dist
index 1d03cd8dbd1..2cdd8bb0491 100644
--- a/src/Sylius/Bundle/InventoryBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/InventoryBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json
index 6ddd62eaa4e..5129bc82ba0 100644
--- a/src/Sylius/Bundle/LocaleBundle/composer.json
+++ b/src/Sylius/Bundle/LocaleBundle/composer.json
@@ -30,7 +30,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "twig/twig": "^2.0",
         "ocramius/proxy-manager": "^2.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/LocaleBundle/phpunit.xml.dist b/src/Sylius/Bundle/LocaleBundle/phpunit.xml.dist
index 05423274e62..5b84813d46c 100644
--- a/src/Sylius/Bundle/LocaleBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/LocaleBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/MailerBundle/composer.json b/src/Sylius/Bundle/MailerBundle/composer.json
index dd1907acbf9..850f6eda210 100644
--- a/src/Sylius/Bundle/MailerBundle/composer.json
+++ b/src/Sylius/Bundle/MailerBundle/composer.json
@@ -27,7 +27,7 @@
     },
     "require-dev": {
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "symfony/dependency-injection": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/MailerBundle/phpunit.xml.dist b/src/Sylius/Bundle/MailerBundle/phpunit.xml.dist
index e41de44205f..38bae51e9c0 100644
--- a/src/Sylius/Bundle/MailerBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/MailerBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json
index 369d9f79035..73094eefaea 100644
--- a/src/Sylius/Bundle/MoneyBundle/composer.json
+++ b/src/Sylius/Bundle/MoneyBundle/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "twig/twig": "^2.0",
         "sylius/currency-bundle": "^1.2",
         "symfony/form": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/MoneyBundle/phpunit.xml.dist b/src/Sylius/Bundle/MoneyBundle/phpunit.xml.dist
index 3db715fe7b8..e463549b424 100644
--- a/src/Sylius/Bundle/MoneyBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/MoneyBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json
index 3a9b838c5cb..9c84bae24d7 100644
--- a/src/Sylius/Bundle/OrderBundle/composer.json
+++ b/src/Sylius/Bundle/OrderBundle/composer.json
@@ -31,9 +31,9 @@
     },
     "require-dev": {
         "doctrine/orm": "^2.5",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "symfony/dependency-injection": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/OrderBundle/phpunit.xml.dist b/src/Sylius/Bundle/OrderBundle/phpunit.xml.dist
index e85f9862b56..548dcb78314 100644
--- a/src/Sylius/Bundle/OrderBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/OrderBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json
index c853fe2a465..150d1002e2e 100644
--- a/src/Sylius/Bundle/PaymentBundle/composer.json
+++ b/src/Sylius/Bundle/PaymentBundle/composer.json
@@ -30,7 +30,7 @@
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
         "sylius/locale-bundle": "^1.2",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "symfony/dependency-injection": "^3.4|^4.1.1",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0"
diff --git a/src/Sylius/Bundle/PaymentBundle/phpunit.xml.dist b/src/Sylius/Bundle/PaymentBundle/phpunit.xml.dist
index 06bdb3e9dcb..e7db8848544 100644
--- a/src/Sylius/Bundle/PaymentBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/PaymentBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/ProductBundle/composer.json b/src/Sylius/Bundle/ProductBundle/composer.json
index fa8cfde2f9b..ca01785a6a1 100644
--- a/src/Sylius/Bundle/ProductBundle/composer.json
+++ b/src/Sylius/Bundle/ProductBundle/composer.json
@@ -32,7 +32,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/validator": "^3.4|^4.1.1",
         "symfony/browser-kit": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/ProductBundle/phpunit.xml.dist b/src/Sylius/Bundle/ProductBundle/phpunit.xml.dist
index 72bc08b324b..7b7ad5b62ad 100644
--- a/src/Sylius/Bundle/ProductBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/ProductBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json
index b3ebd192606..43a36d664f8 100644
--- a/src/Sylius/Bundle/PromotionBundle/composer.json
+++ b/src/Sylius/Bundle/PromotionBundle/composer.json
@@ -31,9 +31,9 @@
     },
     "require-dev": {
         "doctrine/orm": "^2.5",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/validator": "^3.4|^4.1.1",
         "symfony/browser-kit": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/PromotionBundle/phpunit.xml.dist b/src/Sylius/Bundle/PromotionBundle/phpunit.xml.dist
index 6d88d6faeff..c083b502c31 100644
--- a/src/Sylius/Bundle/PromotionBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/PromotionBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/ResourceBundle/composer.json b/src/Sylius/Bundle/ResourceBundle/composer.json
index e84acb55804..cdbd98f1d9f 100644
--- a/src/Sylius/Bundle/ResourceBundle/composer.json
+++ b/src/Sylius/Bundle/ResourceBundle/composer.json
@@ -48,9 +48,9 @@
         "doctrine/phpcr-odm": "^1.4",
         "jackalope/jackalope-doctrine-dbal": "^1.2",
         "lakion/api-test-case": "^3.1.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "sylius/grid-bundle": "^1.2",
         "sylius/locale": "^1.2",
         "symfony/dependency-injection": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/ResourceBundle/phpunit.xml.dist b/src/Sylius/Bundle/ResourceBundle/phpunit.xml.dist
index ededd0f7cd8..d79502c1890 100644
--- a/src/Sylius/Bundle/ResourceBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/ResourceBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/ReviewBundle/composer.json b/src/Sylius/Bundle/ReviewBundle/composer.json
index 1d7daeb4179..0da1b04183c 100644
--- a/src/Sylius/Bundle/ReviewBundle/composer.json
+++ b/src/Sylius/Bundle/ReviewBundle/composer.json
@@ -43,7 +43,7 @@
     },
     "require-dev": {
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/validator": "^3.4|^4.1.1",
         "symfony/browser-kit": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/ReviewBundle/phpunit.xml.dist b/src/Sylius/Bundle/ReviewBundle/phpunit.xml.dist
index 142315c3e76..45590fa598c 100644
--- a/src/Sylius/Bundle/ReviewBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/ReviewBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/ShippingBundle/composer.json b/src/Sylius/Bundle/ShippingBundle/composer.json
index 9dfbadef6fc..b3607f58113 100644
--- a/src/Sylius/Bundle/ShippingBundle/composer.json
+++ b/src/Sylius/Bundle/ShippingBundle/composer.json
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "doctrine/orm": "^2.5",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/validator": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/ShippingBundle/phpunit.xml.dist b/src/Sylius/Bundle/ShippingBundle/phpunit.xml.dist
index bb1d52bef8b..cc243691c86 100644
--- a/src/Sylius/Bundle/ShippingBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/ShippingBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/scss/style.scss b/src/Sylius/Bundle/ShopBundle/Resources/private/scss/style.scss
index a4b03704208..996f8ed2ca2 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/private/scss/style.scss
+++ b/src/Sylius/Bundle/ShopBundle/Resources/private/scss/style.scss
@@ -31,3 +31,15 @@ body {
 .ui.unmargined.segments {
   margin: 0;
 }
+
+#searchbar {
+    display: flex;
+}
+
+#searchbarTextField {
+    flex-grow: 100;
+}
+
+#searchbarButtons {
+    width: fit-content;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_search.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_search.html.twig
index 96315e12dec..1c73b5a80dd 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_search.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_search.html.twig
@@ -1,12 +1,12 @@
 <div class="ui segment">
     <form method="get" action="{{ path('sylius_shop_product_index', {'slug': app.request.attributes.get('slug')}) }}" class="ui loadable form">
-        <div class="ui stackable grid">
-            <div class="eleven wide column">
+        <div class="ui stackable grid" id="searchbar">
+            <div class="column" id="searchbarTextField">
                 {% for filter in products.definition.enabledFilters %}
                     {{ sylius_grid_render_filter(products, filter) }}
                 {% endfor %}
             </div>
-            <div class="three wide column">
+            <div class="right aligned column" id="searchbarButtons">
                 <div class="ui buttons">
                     <button type="submit" class="ui primary icon labeled button"><i class="search icon"></i> {{ 'sylius.ui.search'|trans }}</button>
                     <a href="{{ path('sylius_shop_product_index', {'slug': app.request.attributes.get('slug')}) }}" class="ui negative icon labeled button">
diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json
index 8ec7bdc3d08..62702dc8895 100644
--- a/src/Sylius/Bundle/ShopBundle/composer.json
+++ b/src/Sylius/Bundle/ShopBundle/composer.json
@@ -35,10 +35,10 @@
         "symfony/security-bundle": "^3.4|^4.1.1"
     },
     "require-dev": {
-        "matthiasnoback/symfony-config-test": "^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1"
     },
     "config": {
diff --git a/src/Sylius/Bundle/ShopBundle/phpunit.xml.dist b/src/Sylius/Bundle/ShopBundle/phpunit.xml.dist
index f8b2c84fc84..aa5cf383189 100644
--- a/src/Sylius/Bundle/ShopBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/ShopBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/TaxationBundle/composer.json b/src/Sylius/Bundle/TaxationBundle/composer.json
index 9b329078a31..b124d7a45cb 100644
--- a/src/Sylius/Bundle/TaxationBundle/composer.json
+++ b/src/Sylius/Bundle/TaxationBundle/composer.json
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "doctrine/orm": "^2.5",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "phpspec/phpspec": "^5.0",
         "symfony/form": "^3.4|^4.1.1",
         "symfony/browser-kit": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/TaxationBundle/phpunit.xml.dist b/src/Sylius/Bundle/TaxationBundle/phpunit.xml.dist
index 57d79f02857..eaed8c051ce 100644
--- a/src/Sylius/Bundle/TaxationBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/TaxationBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/TaxonomyBundle/composer.json b/src/Sylius/Bundle/TaxonomyBundle/composer.json
index f1e4356f775..952edf2268a 100644
--- a/src/Sylius/Bundle/TaxonomyBundle/composer.json
+++ b/src/Sylius/Bundle/TaxonomyBundle/composer.json
@@ -30,7 +30,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1"
     },
     "conflict": {
diff --git a/src/Sylius/Bundle/TaxonomyBundle/phpunit.xml.dist b/src/Sylius/Bundle/TaxonomyBundle/phpunit.xml.dist
index 648009ad7f1..08603157997 100644
--- a/src/Sylius/Bundle/TaxonomyBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/TaxonomyBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/ThemeBundle/composer.json b/src/Sylius/Bundle/ThemeBundle/composer.json
index a1bd13a01b4..8f697cf3146 100644
--- a/src/Sylius/Bundle/ThemeBundle/composer.json
+++ b/src/Sylius/Bundle/ThemeBundle/composer.json
@@ -39,11 +39,11 @@
         "zendframework/zend-hydrator": "^2.2"
     },
     "require-dev": {
-        "matthiasnoback/symfony-config-test": "^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0",
-        "mikey179/vfsStream": "^1.6",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
+        "mikey179/vfsstream": "^1.6",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "sylius/registry": "^1.1",
         "symfony/browser-kit": "^3.4|^4.1.1",
         "symfony/security-csrf": "^3.4|^4.1.1",
diff --git a/src/Sylius/Bundle/ThemeBundle/phpunit.xml.dist b/src/Sylius/Bundle/ThemeBundle/phpunit.xml.dist
index 8f35b445c40..d0880bed232 100644
--- a/src/Sylius/Bundle/ThemeBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/ThemeBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>
diff --git a/src/Sylius/Bundle/UserBundle/composer.json b/src/Sylius/Bundle/UserBundle/composer.json
index 22747c79f4a..6da070e88f9 100644
--- a/src/Sylius/Bundle/UserBundle/composer.json
+++ b/src/Sylius/Bundle/UserBundle/composer.json
@@ -47,7 +47,7 @@
         "matthiasnoback/symfony-dependency-injection-test": "^2.0",
         "php-http/guzzle6-adapter": "^1.1",
         "phpspec/phpspec": "^5.0",
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^7.0",
         "symfony/dependency-injection": "^3.4|^4.1.1",
         "symfony/security-bundle": "^3.4|^4.1.1",
         "symfony/swiftmailer-bundle": "^3.1"
diff --git a/src/Sylius/Bundle/UserBundle/phpunit.xml.dist b/src/Sylius/Bundle/UserBundle/phpunit.xml.dist
index ea4f8b74a65..a0bbf0393fb 100644
--- a/src/Sylius/Bundle/UserBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/UserBundle/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
          colors="true"
 >
     <php>