minor #15182 [2.8] Fix 3.0 incompatible deps (nicolas-grekas)

This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] Fix 3.0 incompatible deps

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This should fix the failing the deps=2.8 tests on master.

Commits
-------

753812e [2.8] Fix 3.0 incompatible deps
This commit is contained in:
Nicolas Grekas 2015-07-22 14:33:46 +02:00
commit c1d915b07c
6 changed files with 12 additions and 9 deletions

View File

@ -23,7 +23,7 @@
"symfony/phpunit-bridge": "~2.7|~3.0.0",
"symfony/asset": "~2.7|~3.0.0",
"symfony/finder": "~2.3|~3.0.0",
"symfony/form": "~2.8|~3.0.0",
"symfony/form": "~2.8",
"symfony/http-kernel": "~2.3|~3.0.0",
"symfony/intl": "~2.3|~3.0.0",
"symfony/routing": "~2.2|~3.0.0",

View File

@ -75,6 +75,9 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
$this->assertDescription($expectedDescription, $definition);
}
/**
* @group legacy
*/
public function provideLegacySynchronizedServiceDefinitionTestData()
{
return $this->getDescriptionTestData(ObjectsProvider::getLegacyContainerDefinitions());

View File

@ -22,14 +22,14 @@
"symfony/config": "~2.4",
"symfony/event-dispatcher": "~2.8|~3.0.0",
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
"symfony/http-kernel": "~2.7|~3.0.0",
"symfony/http-kernel": "~2.7",
"symfony/filesystem": "~2.3|~3.0.0",
"symfony/routing": "~2.8|~3.0.0",
"symfony/security-core": "~2.6|~3.0.0",
"symfony/security-csrf": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0",
"symfony/templating": "~2.1|~3.0.0",
"symfony/translation": "~2.7|~3.0.0",
"symfony/translation": "~2.7",
"doctrine/annotations": "~1.0"
},
"require-dev": {
@ -41,7 +41,7 @@
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
"symfony/intl": "~2.3|~3.0.0",
"symfony/security": "~2.6|~3.0.0",
"symfony/form": "~2.8|~3.0.0",
"symfony/form": "~2.8",
"symfony/class-loader": "~2.1|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/process": "~2.0,>=2.0.5|~3.0.0",

View File

@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.9",
"symfony/security": "~2.8|~3.0.0",
"symfony/http-kernel": "~2.2|~3.0.0"
"symfony/http-kernel": "~2.2"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0.0",
@ -28,8 +28,8 @@
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.6,>=2.6.6|~3.0.0",
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
"symfony/form": "~2.7|~3.0.0",
"symfony/framework-bundle": "~2.7|~3.0.0",
"symfony/form": "~2.7",
"symfony/framework-bundle": "~2.7",
"symfony/http-foundation": "~2.4|~3.0.0",
"symfony/twig-bundle": "~2.7|~3.0.0",
"symfony/twig-bridge": "~2.7|~3.0.0",

View File

@ -25,7 +25,7 @@
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0.0",
"doctrine/collections": "~1.0",
"symfony/validator": "~2.6,>=2.6.8|~3.0.0",
"symfony/validator": "~2.8|~3.0.0",
"symfony/http-foundation": "~2.2|~3.0.0",
"symfony/http-kernel": "~2.4|~3.0.0",
"symfony/security-csrf": "~2.4|~3.0.0",

View File

@ -29,7 +29,7 @@
"symfony/config": "~2.7",
"symfony/console": "~2.3|~3.0.0",
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.2|~3.0.0",
"symfony/dependency-injection": "~2.8|~3.0.0",
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
"symfony/expression-language": "~2.4|~3.0.0",
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",