Skip to content

Commit 84d66a2

Browse files
committed
Allow Symfony 3
1 parent cc33cfd commit 84d66a2

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ php:
88
- 7.0
99
- hhvm
1010

11+
cache:
12+
directories:
13+
- $HOME/.composer/cache/files
14+
1115
matrix:
1216
include:
1317
- php: 5.6
1418
env: SYMFONY_VERSION='2.3.*'
1519
- php: 5.6
16-
env: SYMFONY_VERSION='2.5.*'
17-
allow_failures:
18-
- php: 7.0
20+
env: SYMFONY_VERSION='2.8.*@dev'
21+
- php: 5.6
22+
env: SYMFONY_VERSION='3.0.*@dev'
1923

2024
sudo: false
2125

Tests/Command/RouterDebugExposedCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public function testExecute()
6161
$tester = new CommandTester($command);
6262
$tester->execute(array());
6363

64-
$this->assertContains('literal ANY ANY ANY /literal', $tester->getDisplay());
65-
$this->assertContains('blog_post ANY ANY ANY /blog-post/{slug}', $tester->getDisplay());
66-
$this->assertContains('list ANY ANY ANY /literal', $tester->getDisplay());
64+
$this->assertRegExp('/literal(.*ANY){3}.*\/literal/', $tester->getDisplay());
65+
$this->assertRegExp('/blog_post(.*ANY){3}.*\/blog-post\/{slug}/', $tester->getDisplay());
66+
$this->assertRegExp('/list(.*ANY){3}.*\/literal/', $tester->getDisplay());
6767
}
6868

6969
/**

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.2",
20-
"symfony/framework-bundle": "~2.3",
21-
"symfony/serializer": "~2.0",
22-
"symfony/console": "~2.3",
20+
"symfony/framework-bundle": "~2.3|~3.0",
21+
"symfony/serializer": "~2.0|~3.0",
22+
"symfony/console": "~2.3|~3.0",
2323
"willdurand/jsonp-callback-validator": "~1.0"
2424
},
2525
"require-dev": {
26-
"symfony/expression-language": "~2.4"
26+
"symfony/expression-language": "~2.4|~3.0",
27+
"symfony/phpunit-bridge": "~2.7|~3.0"
2728
},
2829
"autoload": {
2930
"psr-4": { "FOS\\JsRoutingBundle\\": "" }

0 commit comments

Comments
 (0)