Merge pull request #7 from relvinhas/master

support Symfony 2.7 Config and Yaml components
flint · Jun 13, 2015 · e8a09a7 · e8a09a7
2 parents 2987523 + 86ccfdf
commit e8a09a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ php:
     - 5.6
     - 7.0
     - hhvm
-    - hhvm-nightly
 
 matrix:
     allow_failures:

diff --git a/src/Loader/CacheLoader.php b/src/Loader/CacheLoader.php
@@ -58,7 +58,7 @@ public function load($resource, $type = null)
         }
 
         if (!isset($parameters)) {
-            require (string) $cache;
+            require method_exists($cache, 'getPath') ? $cache->getPath() : (string) $cache;
         }
 
         return $parameters;

diff --git a/src/Loader/YamlFileLoader.php b/src/Loader/YamlFileLoader.php
@@ -15,7 +15,7 @@ class YamlFileLoader extends AbstractLoader
      */
     protected function read($resource)
     {
-        return Yaml::parse($resource);
+        return Yaml::parse(file_get_contents($resource));
     }
 
     /**