Update PHP minimum version to 8.0 and dependencies to latest compatible version

Author: nguereza-tony

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
     - name: Checkout
@@ -28,7 +28,7 @@ jobs:
       run: php -v
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

.scrutinizer.yml

@@ -11,7 +11,7 @@ build:
                         command: phpcs-run
                         use_website_config: false
     environment:
-        php: 7.4.0
+        php: 8.0
 filter:
     excluded_paths:
         - 'tests/*'

README.MD

@@ -12,7 +12,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/852e352455644c8abd8209f2036eaab2)](https://app.codacy.com/gh/platine-php/orm/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
 
 ### Requirements 
-- **PHP >= 7.4**, **PHP 8** 
+- **PHP >= 8.0** 
 
 ### Installation
 #### Using composer (recommended)

composer.json

@@ -19,15 +19,15 @@
     },
 
     "require": {
-        "php": "^7.4 || ^8",
-        "platine-php/database": "^1.0"
+        "php": "^8",
+        "platine-php/database": "^2.0"
     },
 
     "require-dev": {
         "phpmd/phpmd": "@stable",
-        "phpstan/phpstan": "^1.8",
-        "phpunit/phpunit": "^9.5",
-        "platine-php/dev": "^1.0",
+        "phpstan/phpstan": "^2.0",
+        "phpunit/phpunit": "^9.6",
+        "platine-php/dev": "^2.0",
         "squizlabs/php_codesniffer": "3.*"
     },
 

src/Entity.php

@@ -52,17 +52,18 @@
 use Platine\Orm\Mapper\DataMapperInterface;
 use Platine\Orm\Mapper\EntityMapper;
 use Platine\Orm\Mapper\EntityMapperInterface;
+use Stringable;
 
 /**
  * @class Entity
  * @package Platine\Orm
  * @template TEntity as Entity
  */
-abstract class Entity implements JsonSerializable
+abstract class Entity implements JsonSerializable, Stringable
 {
     /**
      * The instance of data mapper
-     * @var DataMapper<TEntity> |null
+     * @var DataMapper<TEntity>|null
      */
     private ?DataMapper $dataMapper = null;
 
@@ -103,7 +104,7 @@ final public function __construct(
      * Convert entity to JSON array
      * @return array<string, mixed>
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         $rawColumns = $this->mapper()->getRawColumns();
         $data = [];
@@ -130,7 +131,7 @@ public function jsonSerialize()
      * @param string $name
      * @return mixed
      */
-    public function __get(string $name)
+    public function __get(string $name): mixed
     {
         if ($this->mapper()->hasRelation($name)) {
             return $this->mapper()->getRelated($name);
@@ -152,7 +153,7 @@ public function __get(string $name)
      * @param mixed $value
      * @return void
      */
-    public function __set(string $name, $value)
+    public function __set(string $name, mixed $value): void
     {
         if ($this->mapper()->hasRelation($name)) {
             if (is_array($value)) {
@@ -172,7 +173,7 @@ public function __set(string $name, $value)
      * @param string $name
      * @return bool
      */
-    public function __isset(string $name)
+    public function __isset(string $name): bool
     {
         return $this->mapper()->hasRelation($name)
                 || $this->mapper()->hasColumn($name);
@@ -181,9 +182,9 @@ public function __isset(string $name)
     /**
      * Shortcut to DataMapper clearColumn
      * @param string $name
-     * @return bool
+     * @return void
      */
-    public function __unset(string $name)
+    public function __unset(string $name): void
     {
         $this->mapper()->clearColumn($name, true);
     }
@@ -216,7 +217,10 @@ abstract public static function mapEntity(EntityMapperInterface $mapper): void;
     final protected function mapper(): DataMapperInterface
     {
         if ($this->dataMapper === null) {
-            $this->dataMapper = new DataMapper(...$this->dataMapperArgs);
+            /** @var DataMapper<TEntity> $dataMapper */
+            $dataMapper = new DataMapper(...$this->dataMapperArgs);
+
+            $this->dataMapper = $dataMapper;
         }
 
         return $this->dataMapper;

src/EntityManager.php

@@ -60,12 +60,6 @@
  */
 class EntityManager
 {
-    /**
-     * The connection
-     * @var Connection
-     */
-    protected Connection $connection;
-
     /**
      * The date format
      * @var string
@@ -82,9 +76,8 @@ class EntityManager
      * Create new instance
      * @param Connection $connection
      */
-    public function __construct(Connection $connection)
+    public function __construct(protected Connection $connection)
     {
-        $this->connection = $connection;
         $this->dateFormat = $connection->getDriver()->getDateFormat();
     }
 
@@ -131,16 +124,13 @@ public function getEntityMapper(string $entityClass): EntityMapper
             $reflection = new ReflectionClass($entityClass);
         } catch (ReflectionException $ex) {
             throw new RuntimeException(
-                sprintf(
-                    'Error when build the mapper for entity [%s]',
-                    $entityClass
-                ),
+                sprintf('Error when build the mapper for entity [%s]', $entityClass),
                 0,
                 $ex
             );
         }
 
-        if (!$reflection->isSubclassOf(Entity::class)) {
+        if ($reflection->isSubclassOf(Entity::class) === false) {
             throw new RuntimeException(sprintf(
                 '[%s] must extend [%s]',
                 $entityClass,

src/Exception/EntityStateException.php

@@ -35,7 +35,7 @@
 use RuntimeException;
 
 /**
- * Class EntityStateException
+ * @class EntityStateException
  * @package Platine\Orm\Exception
  */
 class EntityStateException extends RuntimeException

src/Exception/PropertyNotFoundException.php

@@ -35,7 +35,7 @@
 use RuntimeException;
 
 /**
- * Class PropertyNotFoundException
+ * @class PropertyNotFoundException
  * @package Platine\Orm\Exception
  */
 class PropertyNotFoundException extends RuntimeException

src/Exception/RelationNotFoundException.php

@@ -35,7 +35,7 @@
 use RuntimeException;
 
 /**
- * Class RelationNotFoundException
+ * @class RelationNotFoundException
  * @package Platine\Orm\Exception
  */
 class RelationNotFoundException extends RuntimeException

src/Mapper/DataMapper.php

@@ -82,7 +82,7 @@ class DataMapper implements DataMapperInterface
 
     /**
      * The list of relation loaders
-     * @var array<string, RelationLoader<TEntity>>
+     * @var array<string, \Platine\Orm\Relation\RelationLoader<TEntity>>
      */
     protected array $loaders = [];
 
@@ -170,7 +170,7 @@ public function __construct(
         $this->isNew = $isNew;
         $this->rawColumns = $columns;
 
-        if ($isNew && !empty($columns)) {
+        if ($isNew && count($columns) > 0) {
             $this->rawColumns = [];
             $this->fill($columns);
         }
@@ -223,13 +223,13 @@ public function isReadOnly(): bool
      */
     public function wasModified(): bool
     {
-        return !empty($this->modified) || !empty($this->pendingLinks);
+        return count($this->modified) > 0 || count($this->pendingLinks) > 0;
     }
 
     /**
      * {@inheritedoc}
      */
-    public function getColumn(string $name)
+    public function getColumn(string $name): mixed
     {
         if ($this->refresh) {
             $this->hydrate();
@@ -274,7 +274,7 @@ public function getColumn(string $name)
     /**
      * {@inheritedoc}
      */
-    public function setColumn(string $name, $value): void
+    public function setColumn(string $name, mixed $value): void
     {
         if ($this->isReadOnly) {
             throw new EntityStateException('The record is readonly');
@@ -345,7 +345,7 @@ public function getRawColumns(): array
     /**
      * {@inheritedoc}
      */
-    public function setRawColumn(string $name, $value): void
+    public function setRawColumn(string $name, mixed $value): void
     {
         $this->modified[$name] = true;
         unset($this->columns[$name]);
@@ -355,7 +355,7 @@ public function setRawColumn(string $name, $value): void
      /**
      * {@inheritedoc}
      */
-    public function getRelated(string $name, callable $callback = null)
+    public function getRelated(string $name, callable $callback = null): mixed
     {
         if (array_key_exists($name, $this->relations)) {
             return $this->relations[$name];
@@ -408,7 +408,7 @@ public function setRelated(string $name, ?Entity $entity = null): void
             ));
         }
 
-        /** @var Relation<TEntity> $rel */
+        /** @var \Platine\Orm\Relation\Relation<TEntity> $rel */
         $rel = $relations[$name];
 
         if (!($rel instanceof BelongsTo) && !($rel instanceof HasRelation)) {
@@ -499,7 +499,7 @@ public function fill(array $columns): void
      * @param mixed $id
      * @return bool
      */
-    public function markAsSaved($id): bool
+    public function markAsSaved(mixed $id): bool
     {
         $primaryKey = $this->mapper->getPrimaryKey();
         if (!$primaryKey->isComposite()) {
@@ -560,7 +560,7 @@ public function markAsDeleted(): bool
     public function executePendingLinkage(): void
     {
         foreach ($this->pendingLinks as $item) {
-            /** @var ShareOne<TEntity>|ShareMany<TEntity> $rel */
+            /** @var \Platine\Orm\Relation\ShareOne<TEntity>|\Platine\Orm\Relation\ShareMany<TEntity> $rel */
             $rel = $item['relation'];
 
             if (isset($item['link'])) {
@@ -581,7 +581,7 @@ public function executePendingLinkage(): void
      */
     protected function hydrate(): void
     {
-        if (!$this->refresh) {
+        if ($this->refresh === false) {
             return;
         }
 
@@ -615,7 +615,7 @@ protected function hydrate(): void
      *
      * @return mixed
      */
-    protected function castGet($value, string $type)
+    protected function castGet(mixed $value, string $type): mixed
     {
         $original = $type;
 
@@ -668,7 +668,7 @@ protected function castGet($value, string $type)
      *
      * @return mixed
      */
-    protected function castSet($value, string $type)
+    protected function castSet(mixed $value, string $type): mixed
     {
         $original = $type;
 
@@ -730,7 +730,7 @@ private function setLink(string $relation, Entity $entity, bool $link): void
             ));
         }
 
-        /** @var ShareRelation<TEntity> $rel  */
+        /** @var \Platine\Orm\Relation\Relation<TEntity> $rel  */
         $rel = $relations[$relation];
         if (!($rel instanceof ShareRelation)) {
             throw new RuntimeException('Unsupported relation type');