RequestMatcher deprecation

Author: deluxetom

DependencyInjection/Compiler/FormatListenerRulesPass.php

@@ -15,6 +15,12 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpFoundation\ChainRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\AttributesRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\HostRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\MethodRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\PathRequestMatcher;
 
 /**
  * @author Eduardo Gulias Davis <[email protected]>
@@ -83,9 +89,28 @@ private function createRequestMatcher(ContainerBuilder $container, ?string $path
 
         if (!$container->hasDefinition($id)) {
             // only add arguments that are necessary
-            $container
-                ->setDefinition($id, new ChildDefinition('fos_rest.format_request_matcher'))
-                ->setArguments($arguments);
+            if (!class_exists(ChainRequestMatcher::class)) {
+                $container
+                    ->setDefinition($id, new ChildDefinition(RequestMatcher::class))
+                    ->setArguments($arguments);
+            } else {
+                $matchers = [];
+                if (!empty($path)) {
+                    $matchers[] = new PathRequestMatcher($path);
+                }
+                if (!empty($host)) {
+                    $matchers[] = new HostRequestMatcher($host);
+                }
+                if (!empty($methods)) {
+                    $matchers[] = new MethodRequestMatcher($methods);
+                }
+                if (!empty($attributes)) {
+                    $matchers[] = new AttributesRequestMatcher($attributes);
+                }
+                $container
+                    ->setDefinition($id, new ChildDefinition(ChainRequestMatcher::class))
+                    ->setArguments($matchers);
+            }
         }
 
         return new Reference($id);

Resources/config/format_listener.xml

@@ -5,7 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-
         <service id="fos_rest.format_listener" class="FOS\RestBundle\EventListener\FormatListener">
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="34" />
             <argument type="service" id="fos_rest.format_negotiator" />
@@ -14,7 +13,5 @@
         <service id="fos_rest.format_negotiator" class="FOS\RestBundle\Negotiation\FormatNegotiator">
             <argument type="service" id="request_stack" />
         </service>
-
-        <service id="fos_rest.format_request_matcher" class="Symfony\Component\HttpFoundation\RequestMatcher" public="false" abstract="true" />
     </services>
 </container>