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

Conflicts:
	phpstan-baseline.neon.dist

Author: kenjis

phpstan-baseline.neon.dist

@@ -35,16 +35,6 @@ parameters:
 			count: 1
 			path: system/Cache/Handlers/FileHandler.php
 
-		-
-			message: "#^Method MemcachePool\\:\\:decrement\\(\\) invoked with 4 parameters, 1\\-2 required\\.$#"
-			count: 1
-			path: system/Cache/Handlers/MemcachedHandler.php
-
-		-
-			message: "#^Method MemcachePool\\:\\:increment\\(\\) invoked with 4 parameters, 1\\-2 required\\.$#"
-			count: 1
-			path: system/Cache/Handlers/MemcachedHandler.php
-
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1
@@ -470,11 +460,6 @@ parameters:
 			count: 1
 			path: system/HTTP/Request.php
 
-		-
-			message: "#^Cannot unset offset 'path' on array{host: non-empty-string}\\.$#"
-			count: 1
-			path: system/HTTP/URI.php
-
 		-
 			message: "#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$fragment \\(string\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
@@ -505,11 +490,6 @@ parameters:
 			count: 1
 			path: system/Helpers/number_helper.php
 
-		-
-			message: "#^Variable \\$pool might not be defined\\.$#"
-			count: 2
-			path: system/Helpers/text_helper.php
-
 		-
 			message: "#^Variable \\$count might not be defined\\.$#"
 			count: 1

system/Model.php

@@ -681,7 +681,7 @@ public function insert($data = null, bool $returnID = true)
     {
         if (! empty($this->tempData['data'])) {
             if (empty($data)) {
-                $data = $this->tempData['data'] ?? null;
+                $data = $this->tempData['data'];
             } else {
                 $data = $this->transformDataToArray($data, 'insert');
                 $data = array_merge($this->tempData['data'], $data);
@@ -707,7 +707,7 @@ public function update($id = null, $data = null): bool
     {
         if (! empty($this->tempData['data'])) {
             if (empty($data)) {
-                $data = $this->tempData['data'] ?? null;
+                $data = $this->tempData['data'];
             } else {
                 $data = $this->transformDataToArray($data, 'update');
                 $data = array_merge($this->tempData['data'], $data);