minor #36379 Fix constant accessor (driesvints)

fabpot · fabpot · commit aa44db0da095 · 2020-04-08T07:57:28.000+02:00
This PR was squashed before being merged into the 5.1-dev branch. Discussion ---------- Fix constant accessor | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...  Because HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES is private, using static will fail for any classes extending the Response class. HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES is already properly using self a bit lower so we should do the same thing here. Introduced in #35748 Commits ------- 633ff5b Fix constant accessor
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -949,7 +949,7 @@ public function setEtag(string $etag = null, bool $weak = false): object
      */
     public function setCache(array $options): object
     {
-        if ($diff = array_diff(array_keys($options), array_keys(static::HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES))) {
+        if ($diff = array_diff(array_keys($options), array_keys(self::HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES))) {
             throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -672,6 +672,12 @@ public function testSetCache()
 
             $this->assertFalse($response->headers->hasCacheControlDirective(str_replace('_', '-', $directive)));
         }
+
+        $response = new DefaultResponse();
+
+        $options = ['etag' => '"whatever"'];
+        $response->setCache($options);
+        $this->assertSame($response->getEtag(), '"whatever"');
     }
 
     public function testSendContent()

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ public function setEtag(string $etag = null, bool $weak = false): object`
`949`	`949`	`*/`
`950`	`950`	`public function setCache(array $options): object`
`951`	`951`	`{`
`952`		`- if ($diff = array_diff(array_keys($options), array_keys(static::HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES))) {`
	`952`	`+ if ($diff = array_diff(array_keys($options), array_keys(self::HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES))) {`
`953`	`953`	`throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));`
`954`	`954`	`}`
`955`	`955`
Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,12 @@ public function testSetCache()`
`672`	`672`
`673`	`673`	`$this->assertFalse($response->headers->hasCacheControlDirective(str_replace('_', '-', $directive)));`
`674`	`674`	`}`
	`675`	`+`
	`676`	`+ $response = new DefaultResponse();`
	`677`	`+`
	`678`	`+ $options = ['etag' => '"whatever"'];`
	`679`	`+ $response->setCache($options);`
	`680`	`+ $this->assertSame($response->getEtag(), '"whatever"');`
`675`	`681`	`}`
`676`	`682`
`677`	`683`	`public function testSendContent()`