Symfony 3 fixed issue related to symfony/symfony#11881

boekkooi · Dec 4, 2015 · c8025bd · c8025bd
1 parent f825007
commit c8025bd
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 123 deletions.
diff --git a/composer.json b/composer.json
@@ -21,10 +21,12 @@
         "phpunit/phpunit": "4.6.4",
         "phpunit/phpunit-mock-objects": "2.3.1",
         "fabpot/php-cs-fixer": "1.6.2",
-        "kriswallsmith/assetic": "~1.2",
 
+        "symfony/assetic-bundle": "~2.3",
         "symfony/validator": "~2.3, >=2.3.19|~3.0",
-        "doctrine/common": "~2.2"
+        "doctrine/common": "~2.2",
+
+        "matthiasnoback/symfony-dependency-injection-test": "^0.7"
     },
     "license": "MIT",
     "authors": [

diff --git a/src/DependencyInjection/BoekkooiTwigJackExtension.php b/src/DependencyInjection/BoekkooiTwigJackExtension.php
@@ -28,11 +28,7 @@ public function load(array $config, ContainerBuilder $container)
 
         $this->loadDefer($container, $loader, $config);
         $this->loadConstraint($container, $loader, $config);
-
-        if ($config['exclamation']) {
-            $loader->load('exclamation.yml');
-            $container->setParameter('boekkooi.twig_jack.exclamation', true);
-        }
+        $this->loadExclamation($container, $loader, $config);
 
         $this->loadLoaders($container, $loader, $config);
     }
@@ -151,4 +147,30 @@ private function loadConstraint(ContainerBuilder $container, LoaderInterface $lo
         $container->getDefinition('boekkooi.twig_jack.constraint_validator')
             ->replaceArgument(0, new Reference($config['constraint']['environment']));
     }
+
+    /**
+     * @param array $config
+     * @param ContainerBuilder $container
+     * @param $loader
+     */
+    public function loadExclamation(ContainerBuilder $container, $loader, array $config)
+    {
+        if (!$config['exclamation']) {
+            return;
+        }
+
+        $loader->load('exclamation.yml');
+
+        $container->getDefinition('templating.name_parser')
+            ->setClass('%templating.name_parser.class%');
+
+        $container->getDefinition('templating.cache_warmer.template_paths')
+            ->setClass('%templating.cache_warmer.template_paths.class%');
+
+        $container->getDefinition('assetic.twig_formula_loader')
+            ->setClass('%assetic.twig_formula_loader.class%');
+
+
+        $container->setParameter('boekkooi.twig_jack.exclamation', true);
+    }
 }
diff --git a/src/DependencyInjection/Compiler/ExclamationPass.php b/src/DependencyInjection/Compiler/ExclamationPass.php
@@ -15,7 +15,11 @@ class ExclamationPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('templating.cache_warmer.template_paths') || !$container->hasParameter('boekkooi.twig_jack.exclamation') || !$container->getParameter('boekkooi.twig_jack.exclamation')) {
+        if (
+            !$container->hasDefinition('templating.cache_warmer.template_paths') ||
+            !$container->hasParameter('boekkooi.twig_jack.exclamation') ||
+            !$container->getParameter('boekkooi.twig_jack.exclamation')
+        ) {
             return;
         }