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

Author: nguereza-tony

phpstan.neon.dist

@@ -3,4 +3,7 @@ parameters:
     paths:
         - src
     universalObjectCratesClasses:
-        - Platine\Orm\Entity
+        - Platine\Orm\Entity
+    ignoreErrors:
+        -
+            identifier: missingType.generics

src/Entity.php

@@ -100,6 +100,17 @@ final public function __construct(
         ];
     }
 
+    /**
+     * Clone the object
+     * @return void
+     */
+    public function __clone(): void
+    {
+        if ($this->dataMapper !== null) {
+            $this->dataMapper = clone $this->dataMapper;
+        }
+    }
+
     /**
      * Convert entity to JSON array
      * @return array<string, mixed>

src/Relation/ForeignKey.php

@@ -103,7 +103,7 @@ public function isComposite(): bool
      */
     public function getValue(array $columns, bool $map = false): mixed
     {
-        if (!$map && !$this->composite) {
+        if ($map === false && $this->composite === false) {
             $column = array_keys($this->columns);
 
             return isset($columns[$column[0]])
@@ -131,7 +131,7 @@ public function getValue(array $columns, bool $map = false): mixed
      */
     public function getInverseValue(array $columns, bool $map = false): mixed
     {
-        if (!$map && !$this->composite) {
+        if ($map === false && $this->composite === false) {
             $column = array_values($this->columns);
 
             return isset($columns[$column[0]])
@@ -158,7 +158,7 @@ public function getInverseValue(array $columns, bool $map = false): mixed
      */
     public function extractValue(array $columns, bool $map = false): mixed
     {
-        if (!$map && !$this->composite) {
+        if ($map === false && $this->composite === false) {
             $column = array_values($this->columns);
 
             return isset($columns[$column[0]])

src/Repository.php

@@ -162,7 +162,6 @@ public function query(string|array $with = [], bool $immediate = false): EntityQ
 
     /**
      * {@inheritedoc}
-     * @return self<TEntity>
      */
     public function with(string|array $with, bool $immediate = false): self
     {
@@ -177,7 +176,6 @@ public function with(string|array $with, bool $immediate = false): self
 
     /**
      * {@inheritedoc}
-     * @return self<TEntity>
      */
     public function orderBy(
         string|Closure|Expression|array $columns,
@@ -191,7 +189,6 @@ public function orderBy(
 
     /**
      * {@inheritedoc}
-     * @return self<TEntity>
      */
     public function limit(int $offset, int $limit): self
     {
@@ -203,7 +200,6 @@ public function limit(int $offset, int $limit): self
 
     /**
      * {@inheritedoc}
-     * @return self<TEntity>
      */
     public function filters(string|array $filters = []): self
     {
@@ -218,6 +214,7 @@ public function filters(string|array $filters = []): self
 
     /**
      * {@inheritedoc}
+     * @return TEntity[]
      */
     public function all(array $columns = []): array
     {
@@ -243,6 +240,7 @@ public function create(array $columns = []): Entity
 
     /**
      * {@inheritedoc}
+     * @return TEntity|null
      */
     public function find(array|string|int|float $id): ?Entity
     {

src/RepositoryInterface.php

@@ -61,23 +61,23 @@ interface RepositoryInterface
      * Return the instance of EntityQuery
      * @param string|array<int, string>|array<string, Closure> $with
      * @param bool $immediate
-     * @return EntityQuery<TEntity>
+     * @return EntityQuery
      */
     public function query(string|array $with = [], bool $immediate = false): EntityQuery;
 
     /**
      * Load with relation
      * @param string|array<int, string>|array<string, Closure> $with
      * @param bool $immediate
-     * @return self<TEntity>
+     * @return $this
      */
     public function with(string|array $with, bool $immediate = false): self;
 
     /**
      * Set order
      * @param string|Closure|Expression|string[]|Expression[]|Closure[] $columns
      * @param string $order
-     * @return self<TEntity>
+     * @return $this
      */
     public function orderBy(
         string|Closure|Expression|array $columns,
@@ -88,14 +88,14 @@ public function orderBy(
      * Add limit and offset
      * @param int $offset
      * @param int $limit
-     * @return self<TEntity>
+     * @return $this
      */
     public function limit(int $offset, int $limit): self;
 
     /**
      * Apply an filters on the query
      * @param string|array<string, mixed> $filters
-     * @return self<TEntity>
+     * @return $this
      */
     public function filters(string|array $filters = []): self;
 

tests/EntityTest.php

@@ -73,6 +73,54 @@ public function testJson(): void
         $this->assertEquals('{"foo":"bar"}', json_encode($e));
     }
 
+    public function testClone(): void
+    {
+        $eMapper = $this->getEntityMapper(
+            [
+
+            ],
+            []
+        );
+        $eManager = $this->getEntityManager([], []);
+        $columns = [];
+        $loaders = [];
+        $readOnly = false;
+        $isNew = false;
+
+        $e = new MyEntity(
+            $eManager,
+            $eMapper,
+            $columns,
+            $loaders,
+            $readOnly,
+            $isNew
+        );
+
+        // By reference
+        $e->name = 'foo';
+        $this->assertEquals('foo', $e->name);
+
+        $r = $e;
+        $this->assertEquals('foo', $r->name);
+        $e->name = 'bar';
+
+        $this->assertEquals('bar', $e->name);
+        $this->assertEquals('bar', $r->name);
+
+        // By copy
+        $c = clone $e;
+        $this->assertEquals('bar', $e->name);
+        $this->assertEquals('bar', $c->name);
+
+        $e->name = 'baz';
+        $this->assertEquals('baz', $e->name);
+        $this->assertEquals('bar', $c->name);
+
+        $c->name = 'fooz';
+        $this->assertEquals('baz', $e->name);
+        $this->assertEquals('fooz', $c->name);
+    }
+
     public function testJsonRealEntity(): void
     {
         $eMapper = $this->getEntityMapper(