Commit 2e5e09c5 authored by Thorsten Buss's avatar Thorsten Buss

update to newer depended packages and fix the update-resulting bugs

parent f64ed480
......@@ -5,11 +5,11 @@
"keywords": ["file", "repository", "filesystem", "media", "abstraction"],
"license": "MIT",
"require": {
"php": ">=5.3.2",
"aws/aws-sdk-php": "2.2.*",
"symfony/yaml": "2.2.*",
"php": ">=5.3.8",
"aws/aws-sdk-php": "~2.5",
"symfony/yaml": "~2.4",
"herzult/php-ssh": "@dev",
"knplabs/gaufrette": "v0.1.4"
"knplabs/gaufrette": "~0.1"
},
"require-dev": {
"phpunit/phpunit": "3.7.*"
......
This diff is collapsed.
......@@ -46,7 +46,6 @@ class RepositoryManager {
}
try {
Yaml::enablePhpParsing();
$config = Yaml::parse($resource);
} catch (ParseException $e) {
throw new InvalidResourceException('Error parsing YAML.', 0, $e);
......
......@@ -340,7 +340,10 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase {
if ($ct == 'text/plain') {
$this->assertEquals('text/plain', $ct, 'Check ContentType TXT');
} else {
$this->assertEquals('application/octet-stream', $ct, 'Check ContentType TXT (FALLBACK application/octet-stream)');
if ($ct == 'binary/octet-stream')
$this->assertEquals('binary/octet-stream', $ct, 'Check ContentType TXT (FALLBACK binary/octet-stream)');
else
$this->assertEquals('application/octet-stream', $ct, 'Check ContentType TXT (FALLBACK application/octet-stream)');
}
// Download ExampleImg for BinaryTest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment