avoid deprecation with symfony 3.3+

Author: dbu

src/DependencyInjection/FOSHttpCacheExtension.php

@@ -16,6 +16,7 @@
 use FOS\HttpCacheBundle\Http\ResponseMatcher\ExpressionResponseMatcher;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
@@ -227,10 +228,17 @@ private function createRequestMatcher(ContainerBuilder $container, $path = null,
         $id = $this->getAlias().'.request_matcher.'.md5($serialized).sha1($serialized);
 
         if (!$container->hasDefinition($id)) {
-            $container
-                ->setDefinition($id, new DefinitionDecorator($this->getAlias().'.request_matcher'))
-                ->setArguments($arguments)
-            ;
+            if (class_exists(ChildDefinition::class)) {
+                $container
+                    ->setDefinition($id, new ChildDefinition($this->getAlias().'.request_matcher'))
+                    ->setArguments($arguments)
+                ;
+            } else {
+                $container
+                    ->setDefinition($id, new DefinitionDecorator($this->getAlias().'.request_matcher'))
+                    ->setArguments($arguments)
+                ;
+            }
         }
 
         return new Reference($id);

tests/Unit/DependencyInjection/Compiler/HashGeneratorPassTest.php

@@ -44,7 +44,12 @@ public function testConfigNoContext()
         $config = $this->getBaseConfig();
         $this->extension->load([$config], $container);
         $this->userContextListenerPass->process($container);
-        $this->assertCount(21, $container->getDefinitions());
+        if ($container->hasDefinition('service_container')) {
+            // symfony 3.3+
+            $this->assertCount(22, $container->getDefinitions());
+        } else {
+            $this->assertCount(21, $container->getDefinitions());
+        }
     }
 
     /**