diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f0d2b4..ff3490f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## Unreleased + +* Allow usage of phpunit/phpunit ^5.0 +* Allow usage of symfony/yaml ^3.0 + ## 3.0 - 2015-08-13 * Update egeloen/http-adapter to 0.8 diff --git a/composer.json b/composer.json index ad49a20..f415ecc 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,11 @@ }, "require": { "egeloen/http-adapter": "^0.8.0", - "symfony/yaml": "^2.6", - "symfony/event-dispatcher": "^2.6" + "symfony/yaml": "^2.6|^3.0", + "symfony/event-dispatcher": "^2.6|^3.0" }, "require-dev": { - "phpunit/phpunit": "^4.6", + "phpunit/phpunit": "^4.6|^5.0", "fabpot/php-cs-fixer": "^1.6" }, "autoload": { diff --git a/src/Event/TapeRecorder/Tape.php b/src/Event/TapeRecorder/Tape.php index 5e60a07..5e9e234 100644 --- a/src/Event/TapeRecorder/Tape.php +++ b/src/Event/TapeRecorder/Tape.php @@ -163,7 +163,7 @@ public function load() $filePath = $this->getFilePath(); if (is_file($filePath) && is_readable($filePath)) { - $data = Yaml::parse($filePath); + $data = Yaml::parse(file_get_contents($filePath)); foreach ($data as $item) { $this->writeTrack($this->converter->arrayToTrack($item)); }