chore: PHPStan fixes

Author: ollieread

src/Concise.php

@@ -5,7 +5,6 @@
 
 use Articulate\Concise\Contracts\EntityMapper;
 use Articulate\Concise\Contracts\Repository;
-use Closure;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Database\DatabaseManager;
 use InvalidArgumentException;
@@ -226,8 +225,8 @@ public function repository(string $class): Repository
         $repository = $this->repositories[$class] ?? null;
 
         if ($repository !== null) {
-            return $repository;
             /** @phpstan-ignore return.type */
+            return $repository;
         }
 
         $repositoryClass = $mapper->repository();

src/ConciseServiceProvider.php

@@ -18,13 +18,22 @@ public function register(): void
         $this->booted($this->registerRepositories(...));
     }
 
+    /**
+     * @param \Articulate\Concise\Concise $concise
+     *
+     * @return void
+     */
     protected function registerRepositories(Concise $concise): void
     {
-        foreach ($concise->getEntityMappers() as $mapper) {
+        /**
+         * @var class-string $entity
+         * @var \Articulate\Concise\Contracts\EntityMapper<*> $mapper
+         */
+        foreach ($concise->getEntityMappers() as $entity => $mapper) {
             $repo = $mapper->repository();
 
             if ($repo !== null) {
-                $this->app->bind($repo, fn () => $concise->repository($mapper->getClass()));
+                $this->app->bind($repo, fn () => $concise->repository($entity));
             }
         }
     }

src/Support/BaseRepository.php

@@ -107,6 +107,16 @@ protected function hydrate(?array $data): ?object
      */
     protected function hydrateMany(Collection $collection): Collection
     {
-        return $collection->map(fn (array $data) => $this->hydrate($data));
+        $newCollection = new Collection();
+
+        foreach ($collection as $data) {
+            $entity = $this->hydrate($data);
+
+            if ($entity !== null) {
+                $newCollection->push($entity);
+            }
+        }
+
+        return $newCollection;
     }
 }

src/Support/MapperServiceProvider.php

@@ -8,6 +8,9 @@
 
 abstract class MapperServiceProvider extends ServiceProvider
 {
+    /**
+     * @var array<class-string, class-string<\Articulate\Concise\Contracts\EntityMapper<*>>>
+     */
     protected array $mappers = [];
 
     public function register(): void