Merge branch 'main' into feature/update-logo

Author: jean-gui

assets-src/styles/sass/60-advanced-components/_collapsibles.scss

@@ -22,7 +22,7 @@
 			font-size: rem(15);
 			font-weight: normal;
 			line-height: calc(22.5 / 15);
-			margin-top: 1rem;
+			color: #333;
 			order: 2;
 			width: 100%;
 		}
@@ -65,4 +65,4 @@
 			display: none;
 		}
 	}
-}
+}

src/EventSubscriber/FlashMessageSubscriber.php

@@ -4,6 +4,7 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -17,20 +18,20 @@ class FlashMessageSubscriber implements EventSubscriberInterface
     public function __construct(RequestStack $requestStack, TranslatorInterface $translator)
     {
         $this->requestStack = $requestStack;
-        $this->translator   = $translator;
+        $this->translator = $translator;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             // we want that to run early (before the Session->Cookie transformation)
-            KernelEvents::RESPONSE => ['onKernelResponse', 10]
+            KernelEvents::RESPONSE => ['onKernelResponse', 10],
         ];
     }
 
     public function onKernelResponse(ResponseEvent $event)
     {
-         // @todo remove this when we drop support for SF4, see https://github.com/symfony/http-kernel/blob/7.1/CHANGELOG.md#53
+        // @todo remove this when we drop support for SF4, see https://github.com/symfony/http-kernel/blob/7.1/CHANGELOG.md#53
         if (defined('HttpKernelInterface::MASTER_REQUEST') && HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;
         }
@@ -57,9 +58,11 @@ public function onKernelResponse(ResponseEvent $event)
             return;
         }
 
+        assert($session instanceof FlashBagAwareSessionInterface);
+
         $flashBag = $session->getFlashBag();
         // Use peekAll because we want to keep existing messages in the bag
-        $flashes  = $flashBag->peekAll();
+        $flashes = $flashBag->peekAll();
 
         if (empty($flashes)) {
             return;
@@ -68,30 +71,30 @@ public function onKernelResponse(ResponseEvent $event)
         $titleKeys = [
             'success' => 'successes',
             'warning' => 'warnings',
-            'error'   => 'errors',
-            'info'    => 'info'
+            'error' => 'errors',
+            'info' => 'info',
         ];
 
         $existingTitles = array_keys(
             array_filter(
                 $flashes,
-                fn(string $key) => strpos($key, 'title-') === 0,
+                fn (string $key) => 0 === strpos($key, 'title-'),
                 ARRAY_FILTER_USE_KEY
             )
         );
 
-        foreach(array_keys($flashes) as $type) {
+        foreach (array_keys($flashes) as $type) {
             // $type is not a title and its corresponding title doesn't already exist
             if (
-                strpos($type, 'title-') === false &&
-                !in_array('title-' . $type, $existingTitles) &&
-                array_key_exists($type, $titleKeys)
+                false === strpos($type, 'title-')
+                && !in_array('title-'.$type, $existingTitles)
+                && array_key_exists($type, $titleKeys)
             ) {
                 $flashBag->add(
-                    'title-' . $type,
-                    $this->translator->trans('notes.' . $titleKeys[$type] . '.default_title', [], 'w3c_website_templates_bundle')
+                    'title-'.$type,
+                    $this->translator->trans('notes.'.$titleKeys[$type].'.default_title', [], 'w3c_website_templates_bundle')
                 );
-                $existingTitles[] = 'title-' . $type;
+                $existingTitles[] = 'title-'.$type;
             }
         }
     }

src/Twig/TwigExtension.php

@@ -59,7 +59,7 @@ public function __construct(
         $this->loginUrlInfo = $loginUrlInfo;
     }
 
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('preg_replace', [$this, 'pregReplace']),
@@ -76,7 +76,7 @@ public function getFilters()
         ];
     }
 
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('date_range', [$this, 'dateRange']),
@@ -106,7 +106,7 @@ public function pregReplace(string $subject, $pattern, $replacement, int $limit
      * @return bool|string
      * @throws Exception
      */
-    public function markupAttrs(string $markup, array $attrs = null)
+    public function markupAttrs(string $markup, ?array $attrs = null)
     {
         try {
             $xml = new SimpleXMLElement($markup);
@@ -205,7 +205,7 @@ public function dateRange(
         string $tz,
         string $locale,
         bool $utc = false,
-        string $id = null
+        ?string $id = null
     ): string {
         if ($locale == 'en') {
             $locale = 'en-GB';

templates/components/styles/comments.html.twig

@@ -12,7 +12,7 @@
                     </time>
                 </div>
                 <div class="comment__body">
-                    {% if post.typeHandle == 'importedEntries' %}
+                    {% if post.typeHandle == 'blogPosts_importedEntries' %}
                         <p>{{ comment.comment|raw }}</p>
                     {% else %}
                         <p>{{ comment.comment|nl2br }}</p>