On corrige quelques bugs divers (#1640)

* On corrige quelques bugs divers * Remise à plat des configs Mailchimp
afup · Feb 19, 2025 · c013f5e · c013f5e
1 parent 47b509a
commit c013f5e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 42 deletions.
diff --git a/.env.dist b/.env.dist
@@ -32,7 +32,7 @@ MAILCHIMP_API_KEY=xxx-yyyy
 MAILCHIMP_MEMBERS_LIST=
 MAILCHIMP_SUBSCRIBERS_LIST=
 MAILCHIMP_TECHLETTER_LIST=
-MAILCHIMP_TECHLETTER_API_KEY=
+MAILCHIMP_TECHLETTER_API_KEY=xxx-yyyy
 MAILCHIMP_TECHLETTER_WEBHOOK_KEY="abc"
 
 GOOGLE_MAPS_API_KEY=

diff --git a/app/config/services.yml b/app/config/services.yml
@@ -32,10 +32,11 @@ services:
         autoconfigure: true
 
     AppBundle\Command\UpdateMailchimpMembersCommand:
+        autoconfigure: true
+        autowire: true
         arguments:
-            - '@Mailchimp\Mailchimp'
-            - '@CCMBenchmark\TingBundle\Repository\RepositoryFactory'
-            - "%mailchimp_members_list%"
+            $mailchimp: '@app.mailchimp_api'
+            $mailchimpMembersList: "%mailchimp_members_list%"
 
     AppBundle\Controller\:
         resource: '../../sources/AppBundle/Controller/*'
@@ -96,6 +97,7 @@ services:
     AppBundle\Controller\Website\NewsletterController:
         autowire: true
         arguments:
+            $mailchimp: '@app.mailchimp_api'
             $mailchimpSubscribersList: '%mailchimp_subscribers_list%'
 
     AppBundle\Controller\Website\StaticController:
@@ -128,9 +130,16 @@ services:
     AppBundle\Controller\Admin\TechLetter\TechLetterGenerateController:
         autowire: true
         arguments:
+            $mailchimp: '@app.mailchimp_techletter_api'
             $techletterTestEmailAddress: '%techletter_test_email_address%'
             $mailchimpTechletterList: '%mailchimp_techletter_list%'
 
+    AppBundle\Mailchimp\Runner:
+        autowire: true
+        arguments:
+            $mailchimp: '@app.mailchimp_api'
+            $membersListId: '%mailchimp_members_list%'
+
     AppBundle\Controller\LegacyController:
         autowire: true
         arguments:
@@ -335,32 +344,37 @@ services:
         class: TwitterAPIExchange
         arguments: ["%twitter_api_settings%"]
 
-    Mailchimp\Mailchimp:
-        arguments: ["%mailchimp_api_key%"]
-        public: false
-
-    AppBundle\Mailchimp\Mailchimp:
-        arguments: ['@Mailchimp\Mailchimp']
-
-    # Ne pas utiliser le nom de la classe pour le service car elle est déjà utilisé pour un autre service.
+    # API/Client Meetup techletter
     app.mailchimp_techletter_client:
         class: Mailchimp\Mailchimp
         arguments: ["%mailchimp_techletter_api_key%"]
         public: false
-
-    # Ne pas utiliser le nom de la classe pour le service car elle est déjà utilisé pour un autre service.
     app.mailchimp_techletter_api:
         class: AppBundle\Mailchimp\Mailchimp
         arguments: ["@app.mailchimp_techletter_client"]
+        public: false
 
-    # Ne pas utiliser le nom de la classe pour le service car elle est déjà utilisé pour un autre service.
-    app.techletter_mailchimp_synchronizer:
-        class: AppBundle\TechLetter\MailchimpSynchronizer
-        arguments: ["@app.mailchimp_techletter_api", '@AppBundle\Association\Model\Repository\TechletterSubscriptionsRepository', "%mailchimp_techletter_list%"]
+    # API/Client Meetup
+    app.mailchimp_client:
+        class: Mailchimp\Mailchimp
+        arguments: ["%mailchimp_api_key%"]
+        public: false
+    app.mailchimp_api:
+        class: AppBundle\Mailchimp\Mailchimp
+        arguments: ["@app.mailchimp_client"]
+        public: false
+
+    AppBundle\TechLetter\MailchimpSynchronizer:
+        autowire: true
+        arguments:
+            $mailchimp: '@app.mailchimp_techletter_api'
+            $listId: "%mailchimp_techletter_list%"
 
-    app.mailchimp_members_auto_synchronizer:
-        class: AppBundle\Mailchimp\MailchimpMembersAutoListSynchronizer
-        arguments: ['@AppBundle\Mailchimp\Mailchimp', '@AppBundle\Association\Model\Repository\UserRepository', "%mailchimp_members_list%"]
+    AppBundle\Mailchimp\MailchimpMembersAutoListSynchronizer:
+        autowire: true
+        arguments:
+            $mailchimp: '@app.mailchimp_api'
+            $listId: "%mailchimp_members_list%"
 
     Afup\Site\Utils\Configuration:
         autowire: true
@@ -392,7 +406,9 @@ services:
         autowire: true
 
     AppBundle\Mailchimp\EventEventSubscriber:
-        arguments: ['@AppBundle\Mailchimp\Mailchimp', "%mailchimp_members_list%"]
+        arguments:
+            - '@app.mailchimp_api'
+            - "%mailchimp_members_list%"
         tags:
           - { name: kernel.event_listener, event: user.disabled, method: onUserDisabled }
 

diff --git a/sources/AppBundle/Command/SynchMembersCommand.php b/sources/AppBundle/Command/SynchMembersCommand.php
@@ -30,9 +30,8 @@ protected function configure(): void
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->synchronizer
-           ->setLogger($this->logger)
-           ->synchronize()
-        ;
+            ->setLogger($this->logger)
+            ->synchronize();
 
         return 0;
     }

diff --git a/sources/AppBundle/Controller/Legacy/Forum2016SessionsAction.php b/sources/AppBundle/Controller/Legacy/Forum2016SessionsAction.php
@@ -40,7 +40,7 @@ public function __invoke(Request $request): Response
             $session['conferenciers'] = $this->appelConferencier->obtenirConferenciersPourSession($session['session_id']);
             $session['journees'] = explode(' ', $session['journee']);
 
-            if ('27' === date('d', $session['debut'])) {
+            if ('27' === date('d', (int) $session['debut'])) {
                 $journees[$day1key][] = $session;
             } else {
                 $journees[$day2key][] = $session;

diff --git a/sources/AppBundle/Mailchimp/MailchimpMembersAutoListSynchronizer.php b/sources/AppBundle/Mailchimp/MailchimpMembersAutoListSynchronizer.php
@@ -14,20 +14,11 @@ class MailchimpMembersAutoListSynchronizer
 
     private UserRepository $userRepository;
 
-    /**
-     * @var string
-     */
-    private $listId;
+    private string $listId;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
 
-    /**
-     * @param string $listId
-     */
-    public function __construct(Mailchimp $mailchimp, UserRepository $userRepository, $listId)
+    public function __construct(Mailchimp $mailchimp, UserRepository $userRepository, string $listId)
     {
         $this->mailchimp = $mailchimp;
         $this->userRepository = $userRepository;

diff --git a/sources/AppBundle/TechLetter/MailchimpSynchronizer.php b/sources/AppBundle/TechLetter/MailchimpSynchronizer.php
@@ -17,10 +17,7 @@ class MailchimpSynchronizer
 
     private string $listId;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
 
     public function __construct(Mailchimp $mailchimp, TechletterSubscriptionsRepository $subscriptionsRepository, string $listId)
     {