Migration de la config à la racine du projet

.php-cs-fixer.php

@@ -5,14 +5,14 @@
 $finder = new PhpCsFixer\Finder()
     ->name('*.php')
     ->in([
-        __DIR__ . '/app',
+        __DIR__ . '/config',
         __DIR__ . '/db',
         __DIR__ . '/htdocs/pages',
         __DIR__ . '/sources',
         __DIR__ . '/tests',
     ])
     ->notPath([
-        'config/reference.php',
+        'reference.php',
     ])
 ;
 

Makefile

@@ -36,7 +36,7 @@ help:
 	} \
 	{ lastLine = $$0 }' $(MAKEFILE_LIST)
 
-.PHONY: install docker-up docker-stop docker-down test test-functional test-functional-no-js test-functional-js hooks vendors db-seed db-migrations reset-db init console phpstan assets
+.PHONY: install docker-up docker-stop docker-down test test-functional test-functional-no-js test-functional-js hooks vendors db-seed db-migrations reset-db init console phpstan assets config
 
 ##@ Setup
 

composer.json

@@ -105,7 +105,6 @@
         "patches/setasign-tfpdf-tfpdf-php.patch"
       ]
     },
-    "symfony-app-dir": "app",
     "symfony-web-dir": "htdocs",
     "symfony-bin-dir": "bin",
     "symfony-var-dir": "var",

app/config/packages/asset_mapper.yaml → config/packages/asset_mapper.yaml

@@ -2,10 +2,10 @@ framework:
   asset_mapper:
     # The paths to make available to the asset mapper.
     paths:
-      - '%kernel.project_dir%/../assets/'
-    importmap_path: '%kernel.project_dir%/../importmap.php'
+      - '%kernel.project_dir%/assets/'
+    importmap_path: '%kernel.project_dir%/importmap.php'
     missing_import_mode: strict
-    vendor_dir: '%kernel.project_dir%/../assets/vendor'
+    vendor_dir: '%kernel.project_dir%/assets/vendor'
     public_prefix: /dist/
 
 when@prod:

app/config/packages/doctrine.yaml → config/packages/doctrine.yaml

@@ -29,42 +29,42 @@ doctrine:
       Association:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/AppBundle/Association/Entity'
+        dir: '%kernel.project_dir%/sources/AppBundle/Association/Entity'
         prefix: 'AppBundle\Association\Entity'
       AssembleeGenerale:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/AppBundle/AssembleeGenerale/Entity'
+        dir: '%kernel.project_dir%/sources/AppBundle/AssembleeGenerale/Entity'
         prefix: 'AppBundle\AssembleeGenerale\Entity'
       Accounting:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/AppBundle/Accounting/Entity'
+        dir: '%kernel.project_dir%/sources/AppBundle/Accounting/Entity'
         prefix: 'AppBundle\Accounting\Entity'
       Site:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/AppBundle/Site/Entity'
+        dir: '%kernel.project_dir%/sources/AppBundle/Site/Entity'
         prefix: 'AppBundle\Site\Entity'
       SuperApero:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/AppBundle/SuperApero/Entity'
+        dir: '%kernel.project_dir%/sources/AppBundle/SuperApero/Entity'
         prefix: 'AppBundle\SuperApero\Entity'
       Veille:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/AppBundle/Veille/Entity'
+        dir: '%kernel.project_dir%/sources/AppBundle/Veille/Entity'
         prefix: 'AppBundle\Veille\Entity'
       Event:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/AppBundle/Event/Entity'
+        dir: '%kernel.project_dir%/sources/AppBundle/Event/Entity'
         prefix: 'AppBundle\Event\Entity'
       PlanetePHP:
         type: attribute
         is_bundle: false
-        dir: '%kernel.project_dir%/../sources/PlanetePHP'
+        dir: '%kernel.project_dir%/sources/PlanetePHP'
         prefix: 'PlanetePHP'
 
 when@test:

app/config/packages/ewz_recaptcha.yaml → config/packages/ewz_recaptcha.yaml

@@ -1,3 +1,7 @@
 ewz_recaptcha:
     public_key: '%env(RECAPTCHA_PUBLIC_KEY)%'
     private_key: '%env(RECAPTCHA_PRIVATE_KEY)%'
+
+when@test:
+    ewz_recaptcha:
+        enabled: false

app/config/packages/framework.yaml → config/packages/framework.yaml

@@ -3,10 +3,9 @@ framework:
     translator:
         fallbacks: ["%locale%"]
         enabled: true
-        default_path: "%kernel.project_dir%/../translations"
+        default_path: "%kernel.project_dir%/translations"
     secret:          "%env(SECRET)%"
     router:
-        resource: "%kernel.project_dir%/config/routing.yml"
         strict_requirements: ~
         utf8: true
     form:            ~
@@ -33,3 +32,20 @@ framework:
         Symfony\Component\HttpKernel\Exception\NotFoundHttpException:
             log_level: debug
             status_code: 404
+
+when@dev:
+    framework:
+        router:
+            strict_requirements: true
+        profiler: { only_exceptions: false }
+        ide: '%env(default::resolve:SYMFONY_IDE)%'
+
+when@test:
+    framework:
+        test: ~
+        router:
+            strict_requirements: true
+        profiler:
+            only_exceptions: false
+            collect: false
+        ide: '%env(default::resolve:SYMFONY_IDE)%'

config/packages/monolog.yaml

@@ -0,0 +1,49 @@
+when@dev:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+                channels: ["!event"]
+            console:
+                type:   console
+                channels: ["!event", "!doctrine"]
+
+when@test:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+                channels: ["!event"]
+            console:
+                type:   console
+                channels: ["!event", "!doctrine"]
+            deprecation_stream:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"
+            deprecation_filter:
+                type: filter
+                handler: deprecation_stream
+                max_level: info
+                channels: ["php"]
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type:         fingers_crossed
+                excluded_http_codes: [404]
+                action_level: error
+                handler:      nested
+            nested:
+                type:  stream
+                path:  "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+            syslog_handler:
+                type: syslog
+                level: error
+            console:
+                type:  console

app/config/packages/parameters.yaml → config/packages/parameters.yaml

@@ -1,5 +1,6 @@
 parameters:
     locale: fr
+    database_host: "%env(DATABASE_HOST)%"
     github_authenticator: "AppBundle\\Security\\GithubAuthenticator"
     paybox_ips:
         - '194.2.122.158'
@@ -20,3 +21,11 @@ parameters:
         - '195.25.7.157'
         - '195.25.7.159'
         - '195.25.7.166'
+
+when@dev:
+    parameters:
+        paybox_ips: [127.0.0.1, 192.168.42.1]
+        database_host: "db"
+
+# Les paramètres de l'environnement de test sont dans config/services_test.yaml : ce fichier est
+# chargé après config/services.yaml, qui redéfinit database_name/user/password/port.

app/config/packages/twig.yaml → config/packages/twig.yaml

@@ -5,4 +5,4 @@ twig:
         photo_storage: '@AppBundle\CFP\PhotoStorage'
         global_menu_event_label: '%env(AFUP_GLOBAL_MENU_EVENT_LABEL)%'
     form_themes: ['form_theme.html.twig']
-    default_path: "%kernel.project_dir%/../templates"
+    default_path: "%kernel.project_dir%/templates"

config/packages/web_profiler.yaml

@@ -0,0 +1,9 @@
+when@dev:
+    web_profiler:
+        toolbar: true
+        intercept_redirects: false
+
+when@test:
+    web_profiler:
+        toolbar: false
+        intercept_redirects: false

app/config/reference.php → config/reference.php

@@ -1042,7 +1042,7 @@
  *         enabled?: bool|Param, // Default: false
  *     },
  *     html?: bool|array{
- *         enabled?: bool|Param, // Default: false
+ *         enabled?: bool|Param, // Default: true
  *     },
  *     markdown?: bool|array{
  *         enabled?: bool|Param, // Default: true

app/config/routing.yml → config/routes.yaml

@@ -86,3 +86,18 @@ global:
 
 auth:
     resource: "routing/auth.yml"
+
+when@dev: &profiler_routes
+    _wdt:
+        resource: "@WebProfilerBundle/Resources/config/routing/wdt.php"
+        prefix: /_wdt
+
+    _profiler:
+        resource: "@WebProfilerBundle/Resources/config/routing/profiler.php"
+        prefix: /_profiler
+
+    _errors:
+        resource: "@FrameworkBundle/Resources/config/routing/errors.php"
+        prefix: /_error
+
+when@test: *profiler_routes