Ajout de symfony/dotenv

Author: vgreb

Makefile

@@ -108,7 +108,7 @@ test-functional: data config htdocs/uploads tmp
 	make clean-test-deprecated-log
 	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephptest ./bin/console cache:warmup --env=test
 	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephptest ./bin/bdi detect drivers
-	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephptest ./bin/behat
+	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephptest ./bin/behat --colors
 	make var/logs/test.deprecations_grouped.log
 	$(DOCKER_COMP) stop dbtest apachephptest mailcatcher
 

app/config/config.php

@@ -1,4 +1,3 @@
 imports:
-    - { resource: config.php }
     - { resource: services.yml }
     - { resource: packages/*.yaml }

app/config/config.yml

@@ -33,6 +33,7 @@ monolog:
 
 parameters:
     paybox_ips: [127.0.0.1, 192.168.42.1]
+    database_host: "db"
 
 #swiftmailer:
 #    delivery_address: me@example.com

app/config/config_dev.yml

@@ -1,6 +1,9 @@
 imports:
     - { resource: config.yml }
 
+parameters:
+    database_host: "%env(DATABASE_HOST)%"
+
 #doctrine:
 #    orm:
 #        metadata_cache_driver: apc

app/config/config_prod.yml

@@ -1,3 +1,3 @@
 ewz_recaptcha:
-    public_key: '%recaptcha_public_key%'
-    private_key: '%recaptcha_private_key%'
+    public_key: '%env(RECAPTCHA_PUBLIC_KEY)%'
+    private_key: '%env(RECAPTCHA_PRIVATE_KEY)%'

app/config/packages/ewz_recaptcha.yaml

@@ -4,7 +4,7 @@ framework:
         fallbacks: ["%locale%"]
         enabled: true
         default_path: "%kernel.project_dir%/../translations"
-    secret:          "%secret%"
+    secret:          "%env(SECRET)%"
     router:
         resource: "%kernel.project_dir%/config/routing.yml"
         strict_requirements: ~

app/config/packages/framework.yaml

@@ -3,7 +3,7 @@ knpu_oauth2_client:
         # will create a service: knpu.oauth2.client.facebook_main
         github_main:
             type: github
-            client_id: "%github_client_id%"
-            client_secret: "%github_client_secret%"
+            client_id: "%env(GITHUB_CLIENT_ID)%"
+            client_secret: "%env(GITHUB_CLIENT_SECRET)%"
             # see below
             redirect_route: connection_github_check

app/config/packages/knpu_oauth2_client.yaml

@@ -68,7 +68,7 @@ security:
         - { path: ^/admin/(members/reporting|association/relances|talk|slackmembers/check|healthcheck), roles: ROLE_ADMIN}
         - { path: ^/member, roles: [ROLE_USER, ROLE_MEMBER_EXPIRED]}
         - { path: ^/admin/, roles: ROLE_MEMBER_EXPIRED }
-        - { path: ^/blog, allow_if: "request.getClientIp() in ['217.70.189.71', '127.0.0.1', '192.168.42.1'] or request.server.get('ALLOW_BLOG_FROM_ALL') == 1 or request.headers.get('x-afup-blog-api-key') == '%blog_api_key%'" }
+        - { path: ^/blog, allow_if: "request.getClientIp() in ['217.70.189.71', '127.0.0.1', '192.168.42.1'] or request.server.get('ALLOW_BLOG_FROM_ALL') == 1 or request.headers.get('x-afup-blog-api-key') == '%env(BLOG_API_KEY)%'" }
         - { path: ^/blog, roles: ROLE_NO_ACCESS }
         - { path: ^/(event/\w+/tickets|association)paybox-callback, roles: PUBLIC_ACCESS, ips: "%paybox_ips%" }
         - { path: ^/(event/\w+/tickets|association)paybox-callback, roles: ROLE_SUPER_ADMIN }

app/config/packages/security.yaml

@@ -5,9 +5,9 @@ ting:
             charset: utf8mb4
             master:
                 host:     "%database_host%"
-                port:     "%database_port%"
-                user:     "%database_user%"
-                password: "%database_password%"
+                port:     "%env(int:DATABASE_PORT)%"
+                user:     "%env(DATABASE_USER)%"
+                password: "%env(DATABASE_PASSWORD)%"
 
     repositories:
         event: