Merge branch 'codeigniter4:develop' into develop

Author: baycik

admin/RELEASE.md

@@ -2,9 +2,17 @@
 
 > Documentation guide based on the releases of `4.0.5` and `4.1.0` on January 31, 2021.
 >
-> Updated for `4.2.10` on November 5, 2022.
+> Updated for `4.3.0` on January 10, 2023.
 >
-> -MGatner
+> -MGatner, kenjis
+
+## [Minor version only] Merge minor version branch into develop
+
+If you release a new minor version.
+
+* Create PR to merge `4.x` into `develop` and merge it
+* Delete the merged `4.x` branch (This closes all PRs to the branch)
+* Do the regular release process. Go to the next "Changelog" section
 
 ## Changelog
 
@@ -17,7 +25,20 @@ When generating the changelog each Pull Request to be included must have one of
 PRs with breaking changes must have the following additional label:
 - **breaking change** ... PRs that may break existing functionalities
 
-To auto-generate, start drafting a new Release and use the "Generate release notes" button.
+### Generate Changelog
+
+To auto-generate, navigate to the [Releases](https://github.com/codeigniter4/CodeIgniter4/releases) page,
+click the "Draft a new release" button.
+
+* Tag: "v4.x.x" (Create new tag)
+* Target: develop
+
+Click the "Generate release notes" button.
+
+Check the resulting content. If there are items in the *Others* section which
+should be included in the changelog, add a label to the PR and regenerate
+the changelog.
+
 Copy the resulting content into **CHANGELOG.md** and adjust the format to match the existing content.
 
 ## Preparation
@@ -92,6 +113,13 @@ git merge origin/4.x
 git merge origin/develop
 git push origin HEAD
 ```
+* [Minor version only] Create the next minor upgrade branch `4.x`:
+```console
+git fetch origin
+git switch develop
+git switch -c 4.x
+git push origin HEAD
+```
 * Publish any Security Advisories that were resolved from private forks
 * Announce the release on the forums and Slack channel (note: this forum is restricted to administrators):
     * Make a new topic in the "News & Discussion" forums: https://forum.codeigniter.com/forum-2.html

admin/next-changelog-minor.rst

@@ -71,4 +71,6 @@ Deprecations
 Bugs Fixed
 **********
 
-See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.
+See the repo's
+`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
+for a complete list of bugs fixed.

admin/next-changelog-patch.rst

@@ -12,9 +12,6 @@ Release Date: Unreleased
 BREAKING
 ********
 
-Enhancements
-************
-
 Message Changes
 ***************
 
@@ -27,4 +24,6 @@ Deprecations
 Bugs Fixed
 **********
 
-See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.
+See the repo's
+`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
+for a complete list of bugs fixed.

app/Config/Email.php

@@ -6,9 +6,9 @@
 
 class Email extends BaseConfig
 {
-    public string $fromEmail;
-    public string $fromName;
-    public string $recipients;
+    public string $fromEmail  = '';
+    public string $fromName   = '';
+    public string $recipients = '';
 
     /**
      * The "user agent"
@@ -28,17 +28,17 @@ class Email extends BaseConfig
     /**
      * SMTP Server Address
      */
-    public string $SMTPHost;
+    public string $SMTPHost = '';
 
     /**
      * SMTP Username
      */
-    public string $SMTPUser;
+    public string $SMTPUser = '';
 
     /**
      * SMTP Password
      */
-    public string $SMTPPass;
+    public string $SMTPPass = '';
 
     /**
      * SMTP Port

composer.json

@@ -25,7 +25,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.15.3",
+        "rector/rector": "0.15.4",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

phpstan-baseline.neon.dist

@@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: system/Cache/Handlers/MemcachedHandler.php
 
-		-
-			message: "#^Variable \\$data might not be defined\\.$#"
-			count: 1
-			path: system/Cache/Handlers/MemcachedHandler.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:\\$redis \\(Redis\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
@@ -200,11 +195,6 @@ parameters:
 			count: 1
 			path: system/Helpers/number_helper.php
 
-		-
-			message: "#^Variable \\$count might not be defined\\.$#"
-			count: 1
-			path: system/Helpers/url_helper.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$image \\(CodeIgniter\\\\Images\\\\Image\\) in empty\\(\\) is not falsy\\.$#"
 			count: 1
@@ -230,21 +220,6 @@ parameters:
 			count: 4
 			path: system/Images/Handlers/ImageMagickHandler.php
 
-		-
-			message: "#^Variable \\$gravity might not be defined\\.$#"
-			count: 1
-			path: system/Images/Handlers/ImageMagickHandler.php
-
-		-
-			message: "#^Variable \\$xAxis might not be defined\\.$#"
-			count: 1
-			path: system/Images/Handlers/ImageMagickHandler.php
-
-		-
-			message: "#^Variable \\$yAxis might not be defined\\.$#"
-			count: 1
-			path: system/Images/Handlers/ImageMagickHandler.php
-
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#"
 			count: 3

rector.php

@@ -36,7 +36,6 @@
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
-use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
@@ -106,9 +105,6 @@
         // sometime too detail
         CountOnNullRector::class,
 
-        // may not be unitialized on purpose
-        AddDefaultValueForUndefinedVariableRector::class,
-
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
 

system/Cache/Handlers/MemcachedHandler.php

@@ -124,7 +124,8 @@ public function initialize()
      */
     public function get(string $key)
     {
-        $key = static::validateKey($key, $this->prefix);
+        $data = [];
+        $key  = static::validateKey($key, $this->prefix);
 
         if ($this->memcached instanceof Memcached) {
             $data = $this->memcached->get($key);

system/Commands/Generators/MigrationGenerator.php

@@ -97,6 +97,7 @@ public function run(array $params)
      */
     protected function prepare(string $class): string
     {
+        $data            = [];
         $data['session'] = false;
 
         if ($this->getOption('session')) {

system/Commands/Generators/SessionMigrationGenerator.php

@@ -89,6 +89,7 @@ public function run(array $params)
      */
     protected function prepare(string $class): string
     {
+        $data            = [];
         $data['session'] = true;
         $data['table']   = $this->getOption('t');
         $data['DBGroup'] = $this->getOption('g');