Merge remote-tracking branch 'mopolo/update-node-and-npm' into preprod

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

.github/workflows/ci.yml

@@ -105,7 +105,16 @@ jobs:
       - name: Cache Docker images.
         uses: ScribeMD/docker-cache@0.5.0
         with:
-          key: docker-${{ runner.os }}-${{ hashFiles('compose.yml') }}
+          key: |
+            docker-${{ runner.os }}-${{ hashFiles(
+              'compose.yml',
+              'docker/dockerfiles/apachephp/Dockerfile',
+              'docker/dockerfiles/mysql/Dockerfile',
+              'docker/dockerfiles/mysqltest/Dockerfile'
+            ) }}
+
+      - name: Delete symfony cache
+        run: rm -rf var/cache/test
 
       - name: Tests - Functional
         run: make test-functional

Makefile

@@ -137,7 +137,7 @@ vendor: composer.phar composer.lock
 	php composer.phar install --no-scripts
 
 node_modules:
-	yarn install
+	npm install --legacy-peer-deps
 
 composer.phar:
     # You may replace the commit hash by whatever the last commit hash is on https://github.com/composer/getcomposer.org/commits/main

app/Resources/views/event/ticket/ticket.html.twig

@@ -5,15 +5,15 @@
 {% form_theme ticketForm _self %}
 
 {% block form_errors %}
-    {% spaceless %}
+    {% apply spaceless %}
         {% if errors|length > 0 %}
             <ul class="tickets--errors">
                 {% for error in errors %}
                     <li>{{ error.message }}</li>
                 {% endfor %}
             </ul>
         {% endif %}
-    {% endspaceless %}
+    {% endapply %}
 {% endblock form_errors %}
 
 {% block metas %}

app/Resources/views/site/secondary_menu.html.twig

@@ -1,6 +1,8 @@
 <div class="secondary-menu">
-    {% for item in menu if item.is_active %}
+    {% for item in menu %}
+        {% if item.is_active %}
         <a href="" class="secondary-menu__current-item">{{ item.nom }}</a>
+        {% endif %}
     {% endfor %}
     <div class="mw1400p center">
         <div class="secondary-menu__list">

app/config/services.yml

@@ -26,6 +26,18 @@ services:
               lock_mode: !php/const Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler::LOCK_NONE
 
 
+    AppBundle\Command\:
+        resource: '../../sources/AppBundle/Command/*'
+        autowire: true
+        autoconfigure: true
+
+    AppBundle\Command\UpdateMailchimpMembersCommand:
+        autoconfigure: true
+        autowire: true
+        arguments:
+            $mailchimp: '@app.mailchimp_api'
+            $mailchimpMembersList: "%mailchimp_members_list%"
+
     AppBundle\Controller\:
         resource: '../../sources/AppBundle/Controller/*'
         autowire: true
@@ -85,6 +97,7 @@ services:
     AppBundle\Controller\Website\NewsletterController:
         autowire: true
         arguments:
+            $mailchimp: '@app.mailchimp_api'
             $mailchimpSubscribersList: '%mailchimp_subscribers_list%'
 
     AppBundle\Controller\Website\StaticController:
@@ -117,25 +130,20 @@ services:
     AppBundle\Controller\Admin\TechLetter\TechLetterGenerateController:
         autowire: true
         arguments:
+            $mailchimp: '@app.mailchimp_techletter_api'
             $techletterTestEmailAddress: '%techletter_test_email_address%'
             $mailchimpTechletterList: '%mailchimp_techletter_list%'
 
-    AppBundle\Controller\LegacyController:
+    AppBundle\Mailchimp\Runner:
         autowire: true
         arguments:
-            $backOfficePages: '%app.pages_backoffice%'
+            $mailchimp: '@app.mailchimp_api'
+            $membersListId: '%mailchimp_members_list%'
 
-    AppBundle\Command\GeneralMeetupNotificationCommand:
-        autowire: true
-        autoconfigure: true
-
-    AppBundle\Command\IndexTalksCommand:
-        autowire: true
-        autoconfigure: true
-
-    AppBundle\Command\QrCodesGeneratorCommand:
+    AppBundle\Controller\LegacyController:
         autowire: true
-        autoconfigure: true
+        arguments:
+            $backOfficePages: '%app.pages_backoffice%'
 
     AppBundle\GeneralMeeting\GeneralMeetingRepository:
         autowire: true
@@ -322,7 +330,8 @@ services:
     AppBundle\Routing\LegacyRouter:
         autowire: true
 
-    AlgoliaSearch\Client:
+    Algolia\AlgoliaSearch\SearchClient:
+        factory: [ Algolia\AlgoliaSearch\SearchClient, create ]
         arguments: ["%algolia_app_id%", "%algolia_backend_api_key%"]
 
     AppBundle\Joindin\JoindinComments:
@@ -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
+
+    # 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
 
-    # 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%"]
+    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 }
 
@@ -707,7 +723,6 @@ services:
         autowire: true
         public: true
 
-
     app.github.http_client:
         class: GuzzleHttp\Client
         arguments:
@@ -717,3 +732,11 @@ services:
     AppBundle\Github\GithubClient:
         arguments:
             $githubClient: '@app.github.http_client'
+
+    app.meetup.http_client:
+        class: GuzzleHttp\Client
+
+    AppBundle\Indexation\Meetups\MeetupClient:
+        arguments:
+            $httpClient: '@app.meetup.http_client'
+            $antennesCollection: '@AppBundle\Antennes\AntennesCollection'

clevercloud/scripts/cc_pre_build_hook.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-yarn install --ignore-engines
+npm install --legacy-peer-deps
 
 mkdir $APP_HOME/tmp

composer.json

@@ -10,15 +10,16 @@
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-openssl": "*",
-    "algolia/algoliasearch-client-php": "^1.12",
+    "algolia/algoliasearch-client-php": "^3.4",
     "beberlei/assert": "^2.9",
     "captioning/captioning": "^2.6",
     "ccmbenchmark/ting_bundle": "3.4.1",
     "cocur/slugify": "^2.3",
+    "cuyz/valinor": "^0.17.1",
     "doctrine/dbal": "^2.5",
     "ekino/newrelic-bundle": "^1.4",
     "erusev/parsedown": "^1.6",
-    "excelwebzone/recaptcha-bundle": "1.5.13",
+    "excelwebzone/recaptcha-bundle": "^1.5",
     "ezyang/htmlpurifier": "^4.10",
     "friendsofpear/pear_exception": "0.0.*",
     "guzzlehttp/guzzle": "^6.5",
@@ -36,7 +37,7 @@
     "robmorgan/phinx": "^0.9.2",
     "sabre/vobject": "^4.1",
     "setasign/fpdf": "^1.8",
-    "smarty/smarty": "2.6.*",
+    "smarty/smarty": "^5.4",
     "symfony/monolog-bundle": "*",
     "symfony/phpunit-bridge": "^3.1",
     "symfony/symfony": "^3.4",