Feature/dotenv thematisation

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.yml

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

app/config/config_dev.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_prod.yml

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

app/config/packages/backoffice_menu.yaml

@@ -181,6 +181,14 @@ parameters:
                         - admin_talk_list
                         - admin_talk_add
                         - admin_talk_edit
+                admin_event_themes_list:
+                    nom: 'Thèmes'
+                    niveau: 'ROLE_FORUM'
+                    url: '/admin/event/themes'
+                    extra_routes:
+                        - admin_event_themes_list
+                        - admin_event_themes_add
+                        - admin_event_themes_edit
                 forum_vote_github:
                     nom: 'Votes visiteurs'
                     niveau: 'ROLE_FORUM'

app/config/packages/ewz_recaptcha.yaml

@@ -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/framework.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/knpu_oauth2_client.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/security.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/ting.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:

app/config/packages/twig.yaml

@@ -3,6 +3,6 @@ twig:
     strict_variables: "%kernel.debug%"
     globals:
         photo_storage: '@AppBundle\CFP\PhotoStorage'
-        global_menu_event_label: '%afup_global_menu_event_label%'
+        global_menu_event_label: '%env(AFUP_GLOBAL_MENU_EVENT_LABEL)%'
     form_themes: ['form_theme.html.twig']
     default_path: "%kernel.project_dir%/../templates"

app/config/routing/admin_event.yml

@@ -167,5 +167,24 @@ admin_event_sessions_delete:
   requirements:
     id: \d+
 
+admin_event_themes_add:
+  path: /themes/add
+  defaults:
+    _controller: AppBundle\Controller\Admin\Event\EventThemeAddEditAction
+    id: null
+
+admin_event_themes_edit:
+  path: /themes/edit/{id}
+  defaults: {_controller: AppBundle\Controller\Admin\Event\EventThemeAddEditAction}
+  requirements:
+    id: \d+
+
+admin_event_themes_list:
+  path: /themes/
+  requirements:
+    id: \d+
+  defaults:
+    _controller: AppBundle\Controller\Admin\Event\EventThemeAction
+
 admin_event_ticket:
   resource: "admin_event_ticket.yml"

app/config/services.yml

@@ -4,8 +4,12 @@ parameters:
     app.badge_dir: "%kernel.project_dir%/../htdocs/uploads/badges"
     app.members_logo_dir: "%kernel.project_dir%/../htdocs/uploads/members_logo"
     app.general_meetings_dir: "%kernel.project_dir%/../htdocs/uploads/general_meetings_reports"
-    bluesky.api.identifier: "%bluesky_api_identifier%"
-    bluesky.api.app_password: "%bluesky_api_app_password%"
+    bluesky.api.identifier: "%env(BLUESKY_API_IDENTIFIER)%"
+    bluesky.api.app_password: "%env(BLUESKY_API_APP_PASSWORD)%"
+    database_name: "%env(DATABASE_NAME)%"
+    database_user: "%env(DATABASE_USER)%"
+    database_password: "%env(DATABASE_PASSWORD)%"
+    database_port: "%env(DATABASE_PORT)%"
 
 services:
 #    service_name:
@@ -29,9 +33,9 @@ services:
     Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler:
         public:    false
         arguments:
-            - 'mysql:host=%database_host%;port=%database_port%;dbname=%database_name%'
-            - db_username: '%database_user%'
-              db_password: '%database_password%'
+            - 'mysql:host=%database_host%;port=%env(int:DATABASE_PORT)%;dbname=%env(DATABASE_NAME)%'
+            - db_username: '%env(DATABASE_USER)%'
+              db_password: '%env(DATABASE_PASSWORD)%'
               lock_mode: !php/const Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler::LOCK_NONE
 
     Laminas\Feed\Reader\Http\ClientInterface: '@PlanetePHP\SymfonyFeedClient'
@@ -84,19 +88,19 @@ services:
 
     AppBundle\Payment\PayboxFactory:
         autowire: true
-        arguments: ["@router", "%paybox_domain_server%", "%paybox_secret_key%", "%paybox_site%", "%paybox_rang%", "%paybox_identifiant%"]
+        arguments: ["@router", "%env(PAYBOX_DOMAIN_SERVER)%", "%env(PAYBOX_SECRET_KEY)%", "%env(PAYBOX_SITE)%", "%env(PAYBOX_RANG)%", "%env(PAYBOX_IDENTIFIANT)%"]
 
     AppBundle\Slack\LegacyClient:
-        arguments: ["%slack_members_legacy_token%"]
+        arguments: ["%env(SLACK_MEMBERS_LEGACY_TOKEN)%"]
 
     Algolia\AlgoliaSearch\SearchClient:
         factory: [ Algolia\AlgoliaSearch\SearchClient, create ]
-        arguments: ["%algolia_app_id%", "%algolia_backend_api_key%"]
+        arguments: ["%env(ALGOLIA_APP_ID)%", "%env(ALGOLIA_BACKEND_API_KEY)%"]
 
     # API/Client Meetup techletter
     app.mailchimp_techletter_client:
         class: DrewM\MailChimp\MailChimp
-        arguments: ["%mailchimp_techletter_api_key%"]
+        arguments: ["%env(MAILCHIMP_TECHLETTER_API_KEY)%"]
         public: false
     app.mailchimp_techletter_api:
         class: AppBundle\Mailchimp\Mailchimp
@@ -106,7 +110,7 @@ services:
     # API/Client Meetup
     app.mailchimp_client:
         class: DrewM\MailChimp\MailChimp
-        arguments: ["%mailchimp_api_key%"]
+        arguments: ["%env(MAILCHIMP_API_KEY)%"]
         public: false
     app.mailchimp_api:
         class: AppBundle\Mailchimp\Mailchimp
@@ -117,13 +121,13 @@ services:
         autowire: true
         arguments:
             $mailchimp: '@app.mailchimp_techletter_api'
-            $listId: "%mailchimp_techletter_list%"
+            $listId: "%env(MAILCHIMP_TECHLETTER_LIST)%"
 
     AppBundle\Mailchimp\MailchimpMembersAutoListSynchronizer:
         autowire: true
         arguments:
             $mailchimp: '@app.mailchimp_api'
-            $listId: "%mailchimp_members_list%"
+            $listId: "%env(MAILCHIMP_MEMBERS_LIST)%"
 
     mailer.adapter.symfony:
         class: AppBundle\Email\Mailer\Adapter\SymfonyMailerAdapter
@@ -134,7 +138,7 @@ services:
     AppBundle\Mailchimp\EventEventSubscriber:
         arguments:
             - '@app.mailchimp_api'
-            - "%mailchimp_members_list%"
+            - "%env(MAILCHIMP_MEMBERS_LIST)%"
         tags:
           - { name: kernel.event_listener, event: user.disabled, method: onUserDisabled }
 
@@ -144,7 +148,7 @@ services:
 
     AppBundle\Event\Ticket\QrCodeGenerator:
         autowire: true
-        arguments: ["%qr_code_salt%"]
+        arguments: ["%env(QR_CODE_SALT)%"]
 
     Afup\Site\Utils\Pays:
         autowire: true
@@ -172,7 +176,7 @@ services:
 
     geocoder_provider_google_maps:
         class: Geocoder\Provider\GoogleMaps\GoogleMaps
-        arguments: ['@Psr\Http\Client\ClientInterface', null, "%google_maps_api_key%"]
+        arguments: ['@Psr\Http\Client\ClientInterface', null, "%env(GOOGLE_MAPS_API_KEY)%"]
 
     AppBundle\Offices\OfficeFinder:
         autowire: true
@@ -187,7 +191,7 @@ services:
     Doctrine\DBAL\Connection:
         factory: '@AppBundle\Doctrine\ConnectionFactory'
         arguments:
-            $url: 'mysql://%database_user%:%database_password%@%database_host%:%database_port%/%database_name%?charset=utf8mb4'
+            $url: 'mysql://%env(DATABASE_USER)%:%env(DATABASE_PASSWORD)%@%database_host%:%env(DATABASE_PORT)%/%env(DATABASE_NAME)%?charset=utf8mb4'
 
     AppBundle\Github\GithubClient:
         arguments:

composer.json

@@ -47,6 +47,7 @@
     "symfony/asset-mapper": "7.4.*",
     "symfony/clock": "7.4.*",
     "symfony/console": "7.4.*",
+    "symfony/dotenv": "7.4.*",
     "symfony/expression-language": "7.4.*",
     "symfony/form": "7.4.*",
     "symfony/framework-bundle": "7.4.*",