From 2c9b02ec28db4cca70f571fa8014e8285199c91e Mon Sep 17 00:00:00 2001
From: n0nag0n <n0nag0n@sky-9.com>
Date: Thu, 20 Feb 2025 19:12:25 -0700
Subject: [PATCH] removed cache breaking behavior

---
 flight/Engine.php                   |  4 ++--
 flight/net/Request.php              |  4 ++--
 flight/net/Response.php             |  5 -----
 tests/RequestTest.php               | 18 +++++++++---------
 tests/ResponseTest.php              |  3 ---
 tests/commands/RouteCommandTest.php |  8 ++++----
 6 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/flight/Engine.php b/flight/Engine.php
index aa4e202..ac4d1b4 100644
--- a/flight/Engine.php
+++ b/flight/Engine.php
@@ -842,8 +842,8 @@ class Engine
         ?string $charset = 'utf-8',
         int $option = 0
     ): void {
-		// add some default flags
-		$option |= JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR;
+        // add some default flags
+        $option |= JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR;
         $json = $encode ? json_encode($data, $option) : $data;
 
         $this->response()
diff --git a/flight/net/Request.php b/flight/net/Request.php
index f88c770..5164b11 100644
--- a/flight/net/Request.php
+++ b/flight/net/Request.php
@@ -211,8 +211,8 @@ class Request
                     $this->data->setData($data);
                 }
             }
-		// Check PUT, PATCH, DELETE for application/x-www-form-urlencoded data
-        } else if (in_array($this->method, [ 'PUT', 'DELETE', 'PATCH' ], true) === true) {
+        // Check PUT, PATCH, DELETE for application/x-www-form-urlencoded data
+        } elseif (in_array($this->method, [ 'PUT', 'DELETE', 'PATCH' ], true) === true) {
             $body = $this->getBody();
             if ($body !== '') {
                 $data = [];
diff --git a/flight/net/Response.php b/flight/net/Response.php
index 264174e..9e4d58b 100644
--- a/flight/net/Response.php
+++ b/flight/net/Response.php
@@ -432,11 +432,6 @@ class Response
         }
 
         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);
-            }
-
             $this->sendHeaders();
         }
 
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index 03acd5a..4044d06 100644
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -163,7 +163,7 @@ class RequestTest extends TestCase
             'base' => '/vagrant/public',
             'query' => new Collection(),
             'type' => '',
-			'method' => 'GET'
+            'method' => 'GET'
         ]);
         $this->assertEquals('/flightphp', $request->url);
     }
@@ -174,7 +174,7 @@ class RequestTest extends TestCase
             'url' => '',
             'base' => '/vagrant/public',
             'type' => '',
-			'method' => 'GET'
+            'method' => 'GET'
         ]);
         $this->assertEquals('/', $request->url);
     }
@@ -193,13 +193,13 @@ class RequestTest extends TestCase
             'data' => new Collection(),
             'query' => new Collection(),
             'stream_path' => $stream_path,
-			'method' => 'POST'
+            'method' => 'POST'
         ]);
         $this->assertEquals([ 'foo' => 'bar' ], $request->data->getData());
         $this->assertEquals('{"foo":"bar"}', $request->getBody());
     }
 
-	public function testInitWithFormBody()
+    public function testInitWithFormBody()
     {
         // create dummy file to pull request body from
         $tmpfile = tmpfile();
@@ -213,12 +213,12 @@ class RequestTest extends TestCase
             'data' => new Collection(),
             'query' => new Collection(),
             'stream_path' => $stream_path,
-			'method' => 'PATCH'
+            'method' => 'PATCH'
         ]);
-        $this->assertEquals([ 
-			'foo' => 'bar', 
-			'baz' => 'qux' 
-		], $request->data->getData());
+        $this->assertEquals([
+            'foo' => 'bar',
+            'baz' => 'qux'
+        ], $request->data->getData());
         $this->assertEquals('foo=bar&baz=qux', $request->getBody());
     }
 
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
index fade322..3f21780 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.php
@@ -268,9 +268,6 @@ class ResponseTest extends TestCase
             '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, max-age=0',
-            'Pragma: no-cache',
             'Content-Length: 9'
         ], $sent_headers);
     }
diff --git a/tests/commands/RouteCommandTest.php b/tests/commands/RouteCommandTest.php
index aa3fff3..226d9a3 100644
--- a/tests/commands/RouteCommandTest.php
+++ b/tests/commands/RouteCommandTest.php
@@ -81,10 +81,10 @@ PHP;
 
     protected function removeColors(string $str): string
     {
-		// replace \n with \r\n if windows
-		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-			$str = str_replace("\r\n", "\n", $str);
-		}
+        // replace \n with \r\n if windows
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $str = str_replace("\r\n", "\n", $str);
+        }
         return preg_replace('/\e\[[\d;]*m/', '', $str);
     }