Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 05eb388c264d · 2019-06-06T12:03:46.000+02:00
* 3.4:
  Add a missing quote in getValue() DocBlock
  [HttpFoundation] Fixed case-sensitive handling of cache-control header in RedirectResponse constructor.
  minor: ChoiceType callable deprecation after/before seems wrong
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -297,19 +297,17 @@ Form
    `ArrayAccess` in `ResizeFormListener::preSubmit` method has been removed.
 
  * Using callable strings as choice options in ChoiceType is not supported
-   anymore in favor of passing PropertyPath instances.
+   anymore.
 
    Before:
 
    ```php
-   'choice_value' => new PropertyPath('range'),
    'choice_label' => 'strtoupper',
    ```
 
    After:
 
    ```php
-   'choice_value' => 'range',
    'choice_label' => function ($choice) {
        return strtoupper($choice);
    },
diff --git a/src/Symfony/Component/HttpFoundation/RedirectResponse.php b/src/Symfony/Component/HttpFoundation/RedirectResponse.php
@@ -42,7 +42,7 @@ public function __construct(?string $url, int $status = 302, array $headers = []
             throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
         }
 
-        if (301 == $status && !\array_key_exists('cache-control', $headers)) {
+        if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {
             $this->headers->remove('cache-control');
         }
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php
@@ -91,6 +91,10 @@ public function testCacheHeaders()
         $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
         $this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
 
+        $response = new RedirectResponse('foo.bar', 301, ['Cache-Control' => 'max-age=86400']);
+        $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
+
         $response = new RedirectResponse('foo.bar', 302);
         $this->assertTrue($response->headers->hasCacheControlDirective('no-cache'));
     }
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
@@ -58,7 +58,7 @@ public function setValue(&$objectOrArray, $propertyPath, $value);
      *
      *     $propertyAccessor = PropertyAccess::createPropertyAccessor();
      *
-     *     echo $propertyAccessor->getValue($object, 'child.name);
+     *     echo $propertyAccessor->getValue($object, 'child.name');
      *     // equals echo $object->getChild()->getName();
      *
      * This method first tries to find a public getter for each property in the

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct(?string $url, int $status = 302, array $headers = []`
`42`	`42`	`throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));`
`43`	`43`	`}`
`44`	`44`
`45`		`- if (301 == $status && !\array_key_exists('cache-control', $headers)) {`
	`45`	`+ if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {`
`46`	`46`	`$this->headers->remove('cache-control');`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function setValue(&$objectOrArray, $propertyPath, $value);`
`58`	`58`	`*`
`59`	`59`	`* $propertyAccessor = PropertyAccess::createPropertyAccessor();`
`60`	`60`	`*`
`61`		`- * echo $propertyAccessor->getValue($object, 'child.name);`
	`61`	`+ * echo $propertyAccessor->getValue($object, 'child.name');`
`62`	`62`	`* // equals echo $object->getChild()->getName();`
`63`	`63`	`*`
`64`	`64`	`* This method first tries to find a public getter for each property in the`