PHP 8.1 min version readiness

Author: rotimi

.github/workflows/php.yml

@@ -16,21 +16,19 @@ jobs:
 
     strategy:
         matrix:
-            php: [8.1, 8.0, 7.4]
+            php: [8.2, 8.1]
 # prefer-lowest is causing unit tests to fail when php 7.2 is run against PHPunit 7.x, 
 # PHPUnit 8.x is the latest stable release that supports PHP 7.2 and that runs fine
 #            dependency-version: [prefer-lowest, prefer-stable]
             dependency-version: [prefer-stable]
             os: [ubuntu-20.04, ubuntu-22.04]
             include:
-                - os: ubuntu-20.04
-                  php: 7.4
-                - os: ubuntu-20.04
-                  php: 8.0
                 - os: ubuntu-20.04
                   php: 8.1
                 - os: ubuntu-22.04
                   php: 8.1
+                - os: ubuntu-22.04
+                  php: 8.2
             #exclude:
                 #- os: ubuntu-20.04
                   #php: 7.3

composer.json

@@ -14,10 +14,10 @@
         }
     ],    
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^10.0",
         "php-coveralls/php-coveralls": "^2.0",
         "vimeo/psalm": "^5.4.0",
         "rector/rector": "^0.15.0"

rector.php

@@ -23,8 +23,8 @@
     $rectorConfigurator->import(SetList::PHP_72);
     $rectorConfigurator->import(SetList::PHP_73);
     $rectorConfigurator->import(SetList::PHP_74);
-    //$containerConfigurator->import(SetList::PHP_80);
-    //$containerConfigurator->import(SetList::PHP_81);
+    $rectorConfigurator->import(SetList::PHP_80);
+    $rectorConfigurator->import(SetList::PHP_81);
     $rectorConfigurator->import(SetList::CODE_QUALITY);
     $rectorConfigurator->import(SetList::CODING_STYLE);
     $rectorConfigurator->import(SetList::DEAD_CODE);
@@ -38,7 +38,4 @@
     $services->remove(\Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector::class);
     $services->remove(\Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector::class);
     $services->remove(\Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector::class);
-    
-    //TODO:PHP8 comment once PHP 8 becomes minimum version
-    (PHP_MAJOR_VERSION < 8) && $services->remove(Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector::class);
 };

src/GDAO/Model.php

@@ -12,7 +12,7 @@
  * the future. 
  * 
  * @author Rotimi Adegbamigbe
- * @copyright (c) 2022, Rotexsoft
+ * @copyright (c) 2023, Rotexsoft
  */
 abstract class Model {
 
@@ -604,22 +604,22 @@ abstract class Model {
     /**
      * @var string
      */
-    public const RELATION_TYPE_HAS_ONE = 'rt_ho';
+    final public const RELATION_TYPE_HAS_ONE = 'rt_ho';
 
     /**
      * @var string
      */
-    public const RELATION_TYPE_HAS_MANY = 'rt_hm';
+    final public const RELATION_TYPE_HAS_MANY = 'rt_hm';
 
     /**
      * @var string
      */
-    public const RELATION_TYPE_BELONGS_TO = 'rt_bt';
+    final public const RELATION_TYPE_BELONGS_TO = 'rt_bt';
 
     /**
      * @var string
      */
-    public const RELATION_TYPE_HAS_MANY_THROUGH = 'rt_hmt';
+    final public const RELATION_TYPE_HAS_MANY_THROUGH = 'rt_hmt';
 
     /**
      * A PDO compliant Data Source Name (DSN) string containing the information 
@@ -1467,7 +1467,7 @@ public abstract function fetchPairs(?object $query = null): array;
      * 
      * @throws \PDOException
      */
-    public abstract function fetchValue(?object $query = null);
+    public abstract function fetchValue(?object $query = null): mixed;
 
     /**
      * Return the PDO object powering this model or throw 
@@ -1511,7 +1511,7 @@ public abstract function getPDO(): \PDO;
      * @throws \GDAO\ModelInvalidInsertValueSuppliedException
      * @throws \GDAO\ModelPrimaryColValueNotRetrievableAfterInsertException
      */
-    public abstract function insert(array $data_2_insert = []);
+    public abstract function insert(array $data_2_insert = []): bool|array;
 
     /**
      * Insert one or more rows to the model table with the specified values.
@@ -1604,7 +1604,7 @@ public abstract function insertMany(array $rows_of_data_2_insert = []): bool;
     public abstract function updateMatchingDbTableRows(
         array $col_names_n_values_2_save = [],
         array $col_names_n_values_2_match = []
-    ):self;
+    ): static;
 
     /**
      * Update the specified record in the database.
@@ -1617,7 +1617,7 @@ public abstract function updateMatchingDbTableRows(
      *
      * @throws \PDOException
      */
-    public abstract function updateSpecifiedRecord(\GDAO\Model\RecordInterface $record): self;
+    public abstract function updateSpecifiedRecord(\GDAO\Model\RecordInterface $record): static;
 
     //////////////////////////////////////
     // Getters for non-public properties
@@ -1763,13 +1763,13 @@ public function getUsername(): string {
         return $this->username;
     }
 
-    public function setCollectionClassName(?string $collection_class_name): self {
+    public function setCollectionClassName(?string $collection_class_name): static {
 
         $this->collection_class_name = $collection_class_name;
         return $this;
     }
 
-    public function setCreatedTimestampColumnName(?string $created_timestamp_column_name): self {
+    public function setCreatedTimestampColumnName(?string $created_timestamp_column_name): static {
 
         $this->created_timestamp_column_name = $created_timestamp_column_name;
         return $this;
@@ -1781,7 +1781,7 @@ public function setCreatedTimestampColumnName(?string $created_timestamp_column_
      * that can be used for connecting to the DB then setting this property would make
      * sense.
      */
-    public function setDsn(string $dsn): self {
+    public function setDsn(string $dsn): static {
 
         $this->dsn = $dsn;
         return $this;
@@ -1793,7 +1793,7 @@ public function setDsn(string $dsn): self {
      * that can be used for connecting to the DB then setting this property would make
      * sense.
      */
-    public function setPasswd(string $passwd): self {
+    public function setPasswd(string $passwd): static {
 
         $this->passwd = $passwd;
         return $this;
@@ -1802,19 +1802,19 @@ public function setPasswd(string $passwd): self {
     /**
      * @param mixed[] $pdo_driver_opts
      */
-    public function setPdoDriverOpts(array $pdo_driver_opts): self {
+    public function setPdoDriverOpts(array $pdo_driver_opts): static {
 
         $this->pdo_driver_opts = $pdo_driver_opts;
         return $this;
     }
 
-    public function setPrimaryCol(string $primary_col): self {
+    public function setPrimaryCol(string $primary_col): static {
 
         $this->primary_col = $primary_col;
         return $this;
     }
 
-    public function setRecordClassName(?string $record_class_name): self {
+    public function setRecordClassName(?string $record_class_name): static {
 
         $this->record_class_name = $record_class_name;
         return $this;
@@ -1823,7 +1823,7 @@ public function setRecordClassName(?string $record_class_name): self {
     /**
      * @param mixed[] $relations
      */
-    public function setRelations(array $relations): self {
+    public function setRelations(array $relations): static {
 
         $this->relations = $relations;
         return $this;
@@ -1832,19 +1832,19 @@ public function setRelations(array $relations): self {
     /**
      * @param mixed[] $table_cols
      */
-    public function setTableCols(array $table_cols): self {
+    public function setTableCols(array $table_cols): static {
 
         $this->table_cols = $table_cols;
         return $this;
     }
 
-    public function setTableName(string $table_name): self {
+    public function setTableName(string $table_name): static {
 
         $this->table_name = $table_name;
         return $this;
     }
 
-    public function setUpdatedTimestampColumnName(?string $updated_timestamp_column_name): self {
+    public function setUpdatedTimestampColumnName(?string $updated_timestamp_column_name): static {
 
         $this->updated_timestamp_column_name = $updated_timestamp_column_name;
         return $this;
@@ -1856,7 +1856,7 @@ public function setUpdatedTimestampColumnName(?string $updated_timestamp_column_
      * that can be used for connecting to the DB then setting this property would make
      * sense.
      */
-    public function setUsername(string $username): self {
+    public function setUsername(string $username): static {
 
         $this->username = $username;
         return $this;