Require PHP 8.4 and avoid PHP 8.5 deprecations

Author: iquito

.gitattributes

@@ -7,5 +7,4 @@
 /vendor-bin         export-ignore
 /.editorconfig      export-ignore
 /.gitattributes     export-ignore
-/.gitignore         export-ignore
-/captainhook.json   export-ignore
+/.gitignore         export-ignore

composer.json

@@ -20,17 +20,17 @@
         }
     ],
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.4",
         "ext-pdo": "*"
     },
     "require-dev": {
         "captainhook/captainhook-phar": "^5.0",
         "captainhook/hook-installer": "^1.0",
-        "phpunit/phpunit": "^11.4",
+        "phpunit/phpunit": "^12.0",
         "mockery/mockery": "^1.0",
         "squirrelphp/types": "^1.0",
-        "symfony/finder": "^7.0",
-        "symfony/process": "^7.0"
+        "symfony/finder": "^8.0",
+        "symfony/process": "^8.0"
     },
     "suggest": {
         "squirrelphp/queries": "Symfony integration of squirrelphp/queries - automatic assembling of decorated connections",

docker/Dockerfile/mariadb_ssl

@@ -5,5 +5,5 @@ COPY docker/ssl/db_ssl.crt /etc/mysql/certs/server.crt
 COPY docker/ssl/db_ssl.key /etc/mysql/certs/server.key
 COPY docker/ssl/DadaismCA.crt /etc/mysql/certs/ca.crt
 
-RUN chmod 600 /etc/mysql/certs/server.key
-RUN chown mysql:mysql /etc/mysql/certs/server.key
+RUN chmod 600 /etc/mysql/certs/*
+RUN chown mysql:mysql /etc/mysql/certs/*

docker/Dockerfile/mysql_ssl

@@ -5,5 +5,5 @@ COPY docker/ssl/db_ssl.crt /etc/mysql/certs/server.crt
 COPY docker/ssl/db_ssl.key /etc/mysql/certs/server.key
 COPY docker/ssl/DadaismCA.crt /etc/mysql/certs/ca.crt
 
-RUN chmod 600 /etc/mysql/certs/server.key
-RUN chown mysql:mysql /etc/mysql/certs/server.key
+RUN chmod 600 /etc/mysql/certs/*
+RUN chown mysql:mysql /etc/mysql/certs/*

docker/Dockerfile/postgres_ssl

@@ -5,5 +5,5 @@ COPY docker/ssl/db_ssl.crt /var/lib/postgresql/server.crt
 COPY docker/ssl/db_ssl.key /var/lib/postgresql/server.key
 COPY docker/ssl/DadaismCA.crt /var/lib/postgresql/ca.crt
 
-RUN chmod 600 /var/lib/postgresql/server.key
-RUN chown postgres:postgres /var/lib/postgresql/server.key
+RUN chmod 600 /var/lib/postgresql/*
+RUN chown postgres:postgres /var/lib/postgresql/*

docker/compose/composer.yml

@@ -1,6 +1,6 @@
 services:
     composer:
-        image: thecodingmachine/php:8.2-v4-cli
+        image: thecodingmachine/php:8.5-v5-cli
         container_name: squirrel_composer
         working_dir: /usr/src/app
         command: [ "composer", "${COMPOSER_COMMAND}", "--ansi" ]

docker/compose/coverage.yml

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

docker/compose/test.yml

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

src/PDO/ConnectionPDO.php

@@ -3,6 +3,8 @@
 namespace Squirrel\Connection\PDO;
 
 use PDO;
+use Pdo\Mysql as PdoMysql;
+use Pdo\Pgsql as PdoPgsql;
 use PDOException;
 use Squirrel\Connection\Config\Mysql;
 use Squirrel\Connection\Config\Pgsql;
@@ -33,15 +35,15 @@ public function __construct(
         $options[PDO::ATTR_AUTOCOMMIT] = true;
 
         if ($this->config instanceof Mysql) {
-            $options[PDO::MYSQL_ATTR_MULTI_STATEMENTS] = false;
-            $options[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
+            $options[PdoMysql::ATTR_MULTI_STATEMENTS] = false;
+            $options[PdoMysql::ATTR_FOUND_ROWS] = true;
 
             if ($this->config->ssl !== null) {
-                $options[PDO::MYSQL_ATTR_SSL_CA] = $this->config->ssl->rootCertificatePath;
-                $options[PDO::MYSQL_ATTR_SSL_KEY] = $this->config->ssl->privateKeyPath;
-                $options[PDO::MYSQL_ATTR_SSL_CERT] = $this->config->ssl->certificatePath;
+                $options[PdoMysql::ATTR_SSL_CA] = $this->config->ssl->rootCertificatePath;
+                $options[PdoMysql::ATTR_SSL_KEY] = $this->config->ssl->privateKeyPath;
+                $options[PdoMysql::ATTR_SSL_CERT] = $this->config->ssl->certificatePath;
 
-                $options[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = match ($this->config->ssl->verification) {
+                $options[PdoMysql::ATTR_SSL_VERIFY_SERVER_CERT] = match ($this->config->ssl->verification) {
                     SslVerification::None => false,
                     SslVerification::Ca => throw new InvalidArgumentException('Mysql SSL connections do not support to only verify the CA - only no verification or both CA and hostname verification are supported by the PHP driver'),
                     SslVerification::CaAndHostname => true,
@@ -50,7 +52,7 @@ public function __construct(
         }
 
         if ($this->config instanceof Pgsql) {
-            $options[PDO::PGSQL_ATTR_DISABLE_PREPARES] = false;
+            $options[PdoPgsql::ATTR_DISABLE_PREPARES] = false;
         }
 
         $this->options = $options;

tools/phpstan-baseline.php

@@ -2,7 +2,7 @@
 
 $ignoreErrors = [];
 $ignoreErrors[] = [
-	'message' => '#^Method Squirrel\\\\Connection\\\\PDO\\\\ConnectionPDO\\:\\:fetchAll\\(\\) should return list\\<array\\<string, bool\\|float\\|int\\|string\\|null\\>\\> but returns array\\.$#',
+	'message' => '#^Method Squirrel\\\\Connection\\\\PDO\\\\ConnectionPDO\\:\\:fetchAll\\(\\) should return list\\<array\\<string, bool\\|float\\|int\\|string\\|null\\>\\> but returns array\\<array\\>\\.$#',
 	'identifier' => 'return.type',
 	'count' => 1,
 	'path' => __DIR__ . '/../src/PDO/ConnectionPDO.php',