[Core] All settings from SyliusCoreBundle/Resources/config/app/ moved to /app/config/

app/config/config.yml

@@ -3,81 +3,26 @@
 
 imports:
     - { resource: parameters.yml }
-    - { resource: @SyliusCoreBundle/Resources/config/app/config.yml }
-    - { resource: @SyliusAdminBundle/Resources/config/app/main.yml }
 
-framework:
-    translator:      { fallback: %locale% }
-    secret:          %secret%
-    router:
-        resource: "%kernel.root_dir%/config/routing.yml"
-        strict_requirements: %kernel.debug%
-    form:            true
-    csrf_protection: true
-    validation:      { enable_annotations: true }
-    templating:      { engines: ['twig'] }
-    default_locale:  "%locale%"
-    trusted_proxies: ~
-    session:
-        # handler_id set to null will use default session handler from php.ini
-        handler_id:  ~
+    - { resource: common/assetic.yml }
+    - { resource: common/cmf.yml }
+    - { resource: common/doctrine.yml }
+    - { resource: common/doctrine_cache.yml }
+    - { resource: common/doctrine_migrations.yml }
+    - { resource: common/doctrine_phpcr.yml }
+    - { resource: common/fos_rest.yml }
+    - { resource: common/framework.yml }
+    - { resource: common/jms_serializer.yml }
+    - { resource: common/knp_gaufrette.yml }
+    - { resource: common/knp_snappy.yml }
+    - { resource: common/liip_imagine.yml }
+    - { resource: common/payum.yml }
+    - { resource: common/security.yml }
+    - { resource: common/sonata_block.yml }
+    - { resource: common/stof_doctrine_extensions.yml }
+    - { resource: common/swiftmailer.yml }
+    - { resource: common/sylius.yml }
+    - { resource: common/twig.yml }
+    - { resource: common/winzou_state_machine.yml }
 
-twig:
-    form:
-        resources:
-            - SyliusWebBundle:Common:forms.html.twig
-            - SyliusResourceBundle::forms.html.twig
-            - CmfMediaBundle:Form:fields.html.twig
-    debug:            %kernel.debug%
-    strict_variables: %kernel.debug%
-    paths:
-        "%kernel.root_dir%/../vendor/payum/payum/src/Payum/Core/Resources/views": PayumCore
-        "%kernel.root_dir%/../vendor/payum/payum/src/Payum/Stripe/Resources/views": PayumStripe
-
-assetic:
-    debug:          %kernel.debug%
-    use_controller: false
-    bundles:        ['SyliusWebBundle', 'CmfCreateBundle', 'SyliusResourceBundle']
-    filters:
-        cssrewrite: ~
-
-doctrine:
-    dbal:
-        driver:   %database_driver%
-        host:     %database_host%
-        port:     %database_port%
-        dbname:   %database_name%
-        user:     %database_user%
-        password: %database_password%
-        charset:  UTF8
-    orm:
-        auto_generate_proxy_classes: %kernel.debug%
-        entity_managers:
-            default:
-                auto_mapping: true
-                mappings:
-                    gedmo_loggable:
-                        type: annotation
-                        prefix: Gedmo\Loggable\Entity
-                        dir: "%kernel.root_dir%/../vendor/gedmo/doctrine-extensions/lib/Gedmo/Loggable/Entity"
-                        is_bundle: false
-
-doctrine_phpcr:
-    session:
-        backend: %phpcr_backend%
-        workspace: %phpcr_workspace%
-    odm:
-        auto_mapping: true
-        auto_generate_proxy_classes: %kernel.debug%
-
-swiftmailer:
-    transport: %mailer_transport%
-    host:      %mailer_host%
-    username:  %mailer_user%
-    password:  %mailer_password%
-
-fos_rest:
-    format_listener:
-        rules:
-            - { path: '^/api', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
-            - { path: '^/', stop: true }
+    - { resource: "@SyliusAdminBundle/Resources/config/app/main.yml" }

app/config/config_dev.yml

@@ -3,4 +3,34 @@
 
 imports:
     - { resource: config.yml }
-    - { resource: @SyliusCoreBundle/Resources/config/app/config_dev.yml }
+
+assetic:
+    use_controller: true
+
+doctrine:
+    dbal:
+        dbname: %database_name%_dev
+
+framework:
+    router: { resource: "%kernel.root_dir%/config/routing_dev.yml" }
+    profiler: { only_exceptions: false }
+
+monolog:
+    handlers:
+        main:
+            type: stream
+            path: %kernel.logs_dir%/%kernel.environment%.log
+            level: debug
+        firephp:
+            type: firephp
+            level: info
+
+swiftmailer:
+    disable_delivery: true
+
+sylius_channel:
+    fake_channel_support: true
+
+web_profiler:
+    toolbar: true
+    intercept_redirects: false

app/config/config_prod.yml

@@ -3,4 +3,18 @@
 
 imports:
     - { resource: config.yml }
-    - { resource: @SyliusCoreBundle/Resources/config/app/config_prod.yml }
+
+framework:
+    router:
+        strict_requirements: null
+
+monolog:
+    handlers:
+        main:
+            type: fingers_crossed
+            action_level: error
+            handler: nested
+        nested:
+            type: stream
+            path: %kernel.logs_dir%/%kernel.environment%.log
+            level: debug

app/config/config_test.yml

@@ -3,4 +3,61 @@
 
 imports:
     - { resource: config.yml }
-    - { resource: @SyliusCoreBundle/Resources/config/app/config_test.yml }
+
+parameters:
+    sylius.order.allow_guest_order: true
+
+doctrine:
+    dbal:
+        dbname: %database_name%_test
+        path: %database_path%
+        driver_class: Sylius\Bundle\CoreBundle\Test\MySqlDriver
+
+doctrine_cache:
+    providers:
+        sylius_settings:
+            type: array
+
+framework:
+    test: ~
+    default_locale: "en"
+    session:
+        storage_id: session.storage.mock_file
+
+monolog:
+    handlers:
+        main:
+            type: stream
+            path: %kernel.logs_dir%/%kernel.environment%.log
+            level: error
+
+payum:
+    gateways:
+        paypal_express_checkout:
+            paypal_express_checkout_nvp:
+                username: TEST
+                password: TEST
+                signature: TEST
+                sandbox: true
+
+swiftmailer:
+    disable_delivery: true
+
+sylius_money:
+    currency: EUR
+    locale: en_US
+
+sylius_payment:
+    gateways:
+        cc: Credit Card
+        test: Test
+        stripe: Stripe
+
+sylius_rbac:
+    authorization_checker: sylius.authorization_checker.toggleable
+
+sylius_channel:
+    fake_channel_support: true
+
+twig:
+    exception_controller: 'Sylius\Bundle\CoreBundle\Controller\VerboseExceptionController::showAction'

app/config/config_test_cached.yml

@@ -2,5 +2,23 @@
 # (c) Paweł Jędrzejewski
 
 imports:
-    - { resource: config_test.yml }
-    - { resource: @SyliusCoreBundle/Resources/config/app/config_test_cached.yml }
+    - { resource: config.yml }
+
+doctrine:
+    orm:
+        entity_managers:
+            default:
+                metadata_cache_driver:
+                    type: memcached
+                    host: localhost
+                    port: 11211
+
+doctrine_phpcr:
+    odm:
+        metadata_cache_driver:
+            type: memcached
+            host: localhost
+            port: 11211
+
+twig:
+    strict_variables: true

src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml

@@ -1,24 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-imports:
-    - { resource: default/assetic.yml }
-    - { resource: default/cmf.yml }
-    - { resource: default/doctrine.yml }
-    - { resource: default/doctrine_cache.yml }
-    - { resource: default/doctrine_migrations.yml }
-    - { resource: default/doctrine_phpcr.yml }
-    - { resource: default/fos_rest.yml }
-    - { resource: default/framework.yml }
-    - { resource: default/jms_serializer.yml }
-    - { resource: default/knp_gaufrette.yml }
-    - { resource: default/knp_snappy.yml }
-    - { resource: default/liip_imagine.yml }
-    - { resource: default/payum.yml }
-    - { resource: default/security.yml }
-    - { resource: default/sonata_block.yml }
-    - { resource: default/stof_doctrine_extensions.yml }
-    - { resource: default/swiftmailer.yml }
-    - { resource: default/sylius.yml }
-    - { resource: default/twig.yml }
-    - { resource: default/winzou_state_machine.yml }

src/Sylius/Bundle/CoreBundle/Resources/config/app/config_dev.yml

@@ -1,33 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-assetic:
-    use_controller: true
-
-doctrine:
-    dbal:
-        dbname: %database_name%_dev
-
-framework:
-    router: { resource: "%kernel.root_dir%/config/routing_dev.yml" }
-    profiler: { only_exceptions: false }
-
-monolog:
-    handlers:
-        main:
-            type: stream
-            path: %kernel.logs_dir%/%kernel.environment%.log
-            level: debug
-        firephp:
-            type: firephp
-            level: info
-
-swiftmailer:
-    disable_delivery: true
-
-sylius_channel:
-    fake_channel_support: true
-
-web_profiler:
-    toolbar: true
-    intercept_redirects: false

src/Sylius/Bundle/CoreBundle/Resources/config/app/config_prod.yml

@@ -1,17 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-framework:
-    router:
-        strict_requirements: null
-
-monolog:
-    handlers:
-        main:
-            type: fingers_crossed
-            action_level: error
-            handler: nested
-        nested:
-            type: stream
-            path: %kernel.logs_dir%/%kernel.environment%.log
-            level: debug

src/Sylius/Bundle/CoreBundle/Resources/config/app/config_test.yml

@@ -1,60 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-parameters:
-    sylius.order.allow_guest_order: true
-
-doctrine:
-    dbal:
-        dbname: %database_name%_test
-        path: %database_path%
-        driver_class: Sylius\Bundle\CoreBundle\Test\MySqlDriver
-
-doctrine_cache:
-    providers:
-        sylius_settings:
-            type: array
-
-framework:
-    test: ~
-    default_locale: "en"
-    session:
-        storage_id: session.storage.mock_file
-
-monolog:
-    handlers:
-        main:
-            type: stream
-            path: %kernel.logs_dir%/%kernel.environment%.log
-            level: error
-
-payum:
-    gateways:
-        paypal_express_checkout:
-            paypal_express_checkout_nvp:
-                username: TEST
-                password: TEST
-                signature: TEST
-                sandbox: true
-
-swiftmailer:
-    disable_delivery: true
-
-sylius_money:
-    currency: EUR
-    locale: en_US
-
-sylius_payment:
-    gateways:
-        cc: Credit Card
-        test: Test
-        stripe: Stripe
-
-sylius_rbac:
-    authorization_checker: sylius.authorization_checker.toggleable
-
-sylius_channel:
-    fake_channel_support: true
-
-twig:
-    exception_controller: 'Sylius\Bundle\CoreBundle\Controller\VerboseExceptionController::showAction'

src/Sylius/Bundle/CoreBundle/Resources/config/app/config_test_cached.yml

@@ -1,21 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-doctrine:
-    orm:
-        entity_managers:
-            default:
-                metadata_cache_driver:
-                    type: memcached
-                    host: localhost
-                    port: 11211
-
-doctrine_phpcr:
-    odm:
-        metadata_cache_driver:
-            type: memcached
-            host: localhost
-            port: 11211
-
-twig:
-    strict_variables: true