Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit 5f0eae682fc0 · 2018-06-29T18:29:42.000+02:00
* 4.0: [HttpFoundation] update phpdoc of FlashBagInterface::add() [ProxyManagerBridge] Fix support of private services (bis) bug #27701 [SecurityBundle] Dont throw if "security.http_utils" is not found (nicolas-grekas) [Form] relax fixtures for forward compat [Validator] Fix the namespace of RegexTest [Lock] fix locale dependent test case
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -54,7 +54,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', $id);
+            $instantiation .= sprintf(' $this->%s[\'%s\'] =', \method_exists(ContainerBuilder::class, 'addClassResource') || ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', $id);
         }
 
         if (null === $factoryCode) {
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
 /**
@@ -98,7 +99,7 @@ public function getPrivatePublicDefinitions()
             array(
                 (new Definition(__CLASS__))
                     ->setPublic(false),
-                'privates',
+                \method_exists(ContainerBuilder::class, 'addClassResource') ? 'services' : 'privates',
             ),
             array(
                 (new Definition(__CLASS__))
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
@@ -15,7 +15,7 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain
  ---------------- --------------------%s 
   Allowed values   -                  %s 
  ---------------- --------------------%s 
-  Normalizer       Closure {          %s 
+  Normalizer       Closure%s{         %s 
                      parameters: 2    %s 
                      file: "%s%eExtension%eCore%eType%eChoiceType.php"  
                      line: "%s to %s" %s 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
@@ -8,12 +8,12 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
   Default          Value: null          %s 
                                         %s 
                    Closure(s): [        %s 
-                     Closure {          %s 
+                     Closure%s{         %s 
                        parameters: 1    %s 
                        file: "%s%eExtension%eCore%eType%eFormType.php"                     
                        line: "%s to %s" %s 
                      },                 %s 
-                     Closure {          %s 
+                     Closure%s{         %s 
                        parameters: 2    %s 
                        file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"  
                        line: "%s to %s" %s 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt
@@ -16,7 +16,7 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo)
                      "baz"            %s 
                    ]                  %s 
  ---------------- --------------------%s 
-  Normalizer       Closure {          %s 
+  Normalizer       Closure%s{         %s 
                      parameters: 2    %s 
                      file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"  
                      line: "%s to %s" %s 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
@@ -24,7 +24,7 @@ interface FlashBagInterface extends SessionBagInterface
      * Adds a flash message for type.
      *
      * @param string $type
-     * @param string $message
+     * @param mixed  $message
      */
     public function add($type, $message);
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
@@ -74,6 +74,18 @@ public function testPeek()
         $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
     }
 
+    public function testAdd()
+    {
+        $tab = array('bar' => 'baz');
+        $this->bag->add('string_message', 'lorem');
+        $this->bag->add('object_message', new \stdClass());
+        $this->bag->add('array_message', $tab);
+
+        $this->assertEquals(array('lorem'), $this->bag->get('string_message'));
+        $this->assertEquals(array(new \stdClass()), $this->bag->get('object_message'));
+        $this->assertEquals(array($tab), $this->bag->get('array_message'));
+    }
+
     public function testGet()
     {
         $this->assertEquals(array(), $this->bag->get('non_existing'));
diff --git a/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
@@ -46,7 +46,7 @@ public function testResourceRemoval()
 
     private function getOpenedSemaphores()
     {
-        $lines = explode(PHP_EOL, trim(`ipcs -su`));
+        $lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
         if ('------ Semaphore Status --------' !== $lines[0]) {
             throw new \Exception('Failed to extract list of opend semaphores. Expect a Semaphore status, got '.implode(PHP_EOL, $lines));
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Constraints;
+namespace Symfony\Component\Validator\Tests\Constraints;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Regex;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =`
`54`	`54`	`$instantiation = 'return';`
`55`	`55`
`56`	`56`	`if ($definition->isShared()) {`
`57`		`- $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', $id);`
	`57`	`+ $instantiation .= sprintf(' $this->%s[\'%s\'] =', \method_exists(ContainerBuilder::class, 'addClassResource') \|\| ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', $id);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if (null === $factoryCode) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ interface FlashBagInterface extends SessionBagInterface`
`24`	`24`	`* Adds a flash message for type.`
`25`	`25`	`*`
`26`	`26`	`* @param string $type`
`27`		`- * @param string $message`
	`27`	`+ * @param mixed $message`
`28`	`28`	`*/`
`29`	`29`	`public function add($type, $message);`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testResourceRemoval()`
`46`	`46`
`47`	`47`	`private function getOpenedSemaphores()`
`48`	`48`	`{`
`49`		- $lines = explode(PHP_EOL, trim(`ipcs -su`));
	`49`	+ $lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
`50`	`50`	`if ('------ Semaphore Status --------' !== $lines[0]) {`
`51`	`51`	`throw new \Exception('Failed to extract list of opend semaphores. Expect a Semaphore status, got '.implode(PHP_EOL, $lines));`
`52`	`52`	`}`