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

Author: Franky5831

phpstan-bootstrap.php

@@ -2,6 +2,17 @@
 
 require __DIR__ . '/system/util_bootstrap.php';
 
-if (! defined('OCI_COMMIT_ON_SUCCESS')) {
-    define('OCI_COMMIT_ON_SUCCESS', 32);
+defined('OCI_COMMIT_ON_SUCCESS') || define('OCI_COMMIT_ON_SUCCESS', 32);
+
+foreach ([
+    'app/Config',
+] as $directory) {
+    $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory));
+
+    /** @var SplFileInfo $file */
+    foreach ($iterator as $file) {
+        if ($file->isFile() && $file->getExtension() === 'php') {
+            require_once $file->getRealPath();
+        }
+    }
 }

rector.php

@@ -71,7 +71,7 @@
     ])
     // do you need to include constants, class aliases or custom autoloader? files listed will be executed
     ->withBootstrapFiles([
-        __DIR__ . '/system/util_bootstrap.php',
+        __DIR__ . '/phpstan-bootstrap.php',
     ])
     ->withPHPStanConfigs([
         __DIR__ . '/phpstan.neon.dist',

system/Boot.php

@@ -373,9 +373,8 @@ protected static function initializeConsole(): Console
         $console = new Console();
 
         // Show basic information before we do anything else.
-        // @phpstan-ignore-next-line
         if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
-            unset($_SERVER['argv'][$suppress]); // @phpstan-ignore-line
+            unset($_SERVER['argv'][$suppress]);
             $suppress = true;
         }
 

system/Database/BaseConnection.php

@@ -652,9 +652,7 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, s
             $query->setDuration($startTime, $startTime);
 
             // This will trigger a rollback if transactions are being used
-            if ($this->transDepth !== 0) {
-                $this->transStatus = false;
-            }
+            $this->handleTransStatus();
 
             if (
                 $this->DBDebug
@@ -904,6 +902,18 @@ public function resetTransStatus(): static
         return $this;
     }
 
+    /**
+     * Handle transaction status when a query fails
+     *
+     * @internal This method is for internal database component use only
+     */
+    public function handleTransStatus(): void
+    {
+        if ($this->transDepth !== 0) {
+            $this->transStatus = false;
+        }
+    }
+
     /**
      * Begin Transaction
      */

system/Database/BasePreparedQuery.php

@@ -134,9 +134,7 @@ public function execute(...$data)
             $query->setDuration($startTime, $startTime);
 
             // This will trigger a rollback if transactions are being used
-            if ($this->db->transDepth !== 0) {
-                $this->db->transStatus = false;
-            }
+            $this->db->handleTransStatus();
 
             if ($this->db->DBDebug) {
                 // We call this function in order to roll-back queries

system/HTTP/URI.php

@@ -376,7 +376,7 @@ public function getAuthority(bool $ignorePort = false): string
         }
 
         // Don't add port if it's a standard port for this scheme
-        if ((int) $this->port !== 0 && ! $ignorePort && $this->port !== $this->defaultPorts[$this->scheme]) {
+        if ((int) $this->port !== 0 && ! $ignorePort && $this->port !== ($this->defaultPorts[$this->scheme] ?? null)) {
             $authority .= ':' . $this->port;
         }
 

tests/system/Database/Live/PreparedQueryTest.php

@@ -304,4 +304,44 @@ public function testInsertBinaryData(): void
 
         $this->assertSame(strlen($fileContent), strlen($file));
     }
+
+    public function testHandleTransStatusMarksTransactionFailedDuringTransaction(): void
+    {
+        $this->db->transStart();
+
+        // Verify we're in a transaction
+        $this->assertSame(1, $this->db->transDepth);
+
+        // Prepare a query that will fail (duplicate key)
+        $this->query = $this->db->prepare(static fn ($db) => $db->table('without_auto_increment')->insert([
+            'key'   => 'a',
+            'value' => 'b',
+        ]));
+
+        $this->disableDBDebug();
+
+        $this->assertTrue($this->query->execute('test_key', 'test_value'));
+        $this->assertTrue($this->db->transStatus());
+
+        $this->seeInDatabase($this->db->DBPrefix . 'without_auto_increment', [
+            'key'   => 'test_key',
+            'value' => 'test_value'
+        ]);
+
+        $this->assertFalse($this->query->execute('test_key', 'different_value'));
+        $this->assertFalse($this->db->transStatus());
+
+        $this->enableDBDebug();
+
+        // Complete the transaction - should rollback due to failed status
+        $this->assertFalse($this->db->transComplete());
+
+        // Verify the first insert was rolled back
+        $this->dontSeeInDatabase($this->db->DBPrefix . 'without_auto_increment', [
+            'key'   => 'test_key',
+            'value' => 'test_value'
+        ]);
+
+        $this->db->resetTransStatus();
+    }
 }

tests/system/HTTP/URITest.php

@@ -622,6 +622,22 @@ public static function provideAuthorityReturnsExceptedValues(): iterable
                 'http://[email protected]:3000/bar',
                 '[email protected]:3000',
             ],
+            'rtsp-with-port' => [
+                'rtsp://localhost:1234/stream',
+                'localhost:1234',
+            ],
+            'rtsp-no-port' => [
+                'rtsp://localhost/stream',
+                'localhost',
+            ],
+            'custom-scheme-with-port' => [
+                'myscheme://server:9999/resource',
+                'server:9999',
+            ],
+            'custom-scheme-no-port' => [
+                'myscheme://server/resource',
+                'server',
+            ],
         ];
     }
 
@@ -1226,4 +1242,17 @@ public function testForceGlobalSecureRequestsAndNonHTTPProtocol(): void
 
         $this->assertSame($expected, (string) $uri);
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/9604
+     */
+    public function testAuthorityIncludesPortForCustomSchemes(): void
+    {
+        $url = 'rtsp://localhost:1234/stream';
+        $uri = new URI($url);
+
+        $this->assertSame('rtsp://localhost:1234/stream', (string) $uri);
+        $this->assertSame('localhost:1234', $uri->getAuthority());
+        $this->assertSame(1234, $uri->getPort());
+    }
 }

user_guide_src/source/changelogs/v4.6.2.rst

@@ -37,9 +37,11 @@ Bugs Fixed
 
 - **Cache:** Fixed a bug where a corrupted or unreadable cache file could cause an unhandled exception in ``FileHandler::getItem()``.
 - **Database:** Fixed a bug where ``when()`` and ``whenNot()`` in ``ConditionalTrait`` incorrectly evaluated certain falsy values (such as ``[]``, ``0``, ``0.0``, and ``'0'``) as truthy, causing callbacks to be executed unexpectedly. These methods now cast the condition to a boolean using ``(bool)`` to ensure consistent behavior with PHP's native truthiness.
+- **Database:** Fixed encapsulation violation in ``BasePreparedQuery`` when accessing ``BaseConnection::transStatus`` protected property.
 - **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
 - **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
 - **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
+- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.
 
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_

user_guide_src/source/installation/upgrade_460.rst

@@ -210,6 +210,8 @@ Config
     - ``Config\Feature::$strictLocaleNegotiation`` has been added.
 - app/Config/Routing.php
     - ``Config\Routing::$translateUriToCamelCase`` has been changed to ``true``.
+- app/Config/Kint.php
+    - ``Config\Kint::$richSort`` has been removed. Kint in v6 no longer uses ``AbstractRenderer::SORT_FULL``. Leaving this property in your code will cause a runtime error due to the undefined constant.
 
 All Changes
 ===========