Upgrade connection dependency + coverage with PHP 8.4

Author: iquito

composer.json

@@ -20,7 +20,7 @@
     ],
     "require": {
         "php": ">=8.2",
-        "squirrelphp/connection": "^0.2",
+        "squirrelphp/connection": "^0.3",
         "squirrelphp/debug": "^2.0"
     },
     "require-dev": {
@@ -66,8 +66,8 @@
         "psalm": "vendor-bin/psalm/vendor/bin/psalm --config=tools/psalm.xml --show-info=false",
         "psalm_full": "vendor-bin/psalm/vendor/bin/psalm --config=tools/psalm.xml --clear-cache && vendor-bin/psalm/vendor/bin/psalm --config=tools/psalm.xml --show-info=false",
         "psalm_base": "vendor-bin/psalm/vendor/bin/psalm --config=tools/psalm.xml --set-baseline=tools/psalm-baseline.xml",
-        "phpunit": "vendor/bin/phpunit --configuration=tools/phpunit.xml.dist --cache-result-file=tools/cache/.phpunit.result.cache --colors=always --testsuite=unit",
-        "phpunit_clover": "vendor/bin/phpunit --configuration=tools/phpunit.xml.dist --cache-result-file=tools/cache/.phpunit.result.cache --coverage-text --coverage-clover build/logs/clover.xml",
+        "phpunit": "vendor/bin/phpunit --configuration=tools/phpunit.xml.dist --colors=always --testsuite=unit",
+        "phpunit_clover": "vendor/bin/phpunit --configuration=tools/phpunit.xml.dist --coverage-text --coverage-clover build/logs/clover.xml",
         "coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --configuration=tools/phpunit.xml.dist --coverage-html=tests/_reports",
         "phpcs": "vendor-bin/phpcs/vendor/bin/phpcs --standard=tools/ruleset.xml --extensions=php --cache=tools/cache/.phpcs-cache --colors src tests",
         "phpcs_diff": "vendor-bin/phpcs/vendor/bin/phpcs -s --standard=tools/ruleset.xml --extensions=php --cache=tools/cache/.phpcs-cache --colors src tests",

docker/compose/coverage.yml

@@ -1,6 +1,6 @@
 services:
     coverage:
-        image: thecodingmachine/php:8.3-v4-cli
+        image: thecodingmachine/php:8.4-v4-cli
         container_name: squirrel_queries_coverage
         tty: true
         working_dir: /usr/src/app

docker/compose/test.yml

@@ -1,6 +1,6 @@
 services:
     test:
-        image: thecodingmachine/php:8.3-v4-cli
+        image: thecodingmachine/php:8.2-v4-cli
         container_name: squirrel_queries_test
         tty: true
         working_dir: /usr/src/app

src/DB/AbstractImplementation.php

@@ -339,12 +339,7 @@ public function insertOrUpdateEmulation(
         $rowUpdates = $this->prepareUpsertRowUpdates($rowUpdates, $row, $indexColumns);
 
         // Do all queries in a transaction to correctly emulate the UPSERT
-        $this->transaction(function (
-            string $tableName,
-            array $row,
-            array $indexColumns,
-            array $rowUpdates,
-        ) {
+        $this->transaction(function () use ($tableName, $row, $indexColumns, $rowUpdates): void {
             // Contains all WHERE restrictions for the UPDATE query
             $whereForUpdate = [];
 
@@ -370,7 +365,7 @@ public function insertOrUpdateEmulation(
 
             // Because the UPDATE did not work, we do a regular insert
             $this->insert($tableName, $row);
-        }, $tableName, $row, $indexColumns, $rowUpdates);
+        });
     }
 
     protected function validateMandatoryUpsertParameters(

tools/phpstan-baseline.php

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="../vendor/autoload.php" cacheDirectory="cache/.phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="../vendor/autoload.php" cacheDirectory="cache/.phpunit.cache">
     <coverage includeUncoveredFiles="false"/>
     <testsuites>
         <testsuite name="Squirrel Test Suite">

tools/phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+<files psalm-version="6.5.1@3f17a6b24a2dbe543e21408c2b19108cf6a355ef">
   <file src="src/Builder/FlattenedFieldsWithTypeTrait.php">
     <InvalidReturnType>
       <code><![CDATA[bool[]]]></code>

tools/psalm-baseline.xml

@@ -27,29 +27,12 @@
                 <directory name="tests"/>
             </errorLevel>
         </PropertyNotSetInConstructor>
-        <!-- Deprecated method warnings in tests are false-positives -->
-        <DeprecatedMethod>
-            <errorLevel type="suppress">
-                <directory name="tests"/>
-            </errorLevel>
-        </DeprecatedMethod>
         <!-- Conflicts with tests where invalid arguments are tested -->
         <InvalidArgument>
             <errorLevel type="suppress">
                 <directory name="tests"/>
             </errorLevel>
         </InvalidArgument>
-        <!-- We test with internal doctrine classes and methods -->
-        <InternalClass>
-            <errorLevel type="suppress">
-                <directory name="tests"/>
-            </errorLevel>
-        </InternalClass>
-        <InternalMethod>
-            <errorLevel type="suppress">
-                <directory name="tests"/>
-            </errorLevel>
-        </InternalMethod>
     </issueHandlers>
 
     <plugins>

tools/psalm.xml

@@ -1,5 +1,5 @@
 {
     "require": {
-        "phpstan/phpstan": "^1.0"
+        "phpstan/phpstan": "^2.0"
     }
 }

vendor-bin/phpstan/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "vimeo/psalm": "^5.2",
+        "vimeo/psalm": "^6.0",
         "psalm/plugin-phpunit": "*",
         "psalm/plugin-mockery": "*"
     }