Merge branch 'develop'

Author: janpecha

.github/workflows/static-analysis.yml

@@ -4,13 +4,19 @@ on: [push, pull_request]
 
 jobs:
     phpstan:
-        name: PHPStan
         runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1']
+
+            fail-fast: false
+
+        name: PHP ${{ matrix.php }} PHPStan
         steps:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: ${{ matrix.php }}
                   coverage: none
 
             - run: composer install --no-interaction

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1']
 
             fail-fast: false
 

src/LeanMapper/Connection.php

@@ -13,6 +13,7 @@
 
 namespace LeanMapper;
 
+use Dibi\Row as DibiRow;
 use LeanMapper\Exception\InvalidArgumentException;
 
 /**
@@ -94,7 +95,7 @@ public function getWiringSchema(string $filterName): string
     /**
      * Creates new instance of Fluent
      *
-     * @return Fluent
+     * @return Fluent<int, DibiRow>
      */
     public function command(): \Dibi\Fluent
     {

src/LeanMapper/Entity.php

@@ -761,7 +761,7 @@ protected function getValueByPropertyWithRelationship(
      * @param Property|string $property micro-optimalization
      * @throws InvalidMethodCallException
      */
-    protected function assignEntityToProperty(?Entity $entity = null, $property):void
+    protected function assignEntityToProperty(?Entity $entity, $property):void
     {
         if ($entity !== null) {
             $this->useMapper($entity->mapper);

src/LeanMapper/Fluent.php

@@ -14,6 +14,7 @@
 namespace LeanMapper;
 
 use Closure;
+use Dibi\Row as DibiRow;
 use LeanMapper\Exception\InvalidArgumentException;
 
 /**
@@ -76,6 +77,7 @@ public function applyFilter($filter, $args = null)
 
     /**
      * @param array<mixed> $args
+     * @return Fluent<int, DibiRow>
      */
     public function createSelect(?array $args = null): self
     {
@@ -106,6 +108,7 @@ public function getRelatedKeys(): ?array
 
     /**
      * @param array<int|string>|null $keys
+     * @return Fluent<int, DibiRow>
      * @throws InvalidArgumentException
      */
     public function setRelatedKeys(?array $keys): self

src/LeanMapper/Reflection/EntityReflection.php

@@ -114,6 +114,7 @@ public function getAliases(): Aliases
     /**
      * Gets parent entity's reflection
      */
+    #[\ReturnTypeWillChange]
     public function getParentClass(): ?self
     {
         return ($reflection = parent::getParentClass()) ? new self($reflection->getName(), $this->mapper, $this->entityReflectionProvider) : null;
@@ -125,6 +126,7 @@ public function getParentClass(): ?self
      *
      * @return string|false
      */
+    #[\ReturnTypeWillChange]
     public function getDocComment()
     {
         if ($this->docComment === null) {

src/LeanMapper/Repository.php

@@ -75,6 +75,9 @@ public function &__get(string $name)
     }
 
 
+    /**
+     * @return Fluent<int, DibiRow>
+     */
     protected function createFluent(/*$filterArg1, $filterArg2, ...*/): Fluent
     {
         $table = $this->getTable();

src/LeanMapper/Result.php

@@ -616,6 +616,7 @@ public function __wakeup()
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $key = current($this->keys);
@@ -632,6 +633,7 @@ public function next(): void
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return current($this->keys);
@@ -901,6 +903,7 @@ private function buildUnionStrategySql(array $ids, string $table, string $viaCol
 
     /**
      * @param  array<int|string>|null $relatedKeys
+     * @return Fluent<int, DibiRow>
      */
     private function createTableSelection(string $table, ?array $relatedKeys = null): Fluent
     {
@@ -926,6 +929,7 @@ private function translateStrategy(?string $strategy): string
 
 
     /**
+     * @param  Fluent<int, DibiRow> $statement
      * @throws InvalidArgumentException
      */
     private function applyFiltering(Fluent $statement, Filtering $filtering): ?FilteringResultDecorator

src/LeanMapper/ResultProxy.php

@@ -55,6 +55,7 @@ public function setReferencingResult(Result $referencingResult, string $table, ?
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->result->current();
@@ -70,6 +71,7 @@ public function next(): void
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->result->key();

src/LeanMapper/Row.php

@@ -221,7 +221,7 @@ public function referencing(string $table, ?string $viaColumn = null, ?Filtering
     }
 
 
-    public function setReferencedRow(?self $row = null, string $viaColumn): void
+    public function setReferencedRow(?self $row, string $viaColumn): void
     {
         $this->referencedRows[$viaColumn] = $row;
     }