Merge remote-tracking branch 'upstream/develop' into 4.3

Conflicts:
	system/CodeIgniter.php
	user_guide_src/source/installation/upgrading.rst

Author: kenjis

.gitattributes

@@ -15,7 +15,6 @@ contributing/ export-ignore
 .nojekyll export-ignore export-ignore
 CODE_OF_CONDUCT.md export-ignore
 CONTRIBUTING.md export-ignore
-Vagrantfile.dist export-ignore
 
 # They don't want our test files
 tests/AutoReview/ export-ignore

Vagrantfile.dist

@@ -21,7 +21,6 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Request;
-use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Router\Exceptions\RedirectException;
@@ -55,7 +54,7 @@ class CodeIgniter
     /**
      * App startup time.
      *
-     * @var mixed
+     * @var float|null
      */
     protected $startTime;
 
@@ -297,10 +296,9 @@ protected function initializeKint()
      * tries to route the response, loads the controller and generally
      * makes all of the pieces work together.
      *
-     * @throws Exception
      * @throws RedirectException
      *
-     * @return bool|mixed|RequestInterface|ResponseInterface|void
+     * @return ResponseInterface|void
      */
     public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
     {
@@ -311,6 +309,8 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
             );
         }
 
+        static::$cacheTTL = 0;
+
         $this->startBenchmark();
 
         $this->getRequestObject();
@@ -323,7 +323,9 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
         if ($this->request instanceof IncomingRequest && strtolower($this->request->getMethod()) === 'cli') {
             $this->response->setStatusCode(405)->setBody('Method Not Allowed');
 
-            return $this->sendResponse();
+            $this->sendResponse();
+
+            return;
         }
 
         Events::trigger('pre_system');
@@ -398,7 +400,7 @@ private function isWeb(): bool
      * @throws PageNotFoundException
      * @throws RedirectException
      *
-     * @return mixed|RequestInterface|ResponseInterface
+     * @return ResponseInterface
      */
     protected function handleRequest(?RouteCollectionInterface $routes, Cache $cacheConfig, bool $returnResponse = false)
     {
@@ -463,6 +465,9 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
 
         $filters->setResponse($this->response);
 
+        // After filter debug toolbar requires 'total_execution'.
+        $this->totalTime = $this->benchmark->getElapsedTime('total_execution');
+
         // Run "after" filters
         $this->benchmark->start('after_filters');
         $response = $filters->run($uri, 'after');
@@ -472,6 +477,17 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
             $this->response = $response;
         }
 
+        // Cache it without the performance metrics replaced
+        // so that we can have live speed updates along the way.
+        // Must be run after filters to preserve the Response headers.
+        if (static::$cacheTTL > 0) {
+            $this->cachePage($cacheConfig);
+        }
+
+        // Update the performance metrics
+        $output = $this->displayPerformanceMetrics($this->response->getBody());
+        $this->response->setBody($output);
+
         // Save our current URI as the previous URI in the session
         // for safer, more accurate use with `previous_url()` helper function.
         $this->storePreviousURL(current_url(true));
@@ -505,7 +521,7 @@ protected function detectEnvironment()
     {
         // Make sure ENVIRONMENT isn't already set by other means.
         if (! defined('ENVIRONMENT')) {
-            define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production');
+            define('ENVIRONMENT', env('CI_ENVIRONMENT', 'production'));
         }
     }
 
@@ -617,7 +633,7 @@ protected function forceSecureAccess($duration = 31_536_000)
      *
      * @throws Exception
      *
-     * @return bool|ResponseInterface
+     * @return false|ResponseInterface
      */
     public function displayCache(Cache $config)
     {
@@ -640,7 +656,8 @@ public function displayCache(Cache $config)
                 $this->response->setHeader($name, $value);
             }
 
-            $output = $this->displayPerformanceMetrics($output);
+            $this->totalTime = $this->benchmark->getElapsedTime('total_execution');
+            $output          = $this->displayPerformanceMetrics($output);
             $this->response->setBody($output);
 
             return $this->response;
@@ -710,8 +727,6 @@ protected function generateCacheName(Cache $config): string
      */
     public function displayPerformanceMetrics(string $output): string
     {
-        $this->totalTime = $this->benchmark->getElapsedTime('total_execution');
-
         return str_replace('{elapsed_time}', (string) $this->totalTime, $output);
     }
 
@@ -921,7 +936,10 @@ protected function display404errors(PageNotFoundException $e)
      * Gathers the script output from the buffer, replaces some execution
      * time tag in the output and displays the debug toolbar, if required.
      *
+     * @param Cache|null                    $cacheConfig Deprecated. No longer used.
      * @param ResponseInterface|string|null $returned
+     *
+     * @deprecated $cacheConfig is deprecated.
      */
     protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
     {
@@ -957,14 +975,6 @@ protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
             $this->output .= $returned;
         }
 
-        // Cache it without the performance metrics replaced
-        // so that we can have live speed updates along the way.
-        if (static::$cacheTTL > 0) {
-            $this->cachePage($cacheConfig);
-        }
-
-        $this->output = $this->displayPerformanceMetrics($this->output);
-
         $this->response->setBody($this->output);
     }
 
@@ -1034,6 +1044,8 @@ public function spoofRequestMethod()
     /**
      * Sends the output of this request back to the client.
      * This is what they've been waiting for!
+     *
+     * @return void
      */
     protected function sendResponse()
     {

system/CodeIgniter.php

@@ -247,6 +247,8 @@ public function setCache(array $options = [])
     /**
      * {@inheritDoc}
      *
+     * @return $this
+     *
      * @todo Do downloads need CSP or Cookies? Compare with ResponseTrait::send()
      */
     public function send()

system/HTTP/DownloadResponse.php

@@ -19,12 +19,6 @@
 /**
  * Class ImageMagickHandler
  *
- * To make this library as compatible as possible with the broadest
- * number of installations, we do not use the Imagick extension,
- * but simply use the command line version.
- *
- * hmm - the width & height accessors at the end use the imagick extension.
- *
  * FIXME - This needs conversion & unit testing, to use the imagick extension
  */
 class ImageMagickHandler extends BaseHandler