From 2753f196d5d885f5ea49195d34ea1fb67c531886 Mon Sep 17 00:00:00 2001
From: Stefan Doorn <stefan@efectos.nl>
Date: Fri, 15 Jun 2018 18:23:04 +0200
Subject: [PATCH] Test Sylius v1.2 + Symfony 4.1 in CI

---
 .travis.yml                                          |  4 +++-
 phpunit.xml.dist                                     |  1 +
 src/Resources/config/services/providers/products.xml |  2 ++
 src/Resources/config/services/providers/static.xml   |  2 ++
 src/Resources/config/services/providers/taxons.xml   |  2 ++
 src/Resources/config/services/sitemap.xml            |  6 ++++--
 tests/Application/app/AppKernel.php                  | 12 ++++--------
 tests/Application/app/config/config.yml              |  1 -
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd537d0c..af5e8952 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,10 @@ php:
     - 7.2
 
 env:
-    - DEPENDENCY_VERSIONS="sylius/sylius:1.0.* symfony/symfony:3.4.*"
+    - DEPENDENCY_VERSIONS="sylius/sylius:1.2.* symfony/symfony:4.1.*"
+    - DEPENDENCY_VERSIONS="sylius/sylius:1.2.* symfony/symfony:3.4.*"
     - DEPENDENCY_VERSIONS="sylius/sylius:1.1.* symfony/symfony:3.4.*"
+    - DEPENDENCY_VERSIONS="sylius/sylius:1.0.* symfony/symfony:3.4.*"
 
 cache:
     yarn: true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b7eb6b39..0296871e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,6 +17,7 @@
         <ini name="error_reporting" value="-1" />
         <server name="KERNEL_DIR" value="tests/Application/app/" />
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="1"/>
+        <server name="KERNEL_CLASS" value="AppKernel" />
     </php>
 
     <testsuites>
diff --git a/src/Resources/config/services/providers/products.xml b/src/Resources/config/services/providers/products.xml
index 14cb8926..635706f7 100644
--- a/src/Resources/config/services/providers/products.xml
+++ b/src/Resources/config/services/providers/products.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
+        <defaults autowire="false" autoconfigure="false" public="false" />
+
         <service id="sylius.sitemap_provider.product" class="SitemapPlugin\Provider\ProductUrlProvider">
             <argument type="service" id="sylius.repository.product" />
             <argument type="service" id="router" />
diff --git a/src/Resources/config/services/providers/static.xml b/src/Resources/config/services/providers/static.xml
index 390ea9d6..cb24a857 100644
--- a/src/Resources/config/services/providers/static.xml
+++ b/src/Resources/config/services/providers/static.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
+        <defaults autowire="false" autoconfigure="false" public="false" />
+
         <service id="sylius.sitemap_provider.static" class="SitemapPlugin\Provider\StaticUrlProvider">
             <argument type="service" id="router" />
             <argument type="service" id="sylius.sitemap_url_factory" />
diff --git a/src/Resources/config/services/providers/taxons.xml b/src/Resources/config/services/providers/taxons.xml
index 34d42c37..fa5592a4 100644
--- a/src/Resources/config/services/providers/taxons.xml
+++ b/src/Resources/config/services/providers/taxons.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
+        <defaults autowire="false" autoconfigure="false" public="false" />
+
         <service id="sylius.sitemap_provider.taxon" class="SitemapPlugin\Provider\TaxonUrlProvider">
             <argument type="service" id="sylius.repository.taxon" />
             <argument type="service" id="router" />
diff --git a/src/Resources/config/services/sitemap.xml b/src/Resources/config/services/sitemap.xml
index d6f6b503..c77ad89a 100644
--- a/src/Resources/config/services/sitemap.xml
+++ b/src/Resources/config/services/sitemap.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.controller.sitemap" class="SitemapPlugin\Controller\SitemapController">
+        <defaults autowire="false" autoconfigure="false" public="false" />
+
+        <service id="sylius.controller.sitemap" class="SitemapPlugin\Controller\SitemapController" public="true">
             <argument type="service" id="sylius.sitemap_renderer"/>
             <argument type="service" id="sylius.sitemap_builder" />
         </service>
-        <service id="sylius.controller.sitemap_index" class="SitemapPlugin\Controller\SitemapIndexController">
+        <service id="sylius.controller.sitemap_index" class="SitemapPlugin\Controller\SitemapIndexController" public="true">
             <argument type="service" id="sylius.sitemap_index_renderer"/>
             <argument type="service" id="sylius.sitemap_index_builder" />
         </service>
diff --git a/tests/Application/app/AppKernel.php b/tests/Application/app/AppKernel.php
index 8497ff9a..cbeb1386 100644
--- a/tests/Application/app/AppKernel.php
+++ b/tests/Application/app/AppKernel.php
@@ -11,22 +11,18 @@ final class AppKernel extends Kernel
      */
     public function registerBundles(): array
     {
-        $bundles = array_merge(parent::registerBundles(), [
+        return array_merge(parent::registerBundles(), [
             new \Sylius\Bundle\AdminBundle\SyliusAdminBundle(),
             new \Sylius\Bundle\ShopBundle\SyliusShopBundle(),
 
             new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusApiBundle
             new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(),
 
+            new \Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle(),
+            new \Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle(),
+
             new SitemapPlugin(),
         ]);
-
-        if (version_compare(Kernel::VERSION, '1.2', 'lt')) {
-            $bundles[] = new \Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle();
-            $bundles[] = new \Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle();
-        }
-
-        return $bundles;
     }
 
     /**
diff --git a/tests/Application/app/config/config.yml b/tests/Application/app/config/config.yml
index f2657675..d2166608 100644
--- a/tests/Application/app/config/config.yml
+++ b/tests/Application/app/config/config.yml
@@ -28,7 +28,6 @@ framework:
     validation: { enable_annotations: true }
     templating: { engines: ["twig"] }
     default_locale: "%locale%"
-    trusted_proxies: ~
     session:
         storage_id: session.storage.mock_file
     test: ~