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

# Conflicts:
#	tests/system/Database/BaseConnectionTest.php

Author: michalsn

system/Database/BaseConnection.php

@@ -1524,7 +1524,7 @@ public function callFunction(string $functionName, ...$params): bool
     {
         $driver = $this->getDriverFunctionPrefix();
 
-        if (! str_contains($driver, $functionName)) {
+        if (! str_starts_with($functionName, $driver)) {
             $functionName = $driver . $functionName;
         }
 

system/I18n/TimeTrait.php

@@ -1238,19 +1238,11 @@ public function __isset($name): bool
 
     /**
      * This is called when we unserialize the Time object.
+     *
+     * @param array{date: string, timezone: string, timezone_type: int} $data
      */
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
-        /**
-         * Prior to unserialization, this is a string.
-         *
-         * @var string $timezone
-         */
-        $timezone = $this->timezone;
-
-        $this->timezone = new DateTimeZone($timezone);
-
-        // @phpstan-ignore-next-line `$this->date` is a special property for PHP internal use.
-        parent::__construct($this->date, $this->timezone);
+        parent::__construct($data['date'], new DateTimeZone($data['timezone']));
     }
 }

system/View/View.php

@@ -202,8 +202,10 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         $this->renderVars['file'] = $this->viewPath . $this->renderVars['view'];
 
         if (str_contains($this->renderVars['view'], '\\')) {
-            $overrideFolder = $this->config->appOverridesFolder !== ''
-                 ? trim($this->config->appOverridesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR
+            $appOverridesFolder = $this->config->appOverridesFolder ?? 'overrides';
+
+            $overrideFolder = $appOverridesFolder !== ''
+                 ? trim($appOverridesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR
                  : '';
 
             $this->renderVars['file'] = $this->viewPath

tests/system/Database/BaseConnectionTest.php

@@ -435,4 +435,28 @@ public function testGetSessionTimezoneWithoutTimezoneKey(): void
         $result = $this->getPrivateMethodInvoker($db, 'getSessionTimezone')();
         $this->assertNull($result);
     }
+
+    public function testCallFunctionDoesNotDoublePrefixAlreadyPrefixedName(): void
+    {
+        $db = new class ($this->options) extends MockConnection {
+            protected function getDriverFunctionPrefix(): string
+            {
+                return 'str_';
+            }
+        };
+
+        $this->assertTrue($db->callFunction('str_contains', 'CodeIgniter', 'Ignite'));
+    }
+
+    public function testCallFunctionPrefixesUnprefixedName(): void
+    {
+        $db = new class ($this->options) extends MockConnection {
+            protected function getDriverFunctionPrefix(): string
+            {
+                return 'str_';
+            }
+        };
+
+        $this->assertTrue($db->callFunction('contains', 'CodeIgniter', 'Ignite'));
+    }
 }

user_guide_src/source/changelogs/v4.7.1.rst

@@ -40,9 +40,11 @@ Bugs Fixed
 
 - **ContentSecurityPolicy:** Fixed a bug where custom CSP tags were not removed from generated HTML when CSP was disabled. The method now ensures that all custom CSP tags are removed from the generated HTML.
 - **ContentSecurityPolicy:** Fixed a bug where ``generateNonces()`` produces corrupted JSON responses by replacing CSP nonce placeholders with unescaped double quotes. The method now automatically JSON-escapes nonce attributes when the response Content-Type is JSON.
+- **Database:** Fixed a bug where ``BaseConnection::callFunction()`` could double-prefix already-prefixed function names.
 - **Model:** Fixed a bug where ``BaseModel::updateBatch()`` threw an exception when ``updateOnlyChanged`` was ``true`` and the index field value did not change.
 - **Session:** Fixed a bug in ``MemcachedHandler`` where the constructor incorrectly threw an exception when ``savePath`` was not empty.
 - **Toolbar:** Fixed a bug where the standalone toolbar page loaded from ``?debugbar_time=...`` was not interactive.
+- **View:** Fixed a bug where ``View`` would throw an error if the ``appOverridesFolder`` config property was not defined.
 
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_

utils/phpstan-baseline/loader.neon

@@ -1,4 +1,4 @@
-# total 2122 errors
+# total 2126 errors
 
 includes:
     - argument.type.neon

utils/phpstan-baseline/method.childParameterType.neon

@@ -1,4 +1,4 @@
-# total 8 errors
+# total 12 errors
 
 parameters:
     ignoreErrors:
@@ -41,3 +41,23 @@ parameters:
             message: '#^Parameter \#1 \$value \(int\) of method CodeIgniter\\Entity\\Cast\\IntBoolCast\:\:get\(\) should be contravariant with parameter \$value \(array\|bool\|float\|int\|object\|string\|null\) of method CodeIgniter\\Entity\\Cast\\CastInterface\:\:get\(\)$#'
             count: 1
             path: ../../system/Entity/Cast/IntBoolCast.php
+
+        -
+            message: '#^Parameter \#1 \$data \(array\{date\: string, timezone\: string, timezone_type\: int\}\) of method CodeIgniter\\I18n\\Time\:\:__unserialize\(\) should be contravariant with parameter \$data \(array\) of method DateTimeImmutable\:\:__unserialize\(\)$#'
+            count: 1
+            path: ../../system/I18n/Time.php
+
+        -
+            message: '#^Parameter \#1 \$data \(array\{date\: string, timezone\: string, timezone_type\: int\}\) of method CodeIgniter\\I18n\\Time\:\:__unserialize\(\) should be contravariant with parameter \$data \(array\) of method DateTimeInterface\:\:__unserialize\(\)$#'
+            count: 1
+            path: ../../system/I18n/Time.php
+
+        -
+            message: '#^Parameter \#1 \$data \(array\{date\: string, timezone\: string, timezone_type\: int\}\) of method CodeIgniter\\I18n\\TimeLegacy\:\:__unserialize\(\) should be contravariant with parameter \$data \(array\) of method DateTimeInterface\:\:__unserialize\(\)$#'
+            count: 1
+            path: ../../system/I18n/TimeLegacy.php
+
+        -
+            message: '#^Parameter \#1 \$data \(array\{date\: string, timezone\: string, timezone_type\: int\}\) of method CodeIgniter\\I18n\\TimeLegacy\:\:__unserialize\(\) should be contravariant with parameter \$data \(array\) of method DateTime\:\:__unserialize\(\)$#'
+            count: 1
+            path: ../../system/I18n/TimeLegacy.php