Merge pull request #6 from wimski/update/laravel-dependency

Add Laravel 9 support
wimski · Feb 23, 2022 · 0e590f2 · 0e590f2
2 parents ae7ed97 + 966794d
commit 0e590f2
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 30 deletions.
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.0]
+                php: [8.1]
                 dependency-version: [prefer-stable]
 
         name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.0]
+                php: [8.1]
                 dependency-version: [prefer-stable]
 
         name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [7.4, 8.0]
+                php: [7.4, 8.0, 8.1]
                 dependency-version: [prefer-lowest, prefer-stable]
 
         name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ This changelog is initialized in release 1.0.0
 
 ## [Unreleased]
 
+### Added
+* Laravel 9 support
+
 ## [v2.1.1] - 2022-01-18
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -18,12 +18,12 @@
     "homepage": "https://github.com/wimski/laravel-model-repositories",
     "require": {
         "php": "^7.4 || ^8.0",
-        "laravel/framework": "^8.0"
+        "laravel/framework": "^8.0 || ^9.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.4",
-        "nunomaduro/larastan": "^1.0",
-        "orchestra/testbench": "^6.23",
+        "mockery/mockery": "^1.5",
+        "nunomaduro/larastan": "^1.0 || ^2.0",
+        "orchestra/testbench": "^6.23 || ^7.0",
         "phpstan/phpstan-mockery": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^9.5"

diff --git a/src/Contracts/Repositories/ModelRepositoryInterface.php b/src/Contracts/Repositories/ModelRepositoryInterface.php
@@ -31,44 +31,44 @@ public function find($key, string ...$column);
     public function findOrFail($key, string ...$column);
 
     /**
-     * @param int[]|string[]|Arrayable $keys
-     * @param string                   ...$column
-     * @return Collection<T>
+     * @param int[]|string[]|Arrayable<int|string, mixed> $keys
+     * @param string                                      ...$column
+     * @return Collection<int, T>
      */
     public function findMany($keys, string ...$column): Collection;
 
     /**
      * @param string|mixed[]|Closure|Expression $column
-     * @param mixed                                                   $operator
-     * @param mixed                                                   $value
-     * @param string                                                  $boolean
+     * @param mixed                             $operator
+     * @param mixed                             $value
+     * @param string                            $boolean
      * @return T|null
      */
     public function firstWhere($column, $operator = null, $value = null, string $boolean = 'and');
 
     /**
      * @param string|mixed[]|Closure|Expression $column
-     * @param mixed                                                   $operator
-     * @param mixed                                                   $value
-     * @param string                                                  $boolean
+     * @param mixed                             $operator
+     * @param mixed                             $value
+     * @param string                            $boolean
      * @return T
      * @throws ModelNotFoundException
      */
     public function firstWhereOrFail($column, $operator = null, $value = null, string $boolean = 'and');
 
     /**
      * @param string|mixed[]|Closure|Expression $column
-     * @param mixed                                                   $operator
-     * @param mixed                                                   $value
-     * @param string                                                  $boolean
-     * @return Collection<T>
+     * @param mixed                             $operator
+     * @param mixed                             $value
+     * @param string                            $boolean
+     * @return Collection<int, T>
      */
     public function where($column, $operator = null, $value = null, string $boolean = 'and'): Collection;
 
     /**
      *
      * @param string ...$column
-     * @return Collection<T>
+     * @return Collection<int, T>
      */
     public function all(string ...$column): Collection;
 }
diff --git a/src/Repositories/AbstractModelRepository.php b/src/Repositories/AbstractModelRepository.php
@@ -37,7 +37,7 @@ public function findOrFail($key, string ...$column)
 
     public function findMany($keys, string ...$column): Collection
     {
-        /** @var Collection<T> $models */
+        /** @var Collection<int, T> $models */
         $models = $this->model->findMany($keys, $this->parseColumns(...$column));
 
         return $models;
@@ -65,15 +65,15 @@ public function firstWhereOrFail($column, $operator = null, $value = null, strin
 
     public function where($column, $operator = null, $value = null, string $boolean = 'and'): Collection
     {
-        /** @var Collection<T> $models */
+        /** @var Collection<int, T> $models */
         $models = $this->model->where($column, $operator, $value, $boolean)->get();
 
         return $models;
     }
 
     public function all(string ...$column): Collection
     {
-        /** @var Collection<T> $models */
+        /** @var Collection<int, T> $models */
         $models = $this->model->all($this->parseColumns(...$column));
 
         return $models;
@@ -94,6 +94,6 @@ protected function parseColumns(string ...$column): array
      */
     protected function throwModelNotFoundException(...$key): void
     {
-        throw (new ModelNotFoundException())->setModel(get_class($this->model), $key);
+        throw (new ModelNotFoundException())->setModel(get_class($this->model), array_values($key));
     }
 }
diff --git a/tests/Integration/Repositories/ModelRepositoryTest.php b/tests/Integration/Repositories/ModelRepositoryTest.php
@@ -16,7 +16,7 @@ class ModelRepositoryTest extends AbstractIntegrationTest
     protected ModelWithRepositoryRepository $repository;
 
     /**
-     * @var Collection<ModelWithRepository>
+     * @var Collection<int, ModelWithRepository>
      */
     protected Collection $models;
 
@@ -314,8 +314,8 @@ public function it_returns_a_collection_with_a_specific_columns_for_all(): void
     }
 
     /**
-     * @param Collection<ModelWithRepository> $expected
-     * @param Collection<ModelWithRepository> $actual
+     * @param Collection<int, ModelWithRepository> $expected
+     * @param Collection<int, ModelWithRepository> $actual
      */
     protected function assertSameModels(Collection $expected, Collection $actual): void
     {
@@ -330,7 +330,7 @@ protected function assertSameModels(Collection $expected, Collection $actual): v
     }
 
     /**
-     * @param Collection<ModelWithRepository> $models
+     * @param Collection<int, ModelWithRepository> $models
      * @param string                          $column
      */
     protected function assertModelsHaveColumn(Collection $models, string $column): void
@@ -344,7 +344,7 @@ protected function assertModelsHaveColumn(Collection $models, string $column): v
     }
 
     /**
-     * @param Collection<ModelWithRepository> $models
+     * @param Collection<int, ModelWithRepository> $models
      * @param string                          $column
      */
     protected function assertModelsDoNotHaveColumn(Collection $models, string $column): void

diff --git a/tests/Laravel/App/Models/ModelWithRepository.php b/tests/Laravel/App/Models/ModelWithRepository.php
@@ -19,6 +19,9 @@ class ModelWithRepository extends Model
 {
     use HasFactory;
 
+    /**
+     * @return Factory<ModelWithRepository>
+     */
     protected static function newFactory(): Factory
     {
         return new ModelWithRepositoryFactory();

diff --git a/tests/Laravel/Database/Factories/ModelWithRepositoryFactory.php b/tests/Laravel/Database/Factories/ModelWithRepositoryFactory.php
@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Wimski\ModelRepositories\Tests\Laravel\App\Models\ModelWithRepository;
 
+/**
+ * @extends Factory<ModelWithRepository>
+ */
 class ModelWithRepositoryFactory extends Factory
 {
     protected $model = ModelWithRepository::class;