Merge branch '3.4' into 4.2

* 3.4:
  Show more accurate message in profiler when missing stopwatch
  CS Fixes: Not double split with one array argument
  Remove redundant animation prefixes
  Remove redundant `box-sizing` prefixes
  Rework firewall access denied rule
  fixed CS
  Fix missing $extraDirs when open_basedir returns

Author: fabpot

Tests/Constraints/ChoiceValidatorTest.php

@@ -54,11 +54,9 @@ public function testNullIsValid()
     {
         $this->validator->validate(
             null,
-            new Choice(
-                [
-                    'choices' => ['foo', 'bar'],
-                ]
-            )
+            new Choice([
+                'choices' => ['foo', 'bar'],
+            ])
         );
 
         $this->assertNoViolation();
@@ -100,13 +98,22 @@ public function testValidChoiceCallbackFunction()
 
     public function testValidChoiceCallbackClosure()
     {
+<<<<<<< HEAD
         $constraint = new Choice(
             [
                 'callback' => function () {
                     return ['foo', 'bar'];
                 },
             ]
         );
+=======
+        $constraint = new Choice([
+            'strict' => true,
+            'callback' => function () {
+                return ['foo', 'bar'];
+            },
+        ]);
+>>>>>>> 3.4
 
         $this->validator->validate('bar', $constraint);