Small refactor

Author: m1

src/Loader/LoaderProvider.php

@@ -58,9 +58,10 @@ public function __construct($options, $default_loaders)
      */
     private function makeLoaders($options, $default_loaders)
     {
+        $loaders = $this->preParseLoaders($options, $default_loaders);
         $parsed_loaders = array();
 
-        foreach ($options['loaders'] as $loader) {
+        foreach ($loaders as $loader) {
             if ($loader === 'default') {
                 $parsed_loaders = array_merge($parsed_loaders, $default_loaders);
             } else {
@@ -74,14 +75,36 @@ private function makeLoaders($options, $default_loaders)
         $this->extensions = $this->makeExtensions($this->loaders);
     }
 
+    /**
+     * Pre parse the loaders for use in make loaders
+     *
+     * @param array|null $options           The options being used for Vars
+     * @param array      $default_loaders   The default loaders for Vars
+     *
+     * @return array The pre parsed loaders
+     */
+    private function preParseLoaders($options, $default_loaders)
+    {
+        $loaders = array();
+
+        if (is_array($options['loaders']) && !empty($options['loaders'])) {
+            $loaders = $options['loaders'];
+        } elseif (is_string($options['loaders'])) {
+            $loaders[] = $options['loaders'];
+        } else {
+            $loaders = $default_loaders;
+        }
+
+        return $loaders;
+    }
+
     /**
      * Makes namespace loaders from loader strings
      *
      * @param array $loaders The options being used for Vars
      * @param array      $default_loaders   The default loaders for Vars
      *
      * @throws \InvalidArgumentException If a loader from options isn't found
-     * @throws \InvalidArgumentException If no loaders were loaded
      *
      * @return array The namespace loaders
      */
@@ -101,13 +124,6 @@ private function makeNameSpaceLoaders($loaders, $default_loaders)
             $parsed_loaders[] = $loader;
         }
 
-        // @codeCoverageIgnoreStart
-        if (empty($parsed_loaders)) {
-            throw new \InvalidArgumentException('No loaders were loaded');
-        }
-        // @codeCoverageIgnoreEnd
-
-
         return $parsed_loaders;
     }
 

src/Resource/FileResource.php

@@ -286,21 +286,6 @@ private function createImportName($resource)
         $resource_pieces = array();
 
         foreach ($resource as $r) {
-            //$suppress = false;
-            //$recursive = false;
-            //
-            ////if ($this->checkSuppression($r)) {
-            ////    $suppress = true;
-            ////    $r = trim($r, "@");
-            ////}
-            ////
-            ////if ($this->checkRecursive($r)) {
-            ////    $recursive = true;
-            ////    $r = trim($r, "*");
-            ////}
-            ////
-            ////$r = $this->removeFlags($r);
-
             $parsed_r = $this->trimFlags($r);
             $parsed_r = sprintf('%s/%s', dirname($this->file), $parsed_r);
             $parsed_r = $this->replicateFlags($parsed_r, $r);
@@ -309,7 +294,6 @@ private function createImportName($resource)
         }
 
         return $this->implodeResourceIfElse($resource_pieces);
-
     }
 
     /**

src/Resource/ResourceProvider.php

@@ -174,21 +174,11 @@ private function processEntity($entity, $type)
     private function parseEntity($entity)
     {
         $files = $this->explodeResourceIfElse($entity);
-        $recursive = $this->recursive;
 
         foreach ($files as $f) {
-            $this->suppress_file_exceptions = false;
-            $this->recursive = $recursive;
-
-            if ($this->checkSuppression($f)) {
-                $f = trim($f, "@");
-                $this->suppress_file_exceptions = true;
-            }
-
-            if ($this->checkRecursive($f)) {
-                $f = trim($f, "*");
-                $this->recursive = true;
-            }
+            $this->suppress_file_exceptions = $this->checkSuppression($f);
+            $this->recursive = $this->checkRecursive($f);
+            $f = $this->trimFlags($f);
 
             if (file_exists($f) || !isset($files[1])) {
                 return $f;

src/Vars.php

@@ -133,23 +133,7 @@ public function __construct($resource, $options = array())
     private function parseOptions(array $options)
     {
         $parsed_options = array_merge($this->default_options, $options);
-
-        if (isset($options['loaders'])) {
-            $loaders = array();
-
-            if (is_array($options['loaders']) && !empty($options['loaders'])) {
-                $loaders = $options['loaders'];
-            } elseif (is_string($options['loaders'])) {
-                $loaders[] = $options['loaders'];
-            } else {
-                $loaders = $this->default_options['loaders'];
-            }
-
-            $parsed_options['loaders'] = $loaders;
-        } else {
-            $parsed_options['loaders'] = $this->default_options['loaders'];
-        }
-
+        $parsed_options['loaders'] = (isset($options['loaders'])) ? $options['loaders'] : $this->default_options['loaders'];
         return $parsed_options;
     }
 

tests/VarsTest.php

@@ -350,8 +350,7 @@ public function testImportDirImporting()
     {
         $expected = array(
             'test_key_1' => array(
-                'test_key_2' => 'test_value_2',
-                'test_key_3' => 'test_value_3',
+                'test_key_2' => 'test_value_2'
             ),
         );