Forráskód Böngészése

Revert "[AsseticBundle] updated configuration to assume values with integer keys are inputs"

This reverts commit fb104cedf86edd605efd7475bc35193fa7c76f2b.
Kris Wallsmith 14 éve
szülő
commit
b25750daa9

+ 2 - 6
src/Symfony/Bundle/AsseticBundle/DependencyInjection/Configuration.php

@@ -101,13 +101,9 @@ class Configuration implements ConfigurationInterface
                                     }
                                 }
 
-                                // organize inputs and arbitrary options
-                                $inputsKey = isset($v['input']) ? 'input' : 'inputs';
+                                // organize arbitrary options
                                 foreach ($v as $key => $value) {
-                                    if (is_integer($key)) {
-                                        $v[$inputsKey][] = $value;
-                                        unset($v[$key]);
-                                    } elseif (!in_array($key, array('input', 'inputs', 'filter', 'filters', 'option', 'options'))) {
+                                    if (!in_array($key, array('input', 'inputs', 'filter', 'filters', 'option', 'options'))) {
                                         $v['options'][$key] = $value;
                                         unset($v[$key]);
                                     }

+ 0 - 4
src/Symfony/Bundle/AsseticBundle/Tests/Resources/config/config.yml

@@ -21,10 +21,6 @@ assetic:
     bundles:        [ TestBundle ]
     assets:
         jquery: js/jquery.js
-        foo:
-            - foo.css
-            - bar.css
-            filters: ?yui_css
         app_css:
             inputs:
                 - css/main.css