Merge pull request #6 from maschmann/yaml-fileread-deprecation-refact…

…oring Added filecheck, now loading with file_get_contents before YAML::read()
maschmann · Jul 22, 2015 · 8fa7c49 · 8fa7c49
2 parents 7c3a27d + 9aaca4b
commit 8fa7c49
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: php
+sudo: false
 
 php:
   - 5.4

diff --git a/Config/AbstractConfig.php b/Config/AbstractConfig.php
@@ -113,10 +113,14 @@ public function setConfig($file)
      */
     private function readFile($file)
     {
-        if ($this->filecheck && !is_file($file)) {
-            throw new \InvalidArgumentException(
-                'Config::Abstract() - Given config file ' . $file . ' does not exist!'
-            );
+        if ($this->filecheck) {
+            if (is_file($file)) {
+                $file = file_get_contents($file);
+            } else {
+                throw new \InvalidArgumentException(
+                    'Config::Abstract() - Given config file ' . $file . ' does not exist!'
+                );
+            }
         }
 
         return (array)Yaml::parse($file);