Skip to content
This repository was archived by the owner on Feb 22, 2019. It is now read-only.

Commit f7aff49

Browse files
committed
feature #7 Fix Symfony 3 support (sstok)
This PR was merged into the master branch. Discussion ---------- |Q |A | |--- |---| |Bug Fix |yes| |New Feature |yes| |Deprecations |no | |Fixed Tickets|#6 | |License |MIT| Commits ------- c638eb7 Bump branch-alias c273229 Add "symfony/dependency-injection" as explicit dependecy with higher constraint b3b7dbd Allow Symfony 3 3dec068 Remove compatibility checker
2 parents 9146907 + 3dec068 commit f7aff49

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ matrix:
1414
env: DEPENDENCIES='low'
1515
- php: 5.6
1616
env: DEPENDENCIES='dev'
17+
- php: 5.6
18+
env: SYMFONY_VERSION=3.0.*
1719
allow_failures:
18-
- php: 7.0
1920
- env: DEPENDENCIES='dev'
2021
fast_finish: true
2122

@@ -25,7 +26,13 @@ cache:
2526
directories:
2627
- $HOME/.composer/cache/files
2728

29+
before_install:
30+
- composer selfupdate
31+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
32+
2833
install:
34+
- export SYMFONY_DEPRECATIONS_HELPER=strong
35+
- export COMPOSER_ROOT_VERSION=dev-master
2936
- if [ "$DEPENDENCIES" == "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
3037
- if [ "$DEPENDENCIES" != "low" ]; then travis_retry composer update; fi;
3138
- if [ "$DEPENDENCIES" == "low" ]; then travis_retry composer update --prefer-lowest; fi;

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
],
1111
"require": {
1212
"php": ">=5.3",
13-
"symfony/framework-bundle": "~2.3",
14-
"symfony/expression-language": "~2.4",
13+
"symfony/framework-bundle": "~2.3|~3.0",
14+
"symfony/dependency-injection": "~2.4|~3.0",
15+
"symfony/expression-language": "~2.4|~3.0",
1516
"knplabs/knp-menu-bundle": "^2.0.0"
1617
},
1718
"require-dev": {
18-
"matthiasnoback/symfony-config-test": "~1.1.0",
19-
"matthiasnoback/symfony-dependency-injection-test": "~0.7.4",
19+
"matthiasnoback/symfony-config-test": "^1.1.0",
20+
"matthiasnoback/symfony-dependency-injection-test": "^0.7.6",
2021
"symfony/phpunit-bridge": "~2.7"
2122
},
2223
"autoload": {
@@ -31,7 +32,7 @@
3132
},
3233
"extra": {
3334
"branch-alias": {
34-
"dev-master": "1.2-dev"
35+
"dev-master": "1.3-dev"
3536
}
3637
}
3738
}

tests/DependencyInjection/NavigationExtensionTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ public function testBreadcrumbParentsAreResolved()
102102

103103
public function testBreadcrumbsAreRegisteredWithExpression()
104104
{
105-
if (!class_exists('Symfony\Component\DependencyInjection\ExpressionLanguage')) {
106-
$this->markTestSkipped('Requires at least version 2.4 of the DependencyInjection component.');
107-
}
108-
109105
$this->load(array(
110106
'breadcrumbs' => array(
111107
'webhosting' => array(

0 commit comments

Comments
 (0)