Port to PHP 8.4 (#121)

* Port to PHP 8.4

* Add default value for $isAscending

* Update to PHP 8.4 and ubuntu-22.04

* use 8.3 for lint

* make stan happy

---------

Co-authored-by: shmax <shmax@shmax.com>

Author: phpfui

.github/workflows/static-analysis.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   phpstan:
     name: PHPStan
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
 
@@ -23,7 +23,7 @@ jobs:
         with:
           coverage: pcov
           ini-values: zend.assertions=1, assert.exception=1
-          php-version: 8.1
+          php-version: 8.4
           extensions: memcached
           tools: cs2pr
 

.github/workflows/style.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   phpcsfixer:
     name: PHP CS Fixer
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
 
@@ -23,7 +23,7 @@ jobs:
         with:
           coverage: pcov
           ini-values: zend.assertions=1, assert.exception=1
-          php-version: 8.1
+          php-version: 8.3
           extensions: memcached
           tools: cs2pr
 

.github/workflows/test.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   phpunit:
     name: PHPUnit
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       memcached:
         image: memcached:1.6
@@ -47,6 +47,8 @@ jobs:
         php-version:
           - 8.1
           - 8.2
+          - 8.3
+          - 8.4
         database:
           - mysql
           - pgsql

composer.json

@@ -10,7 +10,7 @@
         "php": ">=8.1.0"
     },
     "require-dev": {
-      "phpstan/phpstan": "^1.10",
+      "phpstan/phpstan": "1.12.23",
       "phpstan/phpstan-phpunit": "^1.3",
       "phpunit/phpunit": "^10",
       "friendsofphp/php-cs-fixer": "^v3.23.0",

lib/Adapter/MysqlAdapter.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ActiveRecord
  */
@@ -69,7 +70,7 @@ public function create_column(array $column): Column
 
             $c->raw_type = (count($matches) > 0 ? $matches[1] : $column['type']);
 
-            if (count($matches) >= 4) {
+            if (isset($matches[3])) {
                 $c->length = intval($matches[3]);
             }
         }

lib/Adapter/PgsqlAdapter.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ActiveRecord
  */
@@ -131,7 +132,7 @@ public function create_column(array $column): Column
             preg_match('/^([A-Za-z0-9_]+)(\(([0-9]+(,[0-9]+)?)\))?/', $column['type'], $matches);
 
             $c->raw_type = (count($matches) > 0 ? $matches[1] : $column['type']);
-            $c->length = count($matches) >= 4 ? intval($matches[3]) : intval($column['attlen']);
+            $c->length = isset($matches[3]) ? intval($matches[3]) : intval($column['attlen']);
 
             if ($c->length < 0) {
                 $c->length = null;

lib/Adapter/SqliteAdapter.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ActiveRecord
  */

lib/Cache.php

@@ -83,7 +83,7 @@ public static function flush(): void
      *
      * @param int $expire in seconds
      */
-    public static function get(string $key, \Closure $closure, int $expire = null): mixed
+    public static function get(string $key, \Closure $closure, ?int $expire = null): mixed
     {
         if (!static::$adapter) {
             return $closure();
@@ -98,7 +98,7 @@ public static function get(string $key, \Closure $closure, int $expire = null):
         return $value;
     }
 
-    public static function set(string $key, mixed $var, int $expire = null): void
+    public static function set(string $key, mixed $var, ?int $expire = null): void
     {
         assert(isset(static::$adapter), 'Adapter required to set');
 

lib/CallBack.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ActiveRecord
  */
@@ -163,7 +164,7 @@ public function get_callbacks(string $name): array
      *               that was for a before_* callback and that method returned false. If this happens, execution
      *               of any other callbacks after the offending callback will not occur.
      */
-    public function invoke(Model|null $model, string $name, bool $must_exist = true)
+    public function invoke(?Model $model, string $name, bool $must_exist = true)
     {
         if ($must_exist && !array_key_exists($name, $this->registry)) {
             throw new ActiveRecordException("No callbacks were defined for: $name on " . ($model ? get_class($model) : 'null'));
@@ -214,7 +215,7 @@ public function invoke(Model|null $model, string $name, bool $must_exist = true)
      *
      * @throws ActiveRecordException if invalid callback type or callback method was not found
      */
-    public function register(string $name, \Closure|string $closure_or_method_name = null, array $options = []): void
+    public function register(string $name, \Closure|string|null $closure_or_method_name = null, array $options = []): void
     {
         $closure_or_method_name ??= $name;
 

lib/Column.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package ActiveRecord
  */
@@ -66,7 +67,7 @@ class Column
     /**
      * The maximum length of this column.
      */
-    public int|null $length = null;
+    public ?int $length = null;
 
     /**
      * True if this column allows null.