Skip to content

Commit c804a88

Browse files
authored
Merge pull request #74 from trivago-timmo/develop
Updated package dependency on latest symfony/yaml
2 parents 7ba49c3 + 2773dbb commit c804a88

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@
3131
"require": {
3232
"zendframework/zend-cache": "^2.0",
3333
"psr/container": "^1",
34-
"symfony/console": "~2.3|~3.0",
35-
"psr/http-message": "^1.0",
36-
"symfony/yaml": "^2"
34+
"symfony/console": "~2.3|~3.0|^4.0",
35+
"psr/http-message": "^1.0"
3736
},
3837
"suggest": {
3938
"zendframework/zend-psr7bridge": "For use with the optional view layer",
@@ -43,7 +42,8 @@
4342
"zendframework/zend-i18n": "For use with the optional view layer",
4443
"zendframework/zend-json": "For use with the optional view layer",
4544
"mongodb/mongodb": "If you intend to use MongoDB for your configuration storage",
46-
"zendframework/zend-db": "If you intend to use a relational DB for your configuration storage"
45+
"zendframework/zend-db": "If you intend to use a relational DB for your configuration storage",
46+
"symfony/yaml": "If you intend to use yaml for parsing configuration files"
4747
},
4848
"bin": ["bin/magium-configuration"]
4949
}

tests/Config/YamlConfigurationRepositoryTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77

88
class YamlConfigurationRepositoryTest extends TestCase
99
{
10+
protected function setUp()
11+
{
12+
if (!class_exists('Symfony\Component\Yaml\Yaml')) {
13+
$this->markTestSkipped(
14+
'The package symfony/yaml is not available.'
15+
);
16+
}
17+
}
1018

1119
public function testXpath()
1220
{

0 commit comments

Comments
 (0)