[Maintenance] Configuration Reorganization

.github/workflows/build.yml

@@ -16,6 +16,10 @@ on:
             cron: "0 1 * * 6" # Run at 1am every Saturday
     workflow_dispatch: ~
 
+concurrency:
+    group: build-${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
 jobs:
     tests:
         runs-on: ubuntu-latest

config/packages/_sylius.yaml

@@ -10,10 +10,6 @@ imports:
 parameters:
     sylius_core.public_dir: '%kernel.project_dir%/public'
 
-when@dev:
-    sylius_api:
-        enabled: true
-
 sylius_addressing:
     resources:
         address:
@@ -258,14 +254,3 @@ sylius_user:
             user:
                 classes:
                     model: App\Entity\User\UserOAuth
-
-sylius_shop:
-    product_grid:
-        include_all_descendants: true
-
-sylius_theme:
-    sources:
-        filesystem:
-            scan_depth: 1
-            directories:
-                - "%kernel.project_dir%/themes"

config/packages/doctrine.yaml

@@ -1,23 +1,87 @@
-parameters:
-    # Adds a fallback DATABASE_URL if the env var is not set.
-    # This allows you to run cache:warmup even if your
-    # environment variables are not available yet.
-    # You should not need to change this value.
-    env(DATABASE_URL): ''
-
 doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
 
+        # IMPORTANT: You MUST configure your server version,
+        # either here or in the DATABASE_URL env var (see .env file)
+        #server_version: '16'
+
+        profiling_collect_backtrace: '%kernel.debug%'
+        use_savepoints: false
     orm:
-        auto_generate_proxy_classes: '%kernel.debug%'
-        entity_managers:
-            default:
-                auto_mapping: true
-                mappings:
-                    App:
-                        is_bundle: false
-                        type: attribute
-                        dir: '%kernel.project_dir%/src/Entity'
-                        prefix: 'App\Entity'
-                        alias: App
+        auto_generate_proxy_classes: true
+        enable_lazy_ghost_objects: true
+        report_fields_where_declared: true
+        validate_xml_mapping: true
+        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+        auto_mapping: true
+        mappings:
+            App:
+                type: attribute
+                is_bundle: false
+                dir: '%kernel.project_dir%/src/Entity'
+                prefix: 'App\Entity'
+                alias: App
+        controller_resolver:
+            auto_mapping: false
+
+framework:
+    cache:
+        pools:
+            doctrine.result_cache_pool:
+                adapter: cache.app
+            doctrine.system_cache_pool:
+                adapter: cache.system
+
+when@prod:
+    doctrine:
+        orm:
+            auto_generate_proxy_classes: false
+            proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
+            query_cache_driver:
+                type: pool
+                pool: doctrine.system_cache_pool
+            result_cache_driver:
+                type: pool
+                pool: doctrine.result_cache_pool
+    framework:
+        cache:
+            pools:
+                doctrine.result_cache_pool:
+                    adapter: cache.app
+                doctrine.system_cache_pool:
+                    adapter: cache.system
+
+when@test:
+    doctrine:
+        dbal:
+            # "TEST_TOKEN" is typically set by ParaTest
+            dbname_suffix: '_test%env(default::TEST_TOKEN)%'
+
+when@test_cached:
+    doctrine:
+        orm:
+            entity_managers:
+                default:
+                    metadata_cache_driver:
+                        type: service
+                        id: doctrine.system_cache_provider
+                    query_cache_driver:
+                        type: service
+                        id: doctrine.system_cache_provider
+                    result_cache_driver:
+                        type: service
+                        id: doctrine.result_cache_provider
+    services:
+        doctrine.result_cache_provider:
+            class: Doctrine\Common\Cache\Psr6\DoctrineProvider
+            public: false
+            factory: ['Doctrine\Common\Cache\Psr6\DoctrineProvider', 'wrap']
+            arguments:
+                - '@doctrine.result_cache_pool'
+        doctrine.system_cache_provider:
+            class: Doctrine\Common\Cache\Psr6\DoctrineProvider
+            public: false
+            factory: [ 'Doctrine\Common\Cache\Psr6\DoctrineProvider', 'wrap' ]
+            arguments:
+                - '@doctrine.system_cache_pool'

config/packages/monolog.yaml

@@ -2,6 +2,30 @@ monolog:
     channels:
         - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
 
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                buffer_size: 50 # How many messages should be saved? Prevent memory leaks
+            nested:
+                type: stream
+                path: php://stderr
+                level: debug
+                formatter: monolog.formatter.json
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine"]
+            deprecation:
+                type: stream
+                channels: [deprecation]
+                path: php://stderr
+                formatter: monolog.formatter.json
+
 when@dev:
     monolog:
         handlers:
@@ -23,7 +47,7 @@ when@dev:
                 process_psr_3_messages: false
                 channels: ["!event", "!doctrine", "!console"]
 
-when@test:
+when@test: &monolog_test
     monolog:
         handlers:
             main:
@@ -36,26 +60,4 @@ when@test:
                 path: "%kernel.logs_dir%/%kernel.environment%.log"
                 level: debug
 
-when@prod:
-    monolog:
-        handlers:
-            main:
-                type: fingers_crossed
-                action_level: error
-                handler: nested
-                excluded_http_codes: [404, 405]
-                buffer_size: 50 # How many messages should be saved? Prevent memory leaks
-            nested:
-                type: stream
-                path: php://stderr
-                level: debug
-                formatter: monolog.formatter.json
-            console:
-                type: console
-                process_psr_3_messages: false
-                channels: ["!event", "!doctrine"]
-            deprecation:
-                type: stream
-                channels: [deprecation]
-                path: php://stderr
-                formatter: monolog.formatter.json
+when@test_cached: *monolog_test

config/packages/nelmio_alice.yaml

@@ -1,4 +1,4 @@
-when@dev: &dev
+when@dev: &nelmio_alice_dev
     nelmio_alice:
         functions_blacklist:
             - 'current'
@@ -9,4 +9,4 @@ when@dev: &dev
             - 'md5'
             - 'sha1'
 
-when@test: *dev
+when@test: *nelmio_alice_dev

config/packages/security.yaml

@@ -128,3 +128,10 @@ security:
         - { path: "%sylius.security.api_shop_account_regex%/.*", role: ROLE_USER }
         - { path: "%sylius.security.api_shop_route%/customers/token", role: PUBLIC_ACCESS }
         - { path: "%sylius.security.api_shop_regex%/.*", role: PUBLIC_ACCESS }
+
+when@test: &test
+    security:
+        password_hashers:
+            Sylius\Component\User\Model\UserInterface: plaintext
+
+when@test_cached: *test

config/packages/sylius_admin.yaml

@@ -0,0 +1,6 @@
+when@test: &sylius_admin_test
+    sylius_admin:
+        notifications:
+            hub_enabled: false
+
+when@test_cached: *sylius_admin_test

config/packages/sylius_api.yaml

@@ -0,0 +1,3 @@
+when@dev:
+    sylius_api:
+        enabled: true

config/packages/sylius_channel.yaml

@@ -0,0 +1,3 @@
+when@test_cached:
+    sylius_channel:
+        debug: true

config/packages/sylius_shop.yaml

@@ -0,0 +1,3 @@
+sylius_shop:
+    product_grid:
+        include_all_descendants: true

config/packages/sylius_theme.yaml

@@ -0,0 +1,13 @@
+sylius_theme:
+    sources:
+        filesystem:
+            scan_depth: 1
+            directories:
+                - "%kernel.project_dir%/themes"
+
+when@test: &sylius_theme_test
+    sylius_theme:
+        sources:
+            test: ~
+
+when@test_cached: *sylius_theme_test

config/packages/sylius_uploader.yaml

@@ -0,0 +1,6 @@
+when@test: &sylius_uploader_test
+    services:
+        sylius.generator.image_path:
+            class: Sylius\Behat\Service\Generator\UploadedImagePathGenerator
+
+when@test_cached: *sylius_uploader_test