Merge upstream changes

matteosister · Aug 1, 2012 · ff73056 · ff73056
2 parents b8eb76f + 24df9ed
commit ff73056
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/Command/DumpCommand.php b/Command/DumpCommand.php
@@ -57,7 +57,7 @@ protected function initialize(InputInterface $input, OutputInterface $output)
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln(sprintf('Dumping all <comment>%s</comment> assets.', $input->getOption('env')));
-        $output->writeln(sprintf('Debug mode is <comment>%s</comment>.', $input->getOption('no-debug') ? 'off' : 'on'));
+        $output->writeln(sprintf('Debug mode is <comment>%s</comment>.', $this->am->isDebug() ? 'on' : 'off'));
         $output->writeln('');
 
         if (!$input->getOption('watch')) {

diff --git a/Resources/config/assetic.xml b/Resources/config/assetic.xml
@@ -64,11 +64,7 @@
             <argument /> <!-- filter -->
         </service>
 
-        <service id="assetic.parameter_bag" class="Symfony\Component\DependencyInjection\ParameterBag\ParameterBag" public="false">
-            <argument type="service" id="assetic.parameters" />
-        </service>
-
-        <service id="assetic.parameters" class="stdClass" factory-service="service_container" factory-method="getDefaultParameters" public="false" />
+        <service id="assetic.parameter_bag" class="Symfony\Component\DependencyInjection\ParameterBag\ParameterBag" factory-service="service_container" factory-method="getParameterBag" public="false"/>
 
         <service id="assetic.value_supplier.default" class="%assetic.value_supplier.class%" public="false">
             <argument type="service" id="service_container" />

diff --git a/Resources/config/filters/compass.xml b/Resources/config/filters/compass.xml
@@ -23,6 +23,7 @@
         <service id="assetic.filter.compass" class="%assetic.filter.compass.class%">
             <tag name="assetic.filter" alias="compass" />
             <argument>%assetic.filter.compass.bin%</argument>
+            <argument>%assetic.ruby.bin%</argument>
             <call method="setDebugInfo"><argument>%assetic.filter.compass.debug%</argument></call>
             <call method="setStyle"><argument>%assetic.filter.compass.style%</argument></call>
             <call method="setImagesDir"><argument>%assetic.filter.compass.images_dir%</argument></call>

diff --git a/Resources/config/filters/sass.xml b/Resources/config/filters/sass.xml
@@ -15,6 +15,7 @@
         <service id="assetic.filter.sass" class="%assetic.filter.sass.class%">
             <tag name="assetic.filter" alias="sass" />
             <argument>%assetic.filter.sass.bin%</argument>
+            <argument>%assetic.ruby.bin%</argument>
             <call method="setStyle"><argument>%assetic.filter.sass.style%</argument></call>
             <call method="setCompass"><argument>%assetic.filter.sass.compass%</argument></call>
         </service>

diff --git a/Resources/config/filters/scss.xml b/Resources/config/filters/scss.xml
@@ -15,6 +15,7 @@
         <service id="assetic.filter.scss" class="%assetic.filter.scss.class%">
             <tag name="assetic.filter" alias="scss" />
             <argument>%assetic.filter.scss.sass%</argument>
+            <argument>%assetic.ruby.bin%</argument>
             <call method="setStyle"><argument>%assetic.filter.scss.style%</argument></call>
             <call method="setCompass"><argument>%assetic.filter.scss.compass%</argument></call>
         </service>

diff --git a/Resources/config/filters/scssphp.xml b/Resources/config/filters/scssphp.xml
@@ -0,0 +1,16 @@
+<?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="assetic.filter.scssphp.class">Assetic\Filter\ScssphpFilter</parameter>
+    </parameters>
+
+    <services>
+        <service id="assetic.filter.scssphp" class="%assetic.filter.scssphp.class%">
+            <tag name="assetic.filter" alias="scssphp" />
+        </service>
+    </services>
+</container>
diff --git a/Tests/DependencyInjection/AsseticExtensionTest.php b/Tests/DependencyInjection/AsseticExtensionTest.php
@@ -111,6 +111,7 @@ public function getFilterNames()
             array('jpegtran'),
             array('less'),
             array('lessphp'),
+            array('scssphp'),
             array('optipng'),
             array('packager'),
             array('pngout'),