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

kenjis · kenjis · commit 60f1e8eae876 · 2022-11-09T08:21:49.000+09:00
Conflicts:
	composer.json
diff --git a/README.md b/README.md
@@ -12,13 +12,13 @@
 ## What is CodeIgniter?
 
 CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and secure.
-More information can be found at the [official site](http://codeigniter.com).
+More information can be found at the [official site](https://codeigniter.com).
 
 This repository holds the source code for CodeIgniter 4 only.
 Version 4 is a complete rewrite to bring the quality and the code into a more modern version,
 while still keeping as many of the things intact that has made people love the framework over the years.
 
-More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
+More information about the plans for version 4 can be found in [CodeIgniter 4](https://forum.codeigniter.com/forumdisplay.php?fid=28) on the forums.
 
 ### Documentation
 
@@ -69,12 +69,12 @@ to optional packages, with their own repository.
 
 ## Contributing
 
-We **are** accepting contributions from the community! It doesn't matter whether you can code, write documentation, or help find bugs, 
-all contributions are welcome. 
+We **are** accepting contributions from the community! It doesn't matter whether you can code, write documentation, or help find bugs,
+all contributions are welcome.
 
 Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/README.md).
 
-CodeIgniter has had thousands on contributions from people since its creation. This project would not be what it is without them. 
+CodeIgniter has had thousands on contributions from people since its creation. This project would not be what it is without them.
 
 <a href="https://github.com/codeigniter4/CodeIgniter4/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=codeigniter4/CodeIgniter4" />
@@ -86,7 +86,6 @@ Made with [contrib.rocks](https://contrib.rocks).
 
 PHP version 7.4 or higher is required, with the following extensions installed:
 
-
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
 - [mbstring](http://php.net/manual/en/mbstring.installation.php)
@@ -95,7 +94,7 @@ Additionally, make sure that the following extensions are enabled in your PHP:
 
 - json (enabled by default - don't turn it off)
 - xml (enabled by default - don't turn it off)
-- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php)
+- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php) if you plan to use MySQL
 
 ## Running CodeIgniter Tests
 
diff --git a/admin/framework/README.md b/admin/framework/README.md
@@ -3,18 +3,17 @@
 ## What is CodeIgniter?
 
 CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and secure.
-More information can be found at the [official site](http://codeigniter.com).
+More information can be found at the [official site](https://codeigniter.com).
 
-This repository holds the distributable version of the framework,
-including the user guide. It has been built from the
+This repository holds the distributable version of the framework.
+It has been built from the
 [development repository](https://github.com/codeigniter4/CodeIgniter4).
 
-More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
+More information about the plans for version 4 can be found in [CodeIgniter 4](https://forum.codeigniter.com/forumdisplay.php?fid=28) on the forums.
 
-The user guide corresponding to this version of the framework can be found
+The user guide corresponding to the latest version of the framework can be found
 [here](https://codeigniter4.github.io/userguide/).
 
-
 ## Important Change with index.php
 
 `index.php` is no longer in the root of the project! It has been moved inside the *public* folder,
@@ -47,10 +46,10 @@ PHP version 7.4 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
+- [mbstring](http://php.net/manual/en/mbstring.installation.php)
 
 Additionally, make sure that the following extensions are enabled in your PHP:
 
 - json (enabled by default - don't turn it off)
-- [mbstring](http://php.net/manual/en/mbstring.installation.php)
-- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php)
 - xml (enabled by default - don't turn it off)
+- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php) if you plan to use MySQL
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -57,7 +57,7 @@
         "test": "phpunit"
     },
     "support": {
-        "forum": "http://forum.codeigniter.com/",
+        "forum": "https://forum.codeigniter.com/",
         "source": "https://github.com/codeigniter4/CodeIgniter4",
         "slack": "https://codeigniterchat.slack.com"
     }
diff --git a/admin/starter/README.md b/admin/starter/README.md
@@ -3,15 +3,15 @@
 ## What is CodeIgniter?
 
 CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and secure.
-More information can be found at the [official site](http://codeigniter.com).
+More information can be found at the [official site](https://codeigniter.com).
 
 This repository holds a composer-installable app starter.
 It has been built from the
 [development repository](https://github.com/codeigniter4/CodeIgniter4).
 
-More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
+More information about the plans for version 4 can be found in [CodeIgniter 4](https://forum.codeigniter.com/forumdisplay.php?fid=28) on the forums.
 
-The user guide corresponding to this version of the framework can be found
+The user guide corresponding to the latest version of the framework can be found
 [here](https://codeigniter4.github.io/userguide/).
 
 ## Installation & updates
@@ -54,10 +54,10 @@ PHP version 7.4 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
+- [mbstring](http://php.net/manual/en/mbstring.installation.php)
 
 Additionally, make sure that the following extensions are enabled in your PHP:
 
 - json (enabled by default - don't turn it off)
-- [mbstring](http://php.net/manual/en/mbstring.installation.php)
-- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php)
 - xml (enabled by default - don't turn it off)
+- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php) if you plan to use MySQL
diff --git a/admin/starter/composer.json b/admin/starter/composer.json
@@ -30,7 +30,7 @@
         "test": "phpunit"
     },
     "support": {
-        "forum": "http://forum.codeigniter.com/",
+        "forum": "https://forum.codeigniter.com/",
         "source": "https://github.com/codeigniter4/CodeIgniter4",
         "slack": "https://codeigniterchat.slack.com"
     }
diff --git a/admin/userguide/composer.json b/admin/userguide/composer.json
@@ -9,7 +9,7 @@
         "codeigniter4/framework": "^4"
     },
     "support": {
-        "forum": "http://forum.codeigniter.com/",
+        "forum": "https://forum.codeigniter.com/",
         "source": "https://github.com/codeigniter4/CodeIgniter4",
         "slack": "https://codeigniterchat.slack.com"
     }
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.14.6",
+        "rector/rector": "0.14.7",
         "vimeo/psalm": "^4.26"
     },
     "suggest": {
@@ -103,7 +103,7 @@
         "cs-fix": "Fix the coding style"
     },
     "support": {
-        "forum": "http://forum.codeigniter.com/",
+        "forum": "https://forum.codeigniter.com/",
         "source": "https://github.com/codeigniter4/CodeIgniter4",
         "slack": "https://codeigniterchat.slack.com"
     }
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
@@ -349,11 +349,9 @@ protected function interpolate($message, array $context = [])
         if (strpos($message, 'env:') !== false) {
             preg_match('/env:[^}]+/', $message, $matches);
 
-            if ($matches) {
-                foreach ($matches as $str) {
-                    $key                 = str_replace('env:', '', $str);
-                    $replace["{{$str}}"] = $_ENV[$key] ?? 'n/a';
-                }
+            foreach ($matches as $str) {
+                $key                 = str_replace('env:', '', $str);
+                $replace["{{$str}}"] = $_ENV[$key] ?? 'n/a';
             }
         }
 
diff --git a/system/Model.php b/system/Model.php
@@ -118,6 +118,13 @@ class Model extends BaseModel
      */
     protected $escape = [];
 
+    /**
+     * Primary Key value when inserting and useAutoIncrement is false.
+     *
+     * @var int|string|null
+     */
+    private $tempPrimaryKeyValue;
+
     /**
      * Builder method names that should not be used in the Model.
      *
@@ -263,6 +270,13 @@ protected function doInsert(array $data)
         $escape       = $this->escape;
         $this->escape = [];
 
+        // If $useAutoIncrement is false, add the primary key data.
+        if ($this->useAutoIncrement === false && $this->tempPrimaryKeyValue !== null) {
+            $data[$this->primaryKey] = $this->tempPrimaryKeyValue;
+
+            $this->tempPrimaryKeyValue = null;
+        }
+
         // Require non-empty primaryKey when
         // not using auto-increment feature
         if (! $this->useAutoIncrement && empty($data[$this->primaryKey])) {
@@ -688,6 +702,10 @@ public function insert($data = null, bool $returnID = true)
             }
         }
 
+        if ($this->useAutoIncrement === false && isset($data[$this->primaryKey])) {
+            $this->tempPrimaryKeyValue = $data[$this->primaryKey];
+        }
+
         $this->escape   = $this->tempData['escape'] ?? [];
         $this->tempData = [];
 
@@ -737,8 +755,13 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
 
         // Always grab the primary key otherwise updates will fail.
         if (
-            method_exists($data, 'toRawArray') && (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
-            && ! empty($data->{$this->primaryKey}))
+            method_exists($data, 'toRawArray')
+            && (
+                ! empty($properties)
+                && ! empty($this->primaryKey)
+                && ! in_array($this->primaryKey, $properties, true)
+                && ! empty($data->{$this->primaryKey})
+            )
         ) {
             $properties[$this->primaryKey] = $data->{$this->primaryKey};
         }
diff --git a/tests/_support/Models/WithoutAutoIncrementModel.php b/tests/_support/Models/WithoutAutoIncrementModel.php
@@ -18,7 +18,6 @@ class WithoutAutoIncrementModel extends Model
     protected $table         = 'without_auto_increment';
     protected $primaryKey    = 'key';
     protected $allowedFields = [
-        'key',
         'value',
     ];
     protected $useAutoIncrement = false;

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`"test": "phpunit"`
`58`	`58`	`},`
`59`	`59`	`"support": {`
`60`		`- "forum": "http://forum.codeigniter.com/",`
	`60`	`+ "forum": "https://forum.codeigniter.com/",`
`61`	`61`	`"source": "https://github.com/codeigniter4/CodeIgniter4",`
`62`	`62`	`"slack": "https://codeigniterchat.slack.com"`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"test": "phpunit"`
`31`	`31`	`},`
`32`	`32`	`"support": {`
`33`		`- "forum": "http://forum.codeigniter.com/",`
	`33`	`+ "forum": "https://forum.codeigniter.com/",`
`34`	`34`	`"source": "https://github.com/codeigniter4/CodeIgniter4",`
`35`	`35`	`"slack": "https://codeigniterchat.slack.com"`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"codeigniter4/framework": "^4"`
`10`	`10`	`},`
`11`	`11`	`"support": {`
`12`		`- "forum": "http://forum.codeigniter.com/",`
	`12`	`+ "forum": "https://forum.codeigniter.com/",`
`13`	`13`	`"source": "https://github.com/codeigniter4/CodeIgniter4",`
`14`	`14`	`"slack": "https://codeigniterchat.slack.com"`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -349,11 +349,9 @@ protected function interpolate($message, array $context = [])`
`349`	`349`	`if (strpos($message, 'env:') !== false) {`
`350`	`350`	`preg_match('/env:[^}]+/', $message, $matches);`
`351`	`351`
`352`		`- if ($matches) {`
`353`		`- foreach ($matches as $str) {`
`354`		`- $key = str_replace('env:', '', $str);`
`355`		`- $replace["{{$str}}"] = $_ENV[$key] ?? 'n/a';`
`356`		`- }`
	`352`	`+ foreach ($matches as $str) {`
	`353`	`+ $key = str_replace('env:', '', $str);`
	`354`	`+ $replace["{{$str}}"] = $_ENV[$key] ?? 'n/a';`
`357`	`355`	`}`
`358`	`356`	`}`
`359`	`357`