Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit aeffe8880b15 · 2019-08-10T23:18:44.000+02:00
* 4.4:
  Bump minimal requirements
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1288,8 +1288,8 @@ public function testNoClassFromGlobalNamespaceClassIdWithLeadingSlash()
 
     public function testNoClassFromNamespaceClassIdWithLeadingSlash()
     {
-        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
-        $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->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $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->register('\\'.FooClass::class);
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.2.9",
         "psr/container": "^1.0",
-        "symfony/service-contracts": "^1.1.2"
+        "symfony/service-contracts": "^1.1.6"
     },
     "require-dev": {
         "symfony/yaml": "^4.4|^5.0",
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.2.9",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/translation-contracts": "^1.1.2"
+        "symfony/translation-contracts": "^1.1.6"
     },
     "require-dev": {
         "symfony/config": "^4.4|^5.0",

Original file line number	Diff line number	Diff line change
`@@ -1288,8 +1288,8 @@ public function testNoClassFromGlobalNamespaceClassIdWithLeadingSlash()`
`1288`	`1288`
`1289`	`1289`	`public function testNoClassFromNamespaceClassIdWithLeadingSlash()`
`1290`	`1290`	`{`
`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.');`
`1293`	`1293`	`$container = new ContainerBuilder();`
`1294`	`1294`
`1295`	`1295`	`$container->register('\\'.FooClass::class);`