made the old asset layer optional and disable it when using the new one

symfony · Jan 5, 2015 · b0bc46f · b0bc46f
1 parent 8635a33
commit b0bc46f
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 62 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -101,12 +101,31 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);
 
+        $oldAssetsConfigured = false;
+        if (
+            isset($config['templating'])
+                &&
+            (
+                count($config['templating']['packages'])
+                    ||
+                count($config['templating']['assets_base_urls']['http'])
+                    ||
+                count($config['templating']['assets_base_urls']['ssl'])
+            )
+        ) {
+            $oldAssetsConfigured = true;
+        }
+
+        if (isset($config['assets']) && $oldAssetsConfigured) {
+            throw new \LogicException('You cannot use the old asset configuration with the new one.');
+        }
+
         if (isset($config['assets'])) {
             $this->registerAssetsConfiguration($config['assets'], $container, $loader);
         }
 
         if (isset($config['templating'])) {
-            $this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader);
+            $this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader, $oldAssetsConfigured);
         }
 
         $this->registerValidationConfiguration($config['validation'], $container, $loader);
@@ -459,10 +478,9 @@ private function registerRequestConfiguration(array $config, ContainerBuilder $c
      * @param ContainerBuilder $container A ContainerBuilder instance
      * @param XmlFileLoader    $loader    An XmlFileLoader instance
      */
-    private function registerTemplatingConfiguration(array $config, $ide, ContainerBuilder $container, XmlFileLoader $loader)
+    private function registerTemplatingConfiguration(array $config, $ide, ContainerBuilder $container, XmlFileLoader $loader, $oldAssetsConfigured)
     {
         $loader->load('templating.xml');
-        $loader->load('templating_php.xml');
 
         $links = array(
             'textmate' => 'txmt://open?url=file://%%f&line=%%l',
@@ -472,12 +490,23 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
         );
 
         $container->setParameter('templating.helper.code.file_link_format', isset($links[$ide]) ? $links[$ide] : $ide);
-        $container->setParameter('templating.helper.form.resources', $config['form']['resources']);
         $container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
 
-        if ($container->getParameter('kernel.debug')) {
-            $loader->load('templating_debug.xml');
+        if ($oldAssetsConfigured) {
+            $loader->load('old_assets.xml');
+
+            // create package definitions and add them to the assets helper
+            $defaultPackage = $this->createTemplatingPackageDefinition($container, $config['assets_base_urls']['http'], $config['assets_base_urls']['ssl'], $config['assets_version'], $config['assets_version_format']);
+            $container->setDefinition('templating.asset.default_package', $defaultPackage);
+            $namedPackages = array();
+            foreach ($config['packages'] as $name => $package) {
+                $namedPackage = $this->createTemplatingPackageDefinition($container, $package['base_urls']['http'], $package['base_urls']['ssl'], $package['version'], $package['version_format'], $name);
+                $container->setDefinition('templating.asset.package.'.$name, $namedPackage);
+                $namedPackages[$name] = new Reference('templating.asset.package.'.$name);
+            }
+        }
 
+        if ($container->getParameter('kernel.debug')) {
             $logger = new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE);
 
             $container->getDefinition('templating.loader.cache')
@@ -486,25 +515,8 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
             $container->getDefinition('templating.loader.chain')
                 ->addTag('monolog.logger', array('channel' => 'templating'))
                 ->addMethodCall('setLogger', array($logger));
-
-            $container->setDefinition('templating.engine.php', $container->findDefinition('debug.templating.engine.php'));
-            $container->setAlias('debug.templating.engine.php', 'templating.engine.php');
         }
 
-        // create package definitions and add them to the assets helper
-        $defaultPackage = $this->createTemplatingPackageDefinition($container, $config['assets_base_urls']['http'], $config['assets_base_urls']['ssl'], $config['assets_version'], $config['assets_version_format']);
-        $container->setDefinition('templating.asset.default_package', $defaultPackage);
-        $namedPackages = array();
-        foreach ($config['packages'] as $name => $package) {
-            $namedPackage = $this->createTemplatingPackageDefinition($container, $package['base_urls']['http'], $package['base_urls']['ssl'], $package['version'], $package['version_format'], $name);
-            $container->setDefinition('templating.asset.package.'.$name, $namedPackage);
-            $namedPackages[$name] = new Reference('templating.asset.package.'.$name);
-        }
-        $container->getDefinition('templating.helper.assets')->setArguments(array(
-            new Reference('templating.asset.default_package'),
-            $namedPackages,
-        ));
-
         if (!empty($config['loaders'])) {
             $loaders = array_map(function ($loader) { return new Reference($loader); }, $config['loaders']);
 
@@ -534,14 +546,6 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
             $container->findDefinition('templating.locator')->getClass(),
         ));
 
-        if (in_array('php', $config['engines'], true)) {
-            $this->addClassesToCompile(array(
-                'Symfony\\Component\\Templating\\Storage\\FileStorage',
-                'Symfony\\Bundle\\FrameworkBundle\\Templating\\PhpEngine',
-                'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',
-            ));
-        }
-
         $container->setParameter('templating.engines', $config['engines']);
         $engines = array_map(function ($engine) { return new Reference('templating.engine.'.$engine); }, $config['engines']);
 
@@ -554,6 +558,33 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
             }
             $container->setAlias('templating', 'templating.engine.delegating');
         }
+
+        // configure the PHP engine if needed
+        if (in_array('php', $config['engines'], true)) {
+            $loader->load('templating_php.xml');
+
+            $container->setParameter('templating.helper.form.resources', $config['form']['resources']);
+
+            if ($container->getParameter('kernel.debug')) {
+                $loader->load('templating_debug.xml');
+
+                $container->setDefinition('templating.engine.php', $container->findDefinition('debug.templating.engine.php'));
+                $container->setAlias('debug.templating.engine.php', 'templating.engine.php');
+            }
+
+            if ($oldAssetsConfigured) {
+                $container->getDefinition('templating.helper.assets')->setArguments(array(
+                    new Reference('templating.asset.default_package'),
+                    $namedPackages,
+                ));
+            }
+
+            $this->addClassesToCompile(array(
+                'Symfony\\Component\\Templating\\Storage\\FileStorage',
+                'Symfony\\Bundle\\FrameworkBundle\\Templating\\PhpEngine',
+                'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',
+            ));
+        }
     }
 
     /**
@@ -679,6 +710,7 @@ private function createPackageDefinition($basePath, array $baseUrls, Reference $
         }
 
         $package = new DefinitionDecorator('assets.url_package');
+
         return $package
             ->setPublic(false)
             ->replaceArgument(0, $baseUrls)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="templating.asset.path_package.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\PathPackage</parameter>
+        <parameter key="templating.asset.url_package.class">Symfony\Component\Templating\Asset\UrlPackage</parameter>
+        <parameter key="templating.asset.package_factory.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\PackageFactory</parameter>
+    </parameters>
+
+    <services>
+        <service id="templating.asset.path_package" class="%templating.asset.path_package.class%" abstract="true">
+            <argument type="service" id="request" />
+            <argument /> <!-- version -->
+            <argument /> <!-- version format -->
+        </service>
+
+        <service id="templating.asset.url_package" class="%templating.asset.url_package.class%" abstract="true">
+            <argument /> <!-- base urls -->
+            <argument /> <!-- version -->
+            <argument /> <!-- version format -->
+        </service>
+
+        <service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" abstract="true">
+            <factory service="templating.asset.package_factory" method="getPackage" />
+            <argument type="service" id="request" strict="false" />
+            <argument /> <!-- HTTP id -->
+            <argument /> <!-- SSL id -->
+        </service>
+
+        <service id="templating.asset.package_factory" class="%templating.asset.package_factory.class%">
+            <argument type="service" id="service_container" />
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -14,6 +14,7 @@
         <parameter key="templating.loader.cache.class">Symfony\Component\Templating\Loader\CacheLoader</parameter>
         <parameter key="templating.loader.chain.class">Symfony\Component\Templating\Loader\ChainLoader</parameter>
         <parameter key="templating.finder.class">Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder</parameter>
+        <parameter key="templating.globals.class">Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables</parameter>
     </parameters>
 
     <services>
@@ -58,5 +59,9 @@
         </service>
 
         <service id="templating.loader" alias="templating.loader.filesystem" />
+
+        <service id="templating.globals" class="%templating.globals.class%">
+            <argument type="service" id="service_container" />
+        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -18,10 +18,6 @@
         <parameter key="templating.helper.stopwatch.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\StopwatchHelper</parameter>
         <parameter key="templating.form.engine.class">Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine</parameter>
         <parameter key="templating.form.renderer.class">Symfony\Component\Form\FormRenderer</parameter>
-        <parameter key="templating.globals.class">Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables</parameter>
-        <parameter key="templating.asset.path_package.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\PathPackage</parameter>
-        <parameter key="templating.asset.url_package.class">Symfony\Component\Templating\Asset\UrlPackage</parameter>
-        <parameter key="templating.asset.package_factory.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\PackageFactory</parameter>
     </parameters>
 
     <services>
@@ -43,29 +39,6 @@
             <argument type="collection" /> <!-- named packages -->
         </service>
 
-        <service id="templating.asset.path_package" class="%templating.asset.path_package.class%" abstract="true">
-            <argument type="service" id="request" />
-            <argument /> <!-- version -->
-            <argument /> <!-- version format -->
-        </service>
-
-        <service id="templating.asset.url_package" class="%templating.asset.url_package.class%" abstract="true">
-            <argument /> <!-- base urls -->
-            <argument /> <!-- version -->
-            <argument /> <!-- version format -->
-        </service>
-
-        <service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" abstract="true">
-            <factory service="templating.asset.package_factory" method="getPackage" />
-            <argument type="service" id="request" strict="false" />
-            <argument /> <!-- HTTP id -->
-            <argument /> <!-- SSL id -->
-        </service>
-
-        <service id="templating.asset.package_factory" class="%templating.asset.package_factory.class%">
-            <argument type="service" id="service_container" />
-        </service>
-
         <service id="templating.helper.request" class="%templating.helper.request.class%">
             <tag name="templating.helper" alias="request" />
             <argument type="service" id="request_stack" />
@@ -117,9 +90,5 @@
             <argument type="service" id="templating.form.engine" />
             <argument type="service" id="form.csrf_provider" on-invalid="null" />
         </service>
-
-        <service id="templating.globals" class="%templating.globals.class%">
-            <argument type="service" id="service_container" />
-        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -45,6 +45,13 @@ public function process(ContainerBuilder $container)
 
         if ($container->has('assets.packages')) {
             $container->getDefinition('twig.extension.assets')->addTag('twig.extension');
+        } elseif ($container->has('templating.asset.packages')) {
+            $container->getDefinition('twig.extension.assets')
+                ->setClass('Symfony\Bundle\TwigBundle\Extension\AssetsExtension')
+                ->replaceArgument(0, new Reference('service_container'))
+                ->replaceArgument(1, new Reference('router.request_context', ContainerInterface::NULL_ON_INVALID_REFERENCE))
+                ->addTag('twig.extension')
+            ;
         }
     }
 }