prettified and added max-age=0

flightphp · Jun 29, 2024 · ba80e04 · ba80e04
1 parent f06febd
commit ba80e04
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 29 deletions.
diff --git a/flight/net/Response.php b/flight/net/Response.php
@@ -288,7 +288,7 @@ public function cache($expires): self
     {
         if ($expires === false) {
             $this->headers['Expires'] = 'Mon, 26 Jul 1997 05:00:00 GMT';
-            $this->headers['Cache-Control'] = 'no-store, no-cache, must-revalidate';
+            $this->headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, max-age=0';
             $this->headers['Pragma'] = 'no-cache';
         } else {
             $expires = \is_int($expires) ? $expires : strtotime($expires);
@@ -432,11 +432,10 @@ public function send(): void
         }
 
         if ($this->headersSent() === false) {
-
-			// If you haven't set a Cache-Control header, we'll assume you don't want caching
-			if($this->getHeader('Cache-Control') === null) {
-				$this->cache(false);
-			}
+            // If you haven't set a Cache-Control header, we'll assume you don't want caching
+            if ($this->getHeader('Cache-Control') === null) {
+                $this->cache(false);
+            }
 
             $this->sendHeaders();
         }
@@ -446,16 +445,16 @@ public function send(): void
         $this->sent = true;
     }
 
-	/**
-	 * Headers have been sent
-	 * 
-	 * @return bool
-	 * @codeCoverageIgnore
-	 */
-	public function headersSent(): bool
-	{
-		return headers_sent();
-	}
+    /**
+     * Headers have been sent
+     *
+     * @return bool
+     * @codeCoverageIgnore
+     */
+    public function headersSent(): bool
+    {
+        return headers_sent();
+    }
 
     /**
      * Adds a callback to process the response body before it's sent. These are processed in the order

diff --git a/tests/FlightTest.php b/tests/FlightTest.php
@@ -361,8 +361,7 @@ public function testDoesNotPreserveVarsWhenFlagIsDisabled(
         string $output,
         array $renderParams,
         string $regexp
-    ): void
-    {
+    ): void {
         Flight::view()->preserveVars = false;
 
         $this->expectOutputString($output);

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -164,7 +164,7 @@ public function testCacheFalseExpiresValue()
         $response->cache(false);
         $this->assertEquals([
             'Expires' => 'Mon, 26 Jul 1997 05:00:00 GMT',
-            'Cache-Control' => 'no-store, no-cache, must-revalidate',
+            'Cache-Control' => 'no-store, no-cache, must-revalidate, max-age=0',
             'Pragma' => 'no-cache'
         ], $response->headers());
     }
@@ -235,8 +235,8 @@ public function setRealHeader(string $header_string, bool $replace = true, int $
         $this->assertTrue($response->sent());
     }
 
-	public function testSendWithNoHeadersSent()
-	{
+    public function testSendWithNoHeadersSent()
+    {
         $response = new class extends Response {
             protected $test_sent_headers = [];
 
@@ -251,26 +251,26 @@ public function getSentHeaders(): array
                 return $this->test_sent_headers;
             }
 
-			public function headersSent(): bool
-			{
-				return false;
-			}
+            public function headersSent(): bool
+            {
+                return false;
+            }
         };
         $response->header('Content-Type', 'text/html');
         $response->header('X-Test', 'test');
         $response->write('Something');
 
-		$this->expectOutputString('Something');
+        $this->expectOutputString('Something');
 
         $response->send();
         $sent_headers = $response->getSentHeaders();
         $this->assertEquals([
             'HTTP/1.1 200 OK',
             'Content-Type: text/html',
             'X-Test: test',
-			'Expires: Mon, 26 Jul 1997 05:00:00 GMT',
-            'Cache-Control: no-store, no-cache, must-revalidate',
-			'Pragma: no-cache',
+            'Expires: Mon, 26 Jul 1997 05:00:00 GMT',
+            'Cache-Control: no-store, no-cache, must-revalidate, max-age=0',
+            'Pragma: no-cache',
             'Content-Length: 9'
         ], $sent_headers);
     }