8000 Merge branch '4.3' into 4.4 · symfony/symfony@e37f672 · GitHub
[go: up one dir, main page]
Skip to content

Commit e37f672

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: Bump minimal requirements
2 parents 50167b9 + 45d449c commit e37f672

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"symfony/proxy-manager-bridge": "^3.4|^4.0|^5.0",
3636
"symfony/security-core": "^4.4|^5.0",
3737
"symfony/expression-language": "^3.4|^4.0|^5.0",
38-
"symfony/validator": "^3.4|^4.0|^5.0",
38+
"symfony/validator": "^3.4.31|^4.3.4|^5.0",
3939
"symfony/translation": "^3.4|^4.0|^5.0",
4040
"doctrine/annotations": "~1.0",
4141
"doctrine/cache": "~1.6",

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,8 +1288,8 @@ public function testNoClassFromGlobalNamespaceClassIdWithLeadingSlash()
12881288

12891289
public function testNoClassFromNamespaceClassIdWithLeadingSlash()
12901290
{
1291-
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
1292-
$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.');
1291+
$this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
1292+
$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.');
12931293
$container = new ContainerBuilder();
12941294

12951295
$container->register('\\'.FooClass::class);

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"psr/container": "^1.0",
21-
"symfony/service-contracts": "^1.1.2"
21+
"symfony/service-contracts": "^1.1.6"
2222
},
2323
"require-dev": {
2424
"symfony/yaml": "^3.4|^4.0|^5.0",

‎src/Symfony/Component/Form/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"require-dev": {
2929
"doctrine/collections": "~1.0",
30-
"symfony/validator": "^3.4|^4.0|^5.0",
30+
"symfony/validator": "^3.4.31|^4.3.4|^5.0",
3131
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
3232
"symfony/config": "^3.4|^4.0|^5.0",
3333
"symfony/console": "^4.3|^5.0",

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/expression-language": "^3.4|^4.0|^5.0",
2727
"symfony/http-foundation": "^3.4|^4.0|^5.0",
2828
"symfony/ldap": "^4.4|^5.0",
29-
"symfony/validator": "^3.4|^4.0|^5.0",
29+
"symfony/validator": "^3.4.31|^4.3.4|^5.0",
3030
"psr/log": "~1.0"
3131
},
3232
"conflict": {

‎src/Symfony/Component/Security/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"symfony/polyfill-ctype": "~1.8",
3636
"symfony/polyfill-intl-icu": "~1.0",
3737
"symfony/routing": "^3.4|^4.0|^5.0",
38-
"symfony/validator": "^3.4|^4.0|^5.0",
38+
"symfony/validator": "^3.4.31|^4.3.4|^5.0",
3939
"symfony/expression-language": "^3.4|^4.0|^5.0",
4040
"symfony/ldap": "^4.4|^5.0",
4141
"psr/log": "~1.0"

‎src/Symfony/Component/Translation/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"symfony/polyfill-mbstring": "~1.0",
21-
"symfony/translation-contracts": "^1.1.2"
21+
"symfony/translation-contracts": "^1.1.6"
2222
},
2323
"require-dev": {
2424
"symfony/config": "^3.4|^4.0|^5.0",

0 commit comments

Comments
 (0)
0