[AsseticBundle] updated for changes in Assetic

symfony · May 15, 2011 · b173884 · b173884
1 parent 9e407d7
commit b173884
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 19 deletions.
diff --git a/src/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php b/src/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php
@@ -171,7 +171,7 @@ private function dumpAsset($name, OutputInterface $output)
      */
     private function doDump(AssetInterface $asset, OutputInterface $output)
     {
-        $target = rtrim($this->basePath, '/').'/'.str_replace('_controller/', '', $asset->getTargetUrl());
+        $target = rtrim($this->basePath, '/').'/'.str_replace('_controller/', '', $asset->getTargetPath());
         if (!is_dir($dir = dirname($target))) {
             $output->writeln('<info>[dir+]</info> '.$dir);
             if (false === @mkdir($dir, 0777, true)) {

diff --git a/src/Symfony/Bundle/AsseticBundle/Factory/AssetFactory.php b/src/Symfony/Bundle/AsseticBundle/Factory/AssetFactory.php
@@ -47,7 +47,7 @@ public function __construct(KernelInterface $kernel, ContainerInterface $contain
      * Please note this is a naive implementation of globs in that it doesn't
      * attempt to support bundle inheritance within the glob pattern itself.
      */
-    protected function parseInput($input)
+    protected function parseInput($input, array $options = array())
     {
         // expand bundle notation
         if ('@' == $input[0] && false !== strpos($input, '/')) {
@@ -60,7 +60,7 @@ protected function parseInput($input)
             }
         }
 
-        return parent::parseInput($input);
+        return parent::parseInput($input, $options);
     }
 
     protected function createAssetReference($name)

diff --git a/src/Symfony/Bundle/AsseticBundle/Factory/Worker/UseControllerWorker.php b/src/Symfony/Bundle/AsseticBundle/Factory/Worker/UseControllerWorker.php
@@ -23,9 +23,9 @@ class UseControllerWorker implements WorkerInterface
 {
     public function process(AssetInterface $asset)
     {
-        $targetUrl = $asset->getTargetUrl();
+        $targetUrl = $asset->getTargetPath();
         if ($targetUrl && '/' != $targetUrl[0] && 0 !== strpos($targetUrl, '_controller/')) {
-            $asset->setTargetUrl('_controller/'.$targetUrl);
+            $asset->setTargetPath('_controller/'.$targetUrl);
         }
 
         return $asset;

diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/compass.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/compass.xml
@@ -12,7 +12,6 @@
     <services>
         <service id="assetic.filter.compass" class="%assetic.filter.compass.class%">
             <tag name="assetic.filter" alias="compass" />
-            <argument>%assetic.read_from%</argument>
             <argument>%assetic.filter.compass.sass%</argument>
         </service>
     </services>

diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/less.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/less.xml
@@ -13,7 +13,6 @@
     <services>
         <service id="assetic.filter.less" class="%assetic.filter.less.class%">
             <tag name="assetic.filter" alias="less" />
-            <argument>%assetic.read_from%</argument>
             <argument>%assetic.filter.less.node%</argument>
             <argument>%assetic.filter.less.node_paths%</argument>
         </service>

diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/lessphp.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/lessphp.xml
@@ -11,7 +11,6 @@
     <services>
         <service id="assetic.filter.lessphp" class="%assetic.filter.lessphp.class%">
             <tag name="assetic.filter" alias="lessphp" />
-            <argument>%assetic.read_from%</argument>
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/sass.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/sass.xml
@@ -12,7 +12,6 @@
     <services>
         <service id="assetic.filter.sass" class="%assetic.filter.sass.class%">
             <tag name="assetic.filter" alias="sass" />
-            <argument>%assetic.read_from%</argument>
             <argument>%assetic.filter.sass.bin%</argument>
         </service>
     </services>

diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/scss.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/scss.xml
@@ -12,7 +12,6 @@
     <services>
         <service id="assetic.filter.scss" class="%assetic.filter.scss.class%">
             <tag name="assetic.filter" alias="scss" />
-            <argument>%assetic.read_from%</argument>
             <argument>%assetic.filter.scss.sass%</argument>
         </service>
     </services>

diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/sprockets.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/sprockets.xml
@@ -12,7 +12,6 @@
     <services>
         <service id="assetic.filter.sprockets" class="%assetic.filter.sprockets.class%">
             <tag name="assetic.filter" alias="sprockets" />
-            <argument>%assetic.read_from%</argument>
             <argument>%assetic.filter.sprockets.bin%</argument>
         </service>
     </services>

diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/stylus.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/filters/stylus.xml
@@ -13,7 +13,6 @@
     <services>
         <service id="assetic.filter.stylus" class="%assetic.filter.stylus.class%">
             <tag name="assetic.filter" alias="stylus" />
-            <argument>%assetic.read_from%</argument>
             <argument>%assetic.filter.stylus.node%</argument>
             <argument>%assetic.filter.stylus.node_paths%</argument>
         </service>

diff --git a/src/Symfony/Bundle/AsseticBundle/Routing/AsseticLoader.php b/src/Symfony/Bundle/AsseticBundle/Routing/AsseticLoader.php
@@ -99,7 +99,7 @@ private function loadRouteForAsset(RouteCollection $routes, AssetInterface $asse
         );
 
         // remove the fake front controller
-        $pattern = str_replace('_controller/', '', $asset->getTargetUrl());
+        $pattern = str_replace('_controller/', '', $asset->getTargetPath());
 
         if ($format = pathinfo($pattern, PATHINFO_EXTENSION)) {
             $defaults['_format'] = $format;

diff --git a/src/Symfony/Bundle/AsseticBundle/Templating/StaticAsseticHelper.php b/src/Symfony/Bundle/AsseticBundle/Templating/StaticAsseticHelper.php
@@ -40,6 +40,6 @@ public function __construct(AssetsHelper $assetsHelper, AssetFactory $factory, $
 
     protected function getAssetUrl(AssetInterface $asset, $options = array())
     {
-        return $this->assetsHelper->getUrl($asset->getTargetUrl(), isset($options['package']) ? $options['package'] : null);
+        return $this->assetsHelper->getUrl($asset->getTargetPath(), isset($options['package']) ? $options['package'] : null);
     }
 }
diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/Command/DumpCommandTest.php b/src/Symfony/Bundle/AsseticBundle/Tests/Command/DumpCommandTest.php
@@ -108,7 +108,7 @@ public function testDumpOne()
             ->method('isDebug')
             ->will($this->returnValue(false));
         $asset->expects($this->once())
-            ->method('getTargetUrl')
+            ->method('getTargetPath')
             ->will($this->returnValue('test_asset.css'));
         $asset->expects($this->once())
             ->method('dump')
@@ -140,7 +140,7 @@ public function testDumpDebug()
             ->method('isDebug')
             ->will($this->returnValue(true));
         $asset->expects($this->once())
-            ->method('getTargetUrl')
+            ->method('getTargetPath')
             ->will($this->returnValue('test_asset.css'));
         $asset->expects($this->once())
             ->method('dump')
@@ -149,7 +149,7 @@ public function testDumpDebug()
             ->method('getIterator')
             ->will($this->returnValue(new \ArrayIterator(array($leaf))));
         $leaf->expects($this->once())
-            ->method('getTargetUrl')
+            ->method('getTargetPath')
             ->will($this->returnValue('test_leaf.css'));
         $leaf->expects($this->once())
             ->method('dump')

diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/Templating/AsseticHelperTest.php b/src/Symfony/Bundle/AsseticBundle/Tests/Templating/AsseticHelperTest.php
@@ -51,6 +51,6 @@ class AsseticHelperForTest extends AsseticHelper
 {
     protected function getAssetUrl(AssetInterface $asset, $options = array())
     {
-        return $asset->getTargetUrl();
+        return $asset->getTargetPath();
     }
 }
diff --git a/src/Symfony/Bundle/AsseticBundle/Twig/AsseticNode.php b/src/Symfony/Bundle/AsseticBundle/Twig/AsseticNode.php
@@ -27,7 +27,7 @@ protected function compileAssetUrl(\Twig_Compiler $compiler, AssetInterface $ass
             ->raw('isset($context[\'assetic\'][\'use_controller\']) && $context[\'assetic\'][\'use_controller\'] ? ')
             ->subcompile($this->getPathFunction($name))
             ->raw(' : ')
-            ->subcompile($this->getAssetFunction($asset->getTargetUrl()))
+            ->subcompile($this->getAssetFunction($asset->getTargetPath()))
         ;
     }