8000 [AsseticBundle] updated for changes in Assetic · qcho/symfony@b173884 · GitHub
[go: up one dir, main page]
Skip to content

Commit b173884

Browse files
kriswallsmithkriswallsmith
committed
[AsseticBundle] updated for changes in Assetic
1 parent 9e407d7 commit b173884

File tree

15 files changed

+12
-19
lines changed

15 files changed

+12
-19
lines changed

‎src/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private function dumpAsset($name, OutputInterface $output)
171171
*/
172172
private function doDump(AssetInterface $asset, OutputInterface $output)
173173
{
174-
$target = rtrim($this->basePath, '/').'/'.str_replace('_controller/', '', $asset->getTargetUrl());
174+
$target = rtrim($this->basePath, '/').'/'.str_replace('_controller/', '', $asset->getTargetPath());
175175
if (!is_dir($dir = dirname($target))) {
176176
$output->writeln('<info>[dir+]</info> '.$dir);
177177
if (false === @mkdir($dir, 0777, true)) {

‎src/Symfony/Bundle/AsseticBundle/Factory/AssetFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(KernelInterface $kernel, ContainerInterface $contain
4747
* Please note this is a naive implementation of globs in that it doesn't
4848
* attempt to support bundle inheritance within the glob pattern itself.
4949
*/
50-
protected function parseInput($input)
50+
protected function parseInput($input, array $options = array())
5151
{
5252
// expand bundle notation
5353
if ('@' == $input[0] && false !== strpos($input, '/')) {
@@ -60,7 +60,7 @@ protected function parseInput($input)
6060
}
6161
}
6262

63-
return parent::parseInput($input);
63+
return parent::parseInput($input, $options);
6464
}
6565

6666
protected function createAssetReference($name)

‎src/Symfony/Bundle/AsseticBundle/Factory/Worker/UseControllerWorker.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class UseControllerWorker implements WorkerInterface
2323
{
2424
public function process(AssetInterface $asset)
2525
{
26-
$targetUrl = $asset->getTargetUrl();
26+
$targetUrl = $asset->getTargetPath();
2727
if ($targetUrl && '/' != $targetUrl[0] && 0 !== strpos($targetUrl, '_controller/')) {
28-
$asset->setTargetUrl('_controller/'.$targetUrl);
28+
$asset->setTargetPath('_controller/'.$targetUrl);
2929
}
3030

3131
return $asset;

‎src/Symfony/Bundle/AsseticBundle/Resources/config/filters/compass.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<services>
1313
<service id="assetic.filter.compass" class="%assetic.filter.compass.class%">
1414
<tag name="assetic.filter" alias="compass" />
15-
<argument>%assetic.read_from%</argument>
1615
<argument>%assetic.filter.compass.sass%</argument>
1716
</service>
1817
</services>

‎src/Symfony/Bundle/AsseticBundle/Resources/config/filters/less.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<services>
1414
<service id="assetic.filter.less" class="%assetic.filter.less.class%">
1515
<tag name="assetic.filter" alias="less" />
16-
<argument>%assetic.read_from%</argument>
1716
<argument>%assetic.filter.less.node%</argument>
1817
<argument>%assetic.filter.less.node_paths%</argument>
1918
</service>

‎src/Symfony/Bundle/AsseticBundle/Resources/config/filters/lessphp.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<services>
1212
<service id="assetic.filter.lessphp" class="%assetic.filter.lessphp.class%">
1313
<tag name="assetic.filter" alias="lessphp" />
14-
<argument>%assetic.read_from%</argument>
1514
</service>
1615
</services>
1716
</container>

‎src/Symfony/Bundle/AsseticBundle/Resources/config/filters/sass.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<services>
1313
<service id="assetic.filter.sass" class="%assetic.filter.sass.class%">
1414
<tag name="assetic.filter" alias="sass" />
15-
<argument>%assetic.read_from%</argument>
1615
<argument>%assetic.filter.sass.bin%</argument>
1716
</service>
1817
</services>

‎src/Symfony/Bundle/AsseticBundle/Resources/config/filters/scss.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<services>
1313
<service id="assetic.filter.scss" class="%assetic.filter.scss.class%">
1414
<tag name="assetic.filter" alias="scss" />
15-
<argument>%assetic.read_from%</argument>
1615
<argument>%assetic.filter.scss.sass%</argument>
1716
</service>
1817
</services>

‎src/Symfony/Bundle/AsseticBundle/Resources/config/filters/sprockets.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<services>
1313
<service id="assetic.filter.sprockets" class="%assetic.filter.sprockets.class%">
1414
<tag name="assetic.filter" alias="sprockets" />
15-
<argument>%assetic.read_from%</argument>
1615
<argument>%assetic.filter.sprockets.bin%</argument>
1716
</service>
1817
</services>

‎src/Symfony/Bundle/AsseticBundle/Resources/config/filters/stylus.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<services>
1414
<service id="assetic.filter.stylus" class="%assetic.filter.stylus.class%">
1515
<tag name="assetic.filter" alias="stylus" />
16-
<argument>%assetic.read_from%</argument>
1716
<argument>%assetic.filter.stylus.node%</argument>
1817
<argument>%assetic.filter.stylus.node_paths%</argument>
1918
</service>

0 commit comments

Comments
 (0)
0