Merge pull request #358 from ADmad/skip-plugins

Allow skipping config files from plugins.

Author: markstory

src/Command/BuildCommand.php

@@ -38,6 +38,10 @@ public function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionPar
                 'help' => 'The config file to use.',
                 'short' => 'c',
                 'default' => CONFIG . 'asset_compress.ini',
+            ])
+            ->addOption('skip-plugins', [
+                'help' => 'Don\'t load config files from plugin\'s .',
+                'boolean' => true,
             ]);
 
         return $parser;
@@ -53,7 +57,10 @@ public function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionPar
     public function execute(Arguments $args, ConsoleIo $io)
     {
         $configFinder = new ConfigFinder();
-        $config = $configFinder->loadAll($args->getOption('config'));
+        $config = $configFinder->loadAll(
+            $args->getOption('config'),
+            (bool)$args->getOption('skip-plugins')
+        );
         $factory = new Factory($config);
 
         $themes = (array)$config->general('themes');

src/Config/ConfigFinder.php

@@ -27,9 +27,10 @@ class ConfigFinder
      * will be loaded if it is present.
      *
      * @param string $path The configuration file path to start loading from.
+     * @param bool $skipPlugins Whether to skip config files from plugins. Default `false`.
      * @return \MiniAsset\AssetConfig The completed configuration object.
      */
-    public function loadAll($path = null)
+    public function loadAll($path = null, $skipPlugins = false)
     {
         if (!$path) {
             $path = CONFIG . 'asset_compress.ini';
@@ -39,6 +40,10 @@ public function loadAll($path = null)
         ]);
         $this->_load($config, $path);
 
+        if ($skipPlugins) {
+            return $config;
+        }
+
         $plugins = Plugin::loaded();
         foreach ($plugins as $plugin) {
             $pluginConfig = Plugin::path($plugin) . 'config' . DS . 'asset_compress.ini';

tests/TestCase/Config/ConfigFinderTest.php

@@ -72,6 +72,18 @@ public function testIniTargets()
         ];
         $result = $config->targets();
         $this->assertEquals($expected, $result);
+
+        $config = $configFinder->loadAll($this->testConfig, true);
+
+        $expected = [
+            'libs.js',
+            'foo.bar.js',
+            'new_file.js',
+            'all.css',
+            'pink.css',
+        ];
+        $result = $config->targets();
+        $this->assertEquals($expected, $result);
     }
 
     public function testLocalPluginConfig()