Merge branch '4.3' into 4.4

* 4.3:
  Bump minimal requirements
This commit is contained in:
Nicolas Grekas 2019-08-10 23:16:51 +02:00
commit e37f672c2b
7 changed files with 8 additions and 8 deletions

View File

@ -35,7 +35,7 @@
"symfony/proxy-manager-bridge": "^3.4|^4.0|^5.0", "symfony/proxy-manager-bridge": "^3.4|^4.0|^5.0",
"symfony/security-core": "^4.4|^5.0", "symfony/security-core": "^4.4|^5.0",
"symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/validator": "^3.4|^4.0|^5.0", "symfony/validator": "^3.4.31|^4.3.4|^5.0",
"symfony/translation": "^3.4|^4.0|^5.0", "symfony/translation": "^3.4|^4.0|^5.0",
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/cache": "~1.6", "doctrine/cache": "~1.6",

View File

@ -1288,8 +1288,8 @@ class ContainerBuilderTest extends TestCase
public function testNoClassFromNamespaceClassIdWithLeadingSlash() public function testNoClassFromNamespaceClassIdWithLeadingSlash()
{ {
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException'); $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
$this->expectExceptionMessage('The definition for "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "Symfony\Component\DependencyInjection\Tests\FooClass" to get rid of this error.'); $this->expectExceptionMessage('Service definition "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class, and its name looks like a FQCN but it starts with a backslash; remove the leading backslash.');
$container = new ContainerBuilder(); $container = new ContainerBuilder();
$container->register('\\'.FooClass::class); $container->register('\\'.FooClass::class);

View File

@ -18,7 +18,7 @@
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"psr/container": "^1.0", "psr/container": "^1.0",
"symfony/service-contracts": "^1.1.2" "symfony/service-contracts": "^1.1.6"
}, },
"require-dev": { "require-dev": {
"symfony/yaml": "^3.4|^4.0|^5.0", "symfony/yaml": "^3.4|^4.0|^5.0",

View File

@ -27,7 +27,7 @@
}, },
"require-dev": { "require-dev": {
"doctrine/collections": "~1.0", "doctrine/collections": "~1.0",
"symfony/validator": "^3.4|^4.0|^5.0", "symfony/validator": "^3.4.31|^4.3.4|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/config": "^3.4|^4.0|^5.0", "symfony/config": "^3.4|^4.0|^5.0",
"symfony/console": "^4.3|^5.0", "symfony/console": "^4.3|^5.0",

View File

@ -26,7 +26,7 @@
"symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/http-foundation": "^3.4|^4.0|^5.0", "symfony/http-foundation": "^3.4|^4.0|^5.0",
"symfony/ldap": "^4.4|^5.0", "symfony/ldap": "^4.4|^5.0",
"symfony/validator": "^3.4|^4.0|^5.0", "symfony/validator": "^3.4.31|^4.3.4|^5.0",
"psr/log": "~1.0" "psr/log": "~1.0"
}, },
"conflict": { "conflict": {

View File

@ -35,7 +35,7 @@
"symfony/polyfill-ctype": "~1.8", "symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "^3.4|^4.0|^5.0", "symfony/routing": "^3.4|^4.0|^5.0",
"symfony/validator": "^3.4|^4.0|^5.0", "symfony/validator": "^3.4.31|^4.3.4|^5.0",
"symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/ldap": "^4.4|^5.0", "symfony/ldap": "^4.4|^5.0",
"psr/log": "~1.0" "psr/log": "~1.0"

View File

@ -18,7 +18,7 @@
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^1.1.2" "symfony/translation-contracts": "^1.1.6"
}, },
"require-dev": { "require-dev": {
"symfony/config": "^3.4|^4.0|^5.0", "symfony/config": "^3.4|^4.0|^5.0",