Remove Symfony workarounds and add conflicts

composer.json

@@ -181,8 +181,8 @@
         "symfony/browser-kit": "4.1.8",
         "symfony/dependency-injection": "4.1.8 || 4.2.2",
         "symfony/dom-crawler": "4.1.8",
-        "symfony/routing": "4.1.8",
-        "symfony/symfony": "3.4.7 || 4.0.7 || 4.1.8 || 4.2.2",
+        "symfony/routing": "4.1.8 || 4.1.9",
+        "symfony/symfony": "3.4.7 || 4.0.7 || 4.1.8 || 4.1.9 || 4.2.2",
         "twig/twig": "2.6.1"
     },
     "suggest": {

phpstan.neon

@@ -18,9 +18,6 @@ parameters:
         - '**MongoDB**'
         - '**ODM**'
 
-        # Temporary PhpMatcherDumper class
-        - 'src/Sylius/Bundle/CoreBundle/Routing/Matcher/Dumper/PhpMatcherDumper.php'
-
     ignoreErrors:
         # Magic calls
         - '/Call to an undefined static method Webmozart\\Assert\\Assert::all/'

src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php

@@ -13,17 +13,14 @@
 
 namespace Sylius\Bundle\CoreBundle\DependencyInjection;
 
-use Sylius\Bundle\CoreBundle\Routing\Matcher\Dumper\PhpMatcherDumper;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\HttpKernel\Kernel;
 
-final class SyliusCoreExtension extends AbstractResourceExtension implements PrependExtensionInterface, CompilerPassInterface
+final class SyliusCoreExtension extends AbstractResourceExtension implements PrependExtensionInterface
 {
     /** @var array */
     private static $bundles = [
@@ -93,18 +90,4 @@ private function prependHwiOauth(ContainerBuilder $container, LoaderInterface $l
 
         $loader->load('services/integrations/hwi_oauth.xml');
     }
-
-    public function process(ContainerBuilder $container): void
-    {
-        // Should be removed after PhpMatcherDumper is fixed in an another Symfony patch release
-        if (!in_array(Kernel::VERSION, ['4.1.8', '4.1.9'], true)) {
-            return;
-        }
-
-        $routerDefinition = $container->findDefinition('router.default');
-        $routerDefinition->replaceArgument(2, array_merge(
-            $routerDefinition->getArgument(2),
-            ['matcher_dumper_class' => PhpMatcherDumper::class]
-        ));
-    }
 }