Merge branch 'develop' into 4.3

Author: MGatner

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [v4.2.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.4) (2022-08-13)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.3...v4.2.4)
+
+**Hotfix release to fix download errors (see https://github.com/codeigniter4/CodeIgniter4/pull/6361)**
+
 ## [v4.2.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.3) (2022-08-06)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.2...v4.2.3)
 

system/CodeIgniter.php

@@ -47,7 +47,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.2.3';
+    public const CI_VERSION = '4.2.4';
 
     /**
      * App startup time.
@@ -465,20 +465,26 @@ 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);
-        }
+        // Skip unnecessary processing for special Responses.
+        if (! $response instanceof DownloadResponse && ! $response instanceof RedirectResponse) {
+            // 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);
+            // Update the performance metrics
+            $body = $this->response->getBody();
+            if ($body !== null) {
+                $output = $this->displayPerformanceMetrics($body);
+                $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));
+            // 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));
+        }
 
         unset($uri);
 

user_guide_src/source/changelogs/index.rst

@@ -13,6 +13,7 @@ See all the changes.
     :titlesonly:
 
     v4.3.0
+    v4.2.5
     v4.2.4
     v4.2.3
     v4.2.2

user_guide_src/source/changelogs/v4.2.4.rst

@@ -1,35 +1,12 @@
 Version 4.2.4
 #############
 
-Release Date: Unreleased
+Release Date: August 13, 2022
 
 **4.2.4 release of CodeIgniter4**
 
 .. contents::
     :local:
     :depth: 2
 
-BREAKING
-********
-
-none.
-
-Enhancements
-************
-
-none.
-
-Changes
-*******
-
-none.
-
-Deprecations
-************
-
-none.
-
-Bugs Fixed
-**********
-
-See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.
+**Hotfix release to fix download errors; no other content changes.**

user_guide_src/source/changelogs/v4.2.5.rst

@@ -0,0 +1,35 @@
+Version 4.2.5
+#############
+
+Release Date: Unreleased
+
+**4.2.5 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+BREAKING
+********
+
+none.
+
+Enhancements
+************
+
+none.
+
+Changes
+*******
+
+none.
+
+Deprecations
+************
+
+none.
+
+Bugs Fixed
+**********
+
+See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.

user_guide_src/source/conf.py

@@ -24,7 +24,7 @@
 version = '4.2'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.2.3'
+release = '4.2.4'
 
 # -- General configuration ---------------------------------------------------
 

user_guide_src/source/database/query_builder.rst

@@ -1046,7 +1046,9 @@ run the query:
 Class Reference
 ***************
 
-.. php:class:: CodeIgniter\\Database\\BaseBuilder
+.. php:namespace:: CodeIgniter\Database
+
+.. php:class:: BaseBuilder
 
     .. php:method:: db()
 

user_guide_src/source/incoming/controllers.rst

@@ -13,11 +13,27 @@ What is a Controller?
 
 A Controller is simply a class file that handles a HTTP request. :doc:`URI Routing <routing>` associates a URI with a controller.
 
+Every controller you create should extend ``BaseController`` class.
+This class provides several features that are available to all of your controllers.
+
+Constructor
+***********
+
+The CodeIgniter's Controller has a special constructor ``initController()``.
+It will be called by the framework after PHP's constructor ``__construct()`` execution.
+
+If you want to override the ``initController()``, don't forget to add ``parent::initController($request, $response, $logger);`` in the method:
+
+.. literalinclude:: controllers/023.php
+
+.. important:: You cannot use ``return`` in the constructor. So ``return redirect()->to('route');`` does not work.
+
+The ``initController()`` method sets the following three properties.
+
 Included Properties
 *******************
 
-Every controller you create should extend ``CodeIgniter\Controller`` class.
-This class provides several features that are available to all of your controllers.
+The CodeIgniter's Controller provides these properties.
 
 **Request Object**
 
@@ -95,19 +111,22 @@ The method accepts an array of data to validate in the first parameter:
 
 .. literalinclude:: controllers/006.php
 
-Private methods
-***************
+Protecting Methods
+******************
 
 In some cases, you may want certain methods hidden from public access.
 To achieve this, simply declare the method as ``private`` or ``protected``.
-That will prevent it from being served by a URL request. For example,
-if you were to define a method like this for the ``Helloworld`` controller:
+That will prevent it from being served by a URL request.
+
+For example, if you were to define a method like this for the ``Helloworld`` controller:
 
 .. literalinclude:: controllers/007.php
 
-then trying to access it using the following URL will not work::
+and to define a route (``helloworld/utitilty``) for the method. Then trying to access it using the following URL will not work::
+
+    example.com/index.php/helloworld/utility
 
-    example.com/index.php/helloworld/utility/
+Auto-routing also will not work.
 
 .. _controller-auto-routing-improved:
 

user_guide_src/source/incoming/controllers/023.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
+
+class Product extends BaseController
+{
+    public function initController(
+        RequestInterface $request,
+        ResponseInterface $response,
+        LoggerInterface $logger
+    ) {
+        parent::initController($request, $response, $logger);
+
+        // Add your code here.
+    }
+
+    // ...
+}

user_guide_src/source/incoming/incomingrequest.rst

@@ -250,7 +250,9 @@ The methods provided by the parent classes that are available are:
 * :meth:`CodeIgniter\\HTTP\\Message::getProtocolVersion`
 * :meth:`CodeIgniter\\HTTP\\Message::setProtocolVersion`
 
-.. php:class:: CodeIgniter\\HTTP\\IncomingRequest
+.. php:namespace:: CodeIgniter\HTTP
+
+.. php:class:: IncomingRequest
 
     .. php:method:: isCLI()