fix: phpstan errors

Author: lotyp

.github/workflows/ci.yml

@@ -42,6 +42,12 @@ jobs:
         if: steps.cached-composer-dependencies.outputs.cache-hit != 'true'
         run: composer install
 
+      - name: 🛠️ Prepare environment
+        run: |
+          mkdir -p ./.build/php-cs-fixer
+          mkdir -p ./.build/phpstan
+          mkdir -p ./.build/phpunit
+
       - name: 🚨 Run coding standards task
         run: composer cs:diff
         env:

src/Bridge/Laravel/Factories/Factory.php

@@ -119,6 +119,7 @@ protected function store(Collection $results): void
             $orm = app(ORMInterface::class);
 
             $repository = $orm->getRepository($this->modelName());
+            // @phpstan-ignore-next-line
             $repository->persist($entity);
         });
     }

src/Testing/Concerns/InteractsWithDatabase.php

@@ -6,17 +6,13 @@
 
 use Cycle\Database\DatabaseProviderInterface;
 use Exception;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\Constraint\LogicalNot as ReverseConstraint;
 use WayOfDev\Cycle\Testing\Constraints\CountInDatabase;
 use WayOfDev\Cycle\Testing\Constraints\HasInDatabase;
 use WayOfDev\Cycle\Testing\Constraints\NotSoftDeletedInDatabase;
 use WayOfDev\Cycle\Testing\Constraints\SoftDeletedInDatabase;
 
-use function in_array;
-
 /**
  * @method void assertThat($value, Constraint $constraint, string $message = '')
  */
@@ -133,15 +129,6 @@ protected function assertNotSoftDeleted($table, array $data = [], $connection =
         return $this;
     }
 
-    /**
-     * @param string|object $model
-     */
-    protected function isSoftDeletableModel($model): bool
-    {
-        return $model instanceof Model
-            && in_array(SoftDeletes::class, class_uses_recursive($model));
-    }
-
     /**
      * @param string|object $table
      */

src/Testing/Constraints/HasInDatabase.php

@@ -6,12 +6,11 @@
 
 use Cycle\Database\DatabaseInterface;
 use Cycle\Database\DatabaseProviderInterface;
+use Cycle\Database\Query\SelectQuery;
 use JsonException;
 use PHPUnit\Framework\Constraint\Constraint;
 use Throwable;
 
-use function array_key_first;
-use function array_keys;
 use function json_encode;
 use function sprintf;
 
@@ -30,11 +29,9 @@ public function __construct(DatabaseProviderInterface $database, array $data)
         $this->database = $database->database();
     }
 
-    /**
-     * @param string $table
-     */
-    public function matches($table): bool
+    public function matches(mixed $table): bool
     {
+        /** @var SelectQuery $tableInterface */
         $tableInterface = $this->database->table($table);
 
         try {
@@ -52,10 +49,9 @@ public function matches($table): bool
     public function failureDescription(mixed $table): string
     {
         return sprintf(
-            "a row in the table [%s] matches the attributes %s.\n\n%s",
+            'a row in the table [%s] matches the attributes %s.',
             $table,
-            $this->toString(JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE),
-            $this->getAdditionalInfo($table)
+            $this->toString(JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)
         );
     }
 
@@ -66,34 +62,4 @@ public function toString(int $options = 0): string
     {
         return json_encode($this->data, JSON_THROW_ON_ERROR | $options);
     }
-
-    protected function getAdditionalInfo(string $table): string
-    {
-        $query = $this->database->table($table);
-
-        $similarResults = $query->where(
-            array_key_first($this->data),
-            $this->data[array_key_first($this->data)]
-        )->select(array_keys($this->data))->limit($this->show)->get();
-
-        if ($similarResults->isNotEmpty()) {
-            $description = 'Found similar results: ' . json_encode($similarResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
-        } else {
-            $query = $this->database->table($table);
-
-            $results = $query->select(array_keys($this->data))->limit($this->show)->get();
-
-            if ($results->isEmpty()) {
-                return 'The table is empty';
-            }
-
-            $description = 'Found: ' . json_encode($results, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
-        }
-
-        if ($query->count() > $this->show) {
-            $description .= sprintf(' and %s others', $query->count() - $this->show);
-        }
-
-        return $description;
-    }
 }

src/Testing/Constraints/NotSoftDeletedInDatabase.php

@@ -6,6 +6,7 @@
 
 use Cycle\Database\DatabaseInterface;
 use Cycle\Database\DatabaseProviderInterface;
+use Cycle\Database\Query\SelectQuery;
 use PHPUnit\Framework\Constraint\Constraint;
 
 use function json_encode;
@@ -30,9 +31,12 @@ public function __construct(DatabaseProviderInterface $database, array $data, st
 
     public function matches($table): bool
     {
-        return $this->database->table($table)
+        /** @var SelectQuery $query */
+        $query = $this->database->table($table);
+
+        return $query
             ->where($this->data)
-            ->whereNull($this->deletedAtColumn)
+            ->where($this->deletedAtColumn, null)
             ->count() > 0;
     }
 
@@ -53,11 +57,12 @@ public function toString(): string
 
     protected function getAdditionalInfo($table)
     {
+        /** @var SelectQuery $query */
         $query = $this->database->table($table);
 
-        $results = $query->limit($this->show)->get();
+        $results = $query->limit($this->show)->fetchAll();
 
-        if ($results->isEmpty()) {
+        if ([] === $results) {
             return 'The table is empty';
         }
 

src/Testing/Constraints/SoftDeletedInDatabase.php

@@ -6,6 +6,7 @@
 
 use Cycle\Database\DatabaseInterface;
 use Cycle\Database\DatabaseProviderInterface;
+use Cycle\Database\Query\SelectQuery;
 use PHPUnit\Framework\Constraint\Constraint;
 
 use function json_encode;
@@ -30,9 +31,12 @@ public function __construct(DatabaseProviderInterface $database, array $data, st
 
     public function matches($table): bool
     {
-        return $this->database->table($table)
+        /** @var SelectQuery $query */
+        $query = $this->database->table($table);
+
+        return $query
             ->where($this->data)
-            ->whereNotNull($this->deletedAtColumn)
+            ->where($this->deletedAtColumn, 'IS NOT', null)
             ->count() > 0;
     }
 
@@ -53,11 +57,12 @@ public function toString(): string
 
     protected function getAdditionalInfo($table): string
     {
+        /** @var SelectQuery $query */
         $query = $this->database->table($table);
 
-        $results = $query->limit($this->show)->get();
+        $results = $query->limit($this->show)->fetchAll();
 
-        if ($results->isEmpty()) {
+        if ([] === $results) {
             return 'The table is empty';
         }
 

tests/app/database/migrations/cycle/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore