Test PHP 8.4 (#388)

Author: Tigrov

.github/workflows/bc.yml_

@@ -20,4 +20,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.4']

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.3
+          - 8.4
 
         pgsql:
           - 9
@@ -48,6 +48,8 @@ jobs:
             pgsql: 16
           - php: 8.2
             pgsql: 16
+          - php: 8.3
+            pgsql: 16
 
     services:
       postgres:

.github/workflows/composer-require-checker.yml

@@ -32,6 +32,7 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
 
     steps:
       - name: Checkout.

.github/workflows/mutation.yml

@@ -30,7 +30,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.3
+          - 8.4
 
     services:
       postgres:

.github/workflows/rector.yml_

@@ -17,4 +17,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']

.github/workflows/static.yml

@@ -31,9 +31,10 @@ jobs:
           - ubuntu-latest
 
         php:
-          - '8.1'
-          - '8.2'
-          - '8.3'
+          - 8.1
+          - 8.2
+          - 8.3
+          - 8.4
 
     steps:
       - name: Checkout.

CHANGELOG.md

@@ -31,6 +31,8 @@
 - New #384: Add `IndexMethod` class (@Tigrov)
 - Bug #387: Explicitly mark nullable parameters (@vjik)
 - Enh #386: Refactor array, structured and JSON expression builders (@Tigrov)
+- Chg #388: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
+- Enh #388: Minor refactoring (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

README.md

@@ -27,7 +27,7 @@ as stored procedures and server-side cursors.
 
 | PHP           | PostgreSQL Version  | CI-Actions
 |---------------|---------------------|-----------
-| **8.1 - 8.3** | **9.0 - 16.0** |[![build](https://github.com/yiisoft/db-pgsql/actions/workflows/build.yml/badge.svg?branch=dev)](https://github.com/yiisoft/db-pgsql/actions/workflows/build.yml) [![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fyiisoft%2Fdb-pgsql%2Fmaster)](https://dashboard.stryker-mutator.io/reports/github.com/yiisoft/db-pgsql/master) [![static analysis](https://github.com/yiisoft/db-pgsql/actions/workflows/static.yml/badge.svg?branch=dev)](https://github.com/yiisoft/db-pgsql/actions/workflows/static.yml) [![type-coverage](https://shepherd.dev/github/yiisoft/db-pgsql/coverage.svg)](https://shepherd.dev/github/yiisoft/db-pgsql)
+| **8.1 - 8.4** | **9.0 - 16.0** |[![build](https://github.com/yiisoft/db-pgsql/actions/workflows/build.yml/badge.svg?branch=dev)](https://github.com/yiisoft/db-pgsql/actions/workflows/build.yml) [![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fyiisoft%2Fdb-pgsql%2Fmaster)](https://dashboard.stryker-mutator.io/reports/github.com/yiisoft/db-pgsql/master) [![static analysis](https://github.com/yiisoft/db-pgsql/actions/workflows/static.yml/badge.svg?branch=dev)](https://github.com/yiisoft/db-pgsql/actions/workflows/static.yml) [![type-coverage](https://shepherd.dev/github/yiisoft/db-pgsql/coverage.svg)](https://shepherd.dev/github/yiisoft/db-pgsql)
 
 ## Installation
 

composer.json

@@ -31,24 +31,24 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "8.1 - 8.4",
         "ext-json": "*",
         "ext-pdo": "*",
         "ext-pdo_pgsql": "*",
         "yiisoft/db": "dev-master",
         "yiisoft/json": "^1.0"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^4.2",
-        "phpunit/phpunit": "^10.0",
-        "rector/rector": "^2.0.3",
-        "roave/infection-static-analysis-plugin": "^1.16",
-        "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^5.25",
-        "vlucas/phpdotenv": "^5.6",
+        "maglnet/composer-require-checker": "^4.7.1",
+        "phpunit/phpunit": "^10.5.45",
+        "rector/rector": "^2.0.10",
+        "roave/infection-static-analysis-plugin": "^1.35",
+        "spatie/phpunit-watcher": "^1.24",
+        "vimeo/psalm": "^5.26.1 || ^6.8.8",
+        "vlucas/phpdotenv": "^5.6.1",
         "yiisoft/aliases": "^2.0",
-        "yiisoft/cache-file": "^3.1",
-        "yiisoft/var-dumper": "^1.5"
+        "yiisoft/cache-file": "^3.2",
+        "yiisoft/var-dumper": "^1.7"
     },
     "autoload": {
         "psr-4": {

psalm.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <psalm
   errorLevel="1"
+  ensureOverrideAttribute="false"
   findUnusedBaselineEntry="true"
   findUnusedCode="false"
   resolveFromConfigFile="true"

src/Column/ColumnDefinitionParser.php

@@ -28,7 +28,9 @@ public function parse(string $definition): array
     {
         preg_match(self::TYPE_PATTERN, $definition, $matches);
 
-        $type = strtolower($matches[3] ?? preg_replace('/\s*\(\d+\)/', '', $matches[1]));
+        /** @var string $type */
+        $type = $matches[3] ?? preg_replace('/\s*\(\d+\)/', '', $matches[1]);
+        $type = strtolower($type);
         $info = ['type' => $type];
 
         $typeDetails = $matches[4] ?? $matches[2] ?? '';

src/Column/ColumnFactory.php

@@ -164,6 +164,7 @@ protected function getColumnClass(string $type, array $info = []): string
 
     protected function normalizeNotNullDefaultValue(string $defaultValue, ColumnInterface $column): mixed
     {
+        /** @var string $value */
         $value = preg_replace("/::[^:']+$/", '$1', $defaultValue);
 
         if (str_starts_with($value, "B'") && $value[-1] === "'") {

src/DDLQueryBuilder.php

@@ -121,6 +121,7 @@ public function dropIndex(string $table, string $name): string
     {
         if (str_contains($table, '.') && !str_contains($name, '.')) {
             if (str_contains($table, '{{')) {
+                /** @var string $table */
                 $table = preg_replace('/{{(.*?)}}/', '\1', $table);
                 [$schema] = explode('.', $table);
                 if (!str_contains($schema, '%')) {