Merge branch 'develop' into subnamespace

Author: xgrind

composer.json

@@ -17,19 +17,19 @@
         "psr/log": "^3.0"
     },
     "require-dev": {
-        "boundwize/structarmed": "0.6.15",
+        "boundwize/structarmed": "0.9.1",
         "codeigniter/phpstan-codeigniter": "^1.5",
         "fakerphp/faker": "^1.24",
         "kint-php/kint": "^6.1",
         "mikey179/vfsstream": "^1.6.12",
         "nexusphp/tachycardia": "^2.0",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.1.55",
+        "phpstan/phpstan": "^2.2.1",
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^3.0",
-        "rector/rector": "2.4.4",
+        "rector/rector": "2.4.5",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

system/Database/BaseBuilder.php

@@ -2589,6 +2589,13 @@ protected function validateUpdate(): bool
      */
     public function updateBatch($set = null, $constraints = null, int $batchSize = 100)
     {
+        if ($this->QBWhere !== []) {
+            throw new DatabaseException(
+                'updateBatch() cannot be safely combined with existing Query Builder WHERE conditions. '
+                . 'Use updateBatch($data, $constraints), onConstraint(), or include all required constraint fields in the batch data.',
+            );
+        }
+
         $this->onConstraint($constraints);
 
         if (isset($this->QBOptions['setQueryAsData'])) {

system/HTTP/UserAgent.php

@@ -317,8 +317,15 @@ protected function setBrowser(): bool
         if (is_array($this->config->browsers) && $this->config->browsers !== []) {
             foreach ($this->config->browsers as $key => $val) {
                 if (preg_match('|' . $key . '.*?([0-9\.]+)|i', $this->agent, $match)) {
+                    $version = $match[1];
+
+                    // Safari's browser version is reported in the Version token.
+                    if ($val === 'Safari' && preg_match('|Version/([0-9\.]+).*?Safari|i', $this->agent, $safariMatch)) {
+                        $version = $safariMatch[1];
+                    }
+
                     $this->isBrowser = true;
-                    $this->version   = $match[1];
+                    $this->version   = $version;
                     $this->browser   = $val;
                     $this->setMobile();
 

tests/system/Database/Builder/UpdateTest.php

@@ -299,6 +299,24 @@ public function testUpdateBatchThrowsExceptionWithNoData(): void
         $builder->updateBatch(null, 'id');
     }
 
+    public function testUpdateBatchThrowsExceptionWithWhere(): void
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage(
+            'updateBatch() cannot be safely combined with existing Query Builder WHERE conditions. '
+            . 'Use updateBatch($data, $constraints), onConstraint(), or include all required constraint fields in the batch data.',
+        );
+
+        $builder->where('description', 'old')->updateBatch([
+            [
+                'id'   => 2,
+                'name' => 'Comedian',
+            ],
+        ], 'id');
+    }
+
     public function testUpdateBatchThrowsExceptionWithNoID(): void
     {
         $builder = new BaseBuilder('jobs', $this->db);

tests/system/HTTP/UserAgentTest.php

@@ -74,10 +74,38 @@ public function testBrowserInfo(): void
     {
         $this->assertSame('Mac OS X', $this->agent->getPlatform());
         $this->assertSame('Safari', $this->agent->getBrowser());
-        $this->assertSame('533.20.27', $this->agent->getVersion());
+        $this->assertSame('5.0.4', $this->agent->getVersion());
         $this->assertSame('', $this->agent->getRobot());
     }
 
+    public function testParseModernSafariUsesVersionToken(): void
+    {
+        $this->agent->parse('Mozilla/5.0 (Macintosh; Intel Mac OS X 13_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Safari/605.1.15');
+
+        $this->assertSame('Mac OS X', $this->agent->getPlatform());
+        $this->assertSame('Safari', $this->agent->getBrowser());
+        $this->assertSame('16.3', $this->agent->getVersion());
+    }
+
+    public function testParseMobileSafariUsesVersionToken(): void
+    {
+        $this->agent->parse($this->_mobile_ua);
+
+        $this->assertSame('iOS', $this->agent->getPlatform());
+        $this->assertSame('Safari', $this->agent->getBrowser());
+        $this->assertSame('4.0.5', $this->agent->getVersion());
+        $this->assertSame('Apple iPhone', $this->agent->getMobile());
+    }
+
+    public function testParseChromeWithSafariTokenUsesChromeVersion(): void
+    {
+        $this->agent->parse('Mozilla/5.0 (Macintosh; Intel Mac OS X 13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36');
+
+        $this->assertSame('Mac OS X', $this->agent->getPlatform());
+        $this->assertSame('Chrome', $this->agent->getBrowser());
+        $this->assertSame('110.0.0.0', $this->agent->getVersion());
+    }
+
     public function testParse(): void
     {
         $newAgent = 'Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0';

user_guide_src/source/changelogs/v4.7.4.rst

@@ -30,6 +30,9 @@ Deprecations
 Bugs Fixed
 **********
 
+- **Database:** Fixed a bug where ``updateBatch()`` could be called after Query Builder ``where()`` conditions, even though it's not supported. In this situation, now the ``DatabaseException`` is thrown.
+- **HTTP:** Fixed a bug where the User Agent library reported Safari's WebKit version instead of the browser version from the ``Version`` token.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.

user_guide_src/source/libraries/official_packages.rst

@@ -41,18 +41,18 @@ while defaulting to the config files when not custom value has been stored. This
 an application to ship with the default config values, but adapt as the project grows
 or moves servers, without having to touch the code.
 
-************
-Tasks (BETA)
-************
+*****
+Tasks
+*****
 
 `CodeIgniter Tasks <https://tasks.codeigniter.com>`_ is a simple task scheduler
 for CodeIgniter 4. It allows you to schedule tasks to run at specific times, or
 on a recurring basis. It is designed to be simple to use, but flexible enough to
 handle most use cases.
 
-************
-Queue (BETA)
-************
+*****
+Queue
+*****
 
 `CodeIgniter Queue <https://queue.codeigniter.com>`_ is a simple queue system
 for CodeIgniter 4. It allows you to queue up tasks to be run later.

utils/phpstan-baseline/function.alreadyNarrowedType.neon

@@ -1,4 +1,4 @@
-# total 2015 errors
+# total 2010 errors
 
 includes:
     - argument.type.neon
@@ -10,8 +10,6 @@ includes:
     - codeigniter.superglobalAccessAssign.neon
     - deadCode.unreachable.neon
     - empty.notAllowed.neon
-    - function.alreadyNarrowedType.neon
-    - function.impossibleType.neon
     - method.alreadyNarrowedType.neon
     - method.childParameterType.neon
     - method.childReturnType.neon