From a49b84e376ae6b628f186270f90249a80df2712f Mon Sep 17 00:00:00 2001
From: Dawid Parafinski <dawid.parafinski@ibexa.co>
Date: Mon, 4 Nov 2024 14:35:50 +0100
Subject: [PATCH] Fixes after rebase

---
 phpstan-baseline.neon                                     | 5 +++++
 src/bundle/Core/Resources/config/routing/serializers.yml  | 6 ------
 .../Symfony/EventListener/SiteAccessMatchListenerTest.php | 4 ----
 .../MVC/Symfony/SiteAccess/MatcherSerializationTest.php   | 8 +++++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index ad5d6741c4..d018de39ca 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -11085,6 +11085,11 @@ parameters:
 			count: 1
 			path: src/lib/MVC/Symfony/EventListener/LanguageSwitchListener.php
 
+		-
+			message: "#^Parameter \\#1 \\$properties of class Ibexa\\\\Core\\\\MVC\\\\Symfony\\\\Routing\\\\SimplifiedRequest constructor expects array, string given\\.$#"
+			count: 1
+			path: src/lib/MVC/Symfony/EventListener/SiteAccessMatchListener.php
+
 		-
 			message: "#^Method Ibexa\\\\Core\\\\MVC\\\\Symfony\\\\ExpressionLanguage\\\\TwigVariableProviderExtension\\:\\:hasParameterProvider\\(\\) has parameter \\$variables with no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/src/bundle/Core/Resources/config/routing/serializers.yml b/src/bundle/Core/Resources/config/routing/serializers.yml
index e59b680cba..62329fb916 100644
--- a/src/bundle/Core/Resources/config/routing/serializers.yml
+++ b/src/bundle/Core/Resources/config/routing/serializers.yml
@@ -11,8 +11,6 @@ services:
                 - '@Ibexa\Core\MVC\Symfony\Component\Serializer\MapNormalizer'
                 - '@Ibexa\Core\MVC\Symfony\Component\Serializer\URITextNormalizer'
                 - '@Ibexa\Core\MVC\Symfony\Component\Serializer\HostTextNormalizer'
-                - '@Ibexa\Core\MVC\Symfony\Component\Serializer\RegexURINormalizer'
-                - '@Ibexa\Core\MVC\Symfony\Component\Serializer\RegexHostNormalizer'
                 - '@Ibexa\Core\MVC\Symfony\Component\Serializer\RegexNormalizer'
                 - '@Ibexa\Core\MVC\Symfony\Component\Serializer\URIElementNormalizer'
                 - '@Ibexa\Core\MVC\Symfony\Component\Serializer\SimplifiedRequestNormalizer'
@@ -45,10 +43,6 @@ services:
 
     Ibexa\Core\MVC\Symfony\Component\Serializer\HostTextNormalizer: ~
 
-    Ibexa\Core\MVC\Symfony\Component\Serializer\RegexURINormalizer: ~
-
-    Ibexa\Core\MVC\Symfony\Component\Serializer\RegexHostNormalizer: ~
-
     Ibexa\Core\MVC\Symfony\Component\Serializer\RegexNormalizer: ~
 
     Ibexa\Core\MVC\Symfony\Component\Serializer\URIElementNormalizer: ~
diff --git a/tests/lib/MVC/Symfony/EventListener/SiteAccessMatchListenerTest.php b/tests/lib/MVC/Symfony/EventListener/SiteAccessMatchListenerTest.php
index 35c9c767b3..f9435bb42e 100644
--- a/tests/lib/MVC/Symfony/EventListener/SiteAccessMatchListenerTest.php
+++ b/tests/lib/MVC/Symfony/EventListener/SiteAccessMatchListenerTest.php
@@ -13,9 +13,7 @@
 use Ibexa\Core\MVC\Symfony\Component\Serializer\HostTextNormalizer;
 use Ibexa\Core\MVC\Symfony\Component\Serializer\MapNormalizer;
 use Ibexa\Core\MVC\Symfony\Component\Serializer\MatcherDenormalizer;
-use Ibexa\Core\MVC\Symfony\Component\Serializer\RegexHostNormalizer;
 use Ibexa\Core\MVC\Symfony\Component\Serializer\RegexNormalizer;
-use Ibexa\Core\MVC\Symfony\Component\Serializer\RegexURINormalizer;
 use Ibexa\Core\MVC\Symfony\Component\Serializer\SimplifiedRequestNormalizer;
 use Ibexa\Core\MVC\Symfony\Component\Serializer\SiteAccessNormalizer;
 use Ibexa\Core\MVC\Symfony\Component\Serializer\URIElementNormalizer;
@@ -322,8 +320,6 @@ private function getSerializer(): SerializerInterface
                 new HostElementNormalizer(),
                 new URITextNormalizer(),
                 new HostTextNormalizer(),
-                new RegexURINormalizer(),
-                new RegexHostNormalizer(),
                 new RegexNormalizer(),
                 new URIElementNormalizer(),
                 new SimplifiedRequestNormalizer(),
diff --git a/tests/lib/MVC/Symfony/SiteAccess/MatcherSerializationTest.php b/tests/lib/MVC/Symfony/SiteAccess/MatcherSerializationTest.php
index 9bfb08753d..4a053016fc 100644
--- a/tests/lib/MVC/Symfony/SiteAccess/MatcherSerializationTest.php
+++ b/tests/lib/MVC/Symfony/SiteAccess/MatcherSerializationTest.php
@@ -115,13 +115,15 @@ public function matcherProvider(): iterable
                 [
                     'prefix' => 'foo',
                     'suffix' => 'bar',
-                ]),
+                ]
+            ),
         ];
         yield 'URIElement' => [
-                new Matcher\URIElement([
+                new Matcher\URIElement(
+                    [
                     'elementNumber' => 2,
                 ]
-            ),
+                ),
         ];
         yield 'HostElement' => [
             new Matcher\HostElement(