Sync with Symfony Standard v3.4

Sylius · Apr 11, 2018 · 66cb998 · 66cb998
1 parent 3a16cac
commit 66cb998
Show file tree

Hide file tree

Showing 27 changed files with 178 additions and 173 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.php_cs
 /.php_cs.cache
 
 /app/config/parameters.yml

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -12,11 +12,9 @@
 declare(strict_types=1);
 
 use Sylius\Bundle\CoreBundle\Application\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-/**
- * @author Paweł Jędrzejewski <pawel@sylius.org>
- * @author Gonzalo Vilaseca <gvilaseca@reiss.co.uk>
- */
 class AppKernel extends Kernel
 {
     /**
@@ -40,4 +38,19 @@ public function registerBundles(): array
 
         return array_merge(parent::registerBundles(), $bundles);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function registerContainerConfiguration(LoaderInterface $loader): void
+    {
+        $loader->load(function (ContainerBuilder $container) {
+            $container->setParameter('container.autowiring.strict_mode', true);
+            $container->setParameter('container.dumper.inline_class_loader', true);
+
+            $container->addObjectResource($this);
+        });
+
+        parent::registerContainerConfiguration($loader);
+    }
 }
diff --git a/app/TestAppKernel.php b/app/TestAppKernel.php
@@ -17,9 +17,6 @@
 use PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-/**
- * @author Kamil Kokot <kamil@kokot.me>
- */
 class TestAppKernel extends AppKernel
 {
     /**
@@ -43,7 +40,7 @@ public function shutdown(): void
     }
 
     /**
-     * Remove all container references from all loaded services
+     * Remove all container references from all loaded services.
      *
      * @param ContainerInterface $container
      */
@@ -55,7 +52,7 @@ protected function cleanupContainer(ContainerInterface $container): void
 
         $services = $containerServicesPropertyReflection->getValue($container) ?: [];
         foreach ($services as $serviceId => $service) {
-            if (in_array($serviceId, $this->getServicesToIgnoreDuringContainerCleanup())) {
+            if (in_array($serviceId, $this->getServicesToIgnoreDuringContainerCleanup(), true)) {
                 continue;
             }
 

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -2,54 +2,55 @@
 # (c) Paweł Jędrzejewski
 
 imports:
-    - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
+    - { resource: '@SyliusCoreBundle/Resources/config/app/config.yml' }
+    - { resource: '@SyliusAdminBundle/Resources/config/app/config.yml' }
+    - { resource: '@SyliusShopBundle/Resources/config/app/config.yml' }
+    - { resource: '@SyliusAdminApiBundle/Resources/config/app/config.yml' }
 
-    - { resource: "parameters.yml" }
-    - { resource: "security.yml" }
+    - { resource: parameters.yml }
+    - { resource: security.yml }
+    - { resource: services.yml }
 
 parameters:
     locale: en_US
 
 framework:
-    translator: { fallbacks: ["%locale%"] }
-    secret: "%secret%"
+    translator: { fallbacks: ['%locale%'] }
+    secret: '%secret%'
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
-        strict_requirements: "%kernel.debug%"
+        resource: '%kernel.project_dir%/app/config/routing.yml'
+        strict_requirements: '%kernel.debug%'
     form: true
     csrf_protection: true
     validation: { enable_annotations: true }
-    templating: { engines: ["twig"] }
-    default_locale: "%locale%"
-    trusted_proxies: ~
+    templating: { engines: ['twig'] }
+    default_locale: '%locale%'
+    trusted_hosts: ~
     session:
         handler_id: ~
 
 doctrine:
     dbal:
-        driver: "%database_driver%"
-        host: "%database_host%"
-        port: "%database_port%"
-        dbname: "%database_name%"
-        user: "%database_user%"
-        password: "%database_password%"
-        server_version: "5.5"
+        driver: '%database_driver%'
+        host: '%database_host%'
+        port: '%database_port%'
+        dbname: '%database_name%'
+        user: '%database_user%'
+        password: '%database_password%'
+        server_version: '5.5'
         charset: UTF8
 
 doctrine_migrations:
-    dir_name: "%kernel.root_dir%/migrations"
+    dir_name: '%kernel.project_dir%/app/migrations'
     namespace: Sylius\Migrations
     table_name: sylius_migrations
     name: Sylius Migrations
 
 swiftmailer:
-    transport: "%mailer_transport%"
-    host: "%mailer_host%"
-    username: "%mailer_user%"
-    password: "%mailer_password%"
+    transport: '%mailer_transport%'
+    host: '%mailer_host%'
+    username: '%mailer_user%'
+    password: '%mailer_password%'
 
 fos_rest:
     exception: ~

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -2,21 +2,21 @@
 # (c) Paweł Jędrzejewski
 
 imports:
-    - { resource: "config.yml" }
+    - { resource: config.yml }
 
 framework:
-    router: { resource: "%kernel.root_dir%/config/routing_dev.yml" }
+    router: { resource: '%kernel.project_dir%/app/config/routing_dev.yml' }
     profiler: { only_exceptions: false }
 
 doctrine:
     dbal:
-        dbname: "%database_name%_dev"
+        dbname: '%database_name%_dev'
 
 monolog:
     handlers:
         main:
             type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            path: '%kernel.logs_dir%/%kernel.environment%.log'
             level: debug
         firephp:
             type: firephp

diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
@@ -2,7 +2,7 @@
 # (c) Paweł Jędrzejewski
 
 imports:
-    - { resource: "config.yml" }
+    - { resource: config.yml }
 
 monolog:
     handlers:
@@ -12,5 +12,5 @@ monolog:
             handler: nested
         nested:
             type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            path: '%kernel.logs_dir%/%kernel.environment%.log'
             level: debug
diff --git a/app/config/config_staging.yml b/app/config/config_staging.yml
@@ -2,7 +2,7 @@
 # (c) Paweł Jędrzejewski
 
 imports:
-    - { resource: "config.yml" }
+    - { resource: config.yml }
 
 monolog:
     handlers:
@@ -12,12 +12,12 @@ monolog:
             handler: nested
         nested:
             type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            path: '%kernel.logs_dir%/%kernel.environment%.log'
             level: debug
 
 doctrine:
     dbal:
-        dbname: "%database_name%_staging"
+        dbname: '%database_name%_staging'
 
 swiftmailer:
     disable_delivery: true
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -2,7 +2,7 @@
 # (c) Paweł Jędrzejewski
 
 imports:
-    - { resource: "config.yml" }
+    - { resource: config.yml }
 
 parameters:
     locale: en_US
@@ -14,20 +14,20 @@ framework:
 
 doctrine:
     dbal:
-        dbname: "%database_name%_test"
+        dbname: '%database_name%_test'
 
 monolog:
     handlers:
         main:
             type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            path: '%kernel.logs_dir%/%kernel.environment%.log'
             level: error
 
 payum:
     gateways:
         paypal_express_checkout:
             factory: paypal_express_checkout
-            payum.http_client: "@sylius.payum.http_client"
+            payum.http_client: '@sylius.payum.http_client'
             username: TEST
             password: TEST
             signature: TEST
@@ -44,7 +44,7 @@ swiftmailer:
     logging: true
     spool:
         type: file
-        path: "%kernel.cache_dir%/spool"
+        path: '%kernel.cache_dir%/spool'
 
 sylius_theme:
     sources:

diff --git a/app/config/config_test_cached.yml b/app/config/config_test_cached.yml
@@ -2,7 +2,7 @@
 # (c) Paweł Jędrzejewski
 
 imports:
-    - { resource: "config_test.yml" }
+    - { resource: config_test.yml }
 
 doctrine:
     orm:
@@ -24,4 +24,4 @@ fos_rest:
         debug: true
 
 doctrine_migrations:
-    dir_name: "%kernel.root_dir%/../vendor/sylius/sylius/app/migrations"
+    dir_name: '%kernel.project_dir%/vendor/sylius/sylius/app/migrations'
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -1,19 +1,19 @@
 parameters:
-    database_driver: "%env(SYLIUS_DATABASE_DRIVER)%"
-    database_host: "%env(SYLIUS_DATABASE_HOST)%"
-    database_port: "%env(SYLIUS_DATABASE_PORT)%"
-    database_name: "%env(SYLIUS_DATABASE_NAME)%"
-    database_user: "%env(SYLIUS_DATABASE_USER)%"
-    database_password: "%env(SYLIUS_DATABASE_PASSWORD)%"
+    database_driver: '%env(SYLIUS_DATABASE_DRIVER)%'
+    database_host: '%env(SYLIUS_DATABASE_HOST)%'
+    database_port: '%env(SYLIUS_DATABASE_PORT)%'
+    database_name: '%env(SYLIUS_DATABASE_NAME)%'
+    database_user: '%env(SYLIUS_DATABASE_USER)%'
+    database_password: '%env(SYLIUS_DATABASE_PASSWORD)%'
     # You should uncomment this if you want use pdo_sqlite.
-    # database_path: "%kernel.root_dir%/data.db3"
+    # database_path: '%kernel.project_dir%/var/data/data.sqlite'
 
-    mailer_transport: "%env(SYLIUS_MAILER_TRANSPORT)%"
-    mailer_host: "%env(SYLIUS_MAILER_HOST)%"
-    mailer_user: "%env(SYLIUS_MAILER_USER)%"
-    mailer_password: "%env(SYLIUS_MAILER_PASSWORD)%"
+    mailer_transport: '%env(SYLIUS_MAILER_TRANSPORT)%'
+    mailer_host: '%env(SYLIUS_MAILER_HOST)%'
+    mailer_user: '%env(SYLIUS_MAILER_USER)%'
+    mailer_password: '%env(SYLIUS_MAILER_PASSWORD)%'
 
-    secret: "%env(SYLIUS_SECRET)"
+    secret: '%env(SYLIUS_SECRET)'
 
     # Fallback values (used if environmental variables are not set)
     env(SYLIUS_DATABASE_DRIVER): pdo_mysql

diff --git a/app/config/router_test_cached.php b/app/config/router_test_cached.php
@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 /*
  * This file implements rewrite rules for PHP built-in web server.
  *

diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -2,21 +2,21 @@
 # (c) Paweł Jędrzejewski
 
 sylius_admin:
-    resource: "@SyliusAdminBundle/Resources/config/routing.yml"
+    resource: '@SyliusAdminBundle/Resources/config/routing.yml'
     prefix: /admin
 
 sylius_api:
-    resource: "@SyliusAdminApiBundle/Resources/config/routing.yml"
+    resource: '@SyliusAdminApiBundle/Resources/config/routing.yml'
     prefix: /api
 
 sylius_shop:
-    resource: "@SyliusShopBundle/Resources/config/routing.yml"
+    resource: '@SyliusShopBundle/Resources/config/routing.yml'
     prefix: /{_locale}
     requirements:
         _locale: ^[a-z]{2}(?:_[A-Z]{2})?$
 
 sylius_shop_payum:
-    resource: "@SyliusShopBundle/Resources/config/routing/payum.yml"
+    resource: '@SyliusShopBundle/Resources/config/routing/payum.yml'
 
 sylius_shop_default_locale:
     path: /
@@ -25,4 +25,4 @@ sylius_shop_default_locale:
         _controller: sylius.controller.shop.locale_switch:switchAction
 
 _liip_imagine:
-    resource: "@LiipImagineBundle/Resources/config/routing.xml"
+    resource: '@LiipImagineBundle/Resources/config/routing.xml'
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
@@ -2,11 +2,11 @@
 # (c) Paweł Jędrzejewski
 
 _wdt:
-    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
+    resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
     prefix:   /_wdt
 
 _profiler:
-    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
+    resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
     prefix:   /_profiler
 
 _main:
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ @@
      * file that was distributed with this source code.
      */
+    declare(strict_types=1);
     /*
      * This file implements rewrite rules for PHP built-in web server.
      *
@@ Expand Down @@