Merge pull request #14 from joelbladt/main

joelbladt · web-flow · commit 5ee5603797e1 · 2025-07-04T12:25:50.000+02:00
Update 2.x
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -26,11 +26,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
-        phpunit: ['11.0', '11.4']
-        phpstan: ['2.1']
-        paratest: ['7.6', '7.8']
-        larastan: ['v3.1']
+        php: [ 8.3, 8.4 ]
+        phpunit: [ '12.1', '12.2' ]
+        phpstan: [ '2.1' ]
+        paratest: [ '7.8', '7.9', '7.10' ]
+        larastan: [ 'v3.5' ]
 
     name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - with Paratest ${{ matrix.paratest }} - PHPStan ${{ matrix.phpstan }} - Larastan ${{ matrix.larastan }}
 
@@ -51,9 +51,9 @@ jobs:
           REDIS_LIBS: liblz4-dev, liblzf-dev, libzstd-dev
 
       - name: Set Framework version
-        run: composer config version "11.x-dev"
+        run: composer config version "12.x-dev"
 
-      - name: Set minimum PHP 8.2 versions
+      - name: Set minimum PHP 8.3 versions
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
@@ -96,7 +96,7 @@ jobs:
           command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: php artisan test --parallel --configuration="phpunit.xml" --coverage-clover=build/logs/clover.xml
+        run: php artisan test --parallel --configuration="phpunit.xml.dist" --coverage-clover=build/logs/clover.xml
         env:
           DB_CONNECTION: sqlite
           DB_DATABASE: ":memory:"
diff --git a/app/Http/Resources/BaseResourceCollection.php b/app/Http/Resources/BaseResourceCollection.php
@@ -7,7 +7,7 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 
 /**
- * @property LengthAwarePaginator<self> $resource
+ * @property LengthAwarePaginator<int, self> $resource
  */
 class BaseResourceCollection extends ResourceCollection
 {
diff --git a/app/Interfaces/BookRepositoryInterface.php b/app/Interfaces/BookRepositoryInterface.php
@@ -10,7 +10,7 @@
 interface BookRepositoryInterface
 {
     /**
-     * @return LengthAwarePaginator<Book>
+     * @return LengthAwarePaginator<int, Book>
      */
     public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator;
 
diff --git a/app/Interfaces/PublisherRepositoryInterface.php b/app/Interfaces/PublisherRepositoryInterface.php
@@ -11,14 +11,14 @@
 interface PublisherRepositoryInterface
 {
     /**
-     * @return LengthAwarePaginator<Publisher>
+     * @return LengthAwarePaginator<int, Publisher>
      */
     public function getAllPublisher(): LengthAwarePaginator;
 
     public function findPublisherById(int $id): ?Publisher;
 
     /**
-     * @return LengthAwarePaginator<Book>
+     * @return LengthAwarePaginator<int, Book>
      */
     public function findBooksByPublisherId(
         int $id,
diff --git a/app/Repositories/BookRepository.php b/app/Repositories/BookRepository.php
@@ -12,7 +12,7 @@
 class BookRepository implements BookRepositoryInterface
 {
     /**
-     * @return LengthAwarePaginator<Book>
+     * @return LengthAwarePaginator<int, Book>
      */
     public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator
     {
diff --git a/app/Repositories/PublisherRepository.php b/app/Repositories/PublisherRepository.php
@@ -13,7 +13,7 @@
 class PublisherRepository implements PublisherRepositoryInterface
 {
     /**
-     * @return LengthAwarePaginator<Publisher>
+     * @return LengthAwarePaginator<int, Publisher>
      */
     public function getAllPublisher(int $perPage = 10, int $page = 1): LengthAwarePaginator
     {
@@ -26,7 +26,7 @@ public function findPublisherById(int $id): ?Publisher
     }
 
     /**
-     * @return LengthAwarePaginator<Book>
+     * @return LengthAwarePaginator<int, Book>
      *
      * @throws PublisherNotFoundException
      */
diff --git a/app/Services/BookService.php b/app/Services/BookService.php
@@ -22,7 +22,7 @@ public function __construct(
     }
 
     /**
-     * @return LengthAwarePaginator<Book>
+     * @return LengthAwarePaginator<int, Book>
      */
     public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator
     {
diff --git a/app/Services/PublisherService.php b/app/Services/PublisherService.php
@@ -19,7 +19,7 @@ public function __construct(
     }
 
     /**
-     * @return LengthAwarePaginator<Publisher>
+     * @return LengthAwarePaginator<int, Publisher>
      */
     public function getAllPublisher(int $perPage = 10, int $page = 1): LengthAwarePaginator
     {
@@ -41,7 +41,7 @@ public function findPublisherById(int $id): ?Publisher
     }
 
     /**
-     * @return LengthAwarePaginator<Book>
+     * @return LengthAwarePaginator<int, Book>
      */
     public function findBooksByPublisherId(
         int $publisherId,
diff --git a/composer.json b/composer.json
@@ -5,22 +5,23 @@
     "keywords": ["laravel", "framework"],
     "license": "MIT",
     "require": {
-        "php": "^8.2",
-        "darkaonline/l5-swagger": "^8.6",
-        "laravel/framework": "^12.0",
-        "laravel/tinker": "^2.9"
+        "php": "^8.3",
+        "darkaonline/l5-swagger": "^9.0",
+        "laravel/framework": "^12.19",
+        "laravel/tinker": "^2.10"
     },
     "require-dev": {
-        "brianium/paratest": "^7.6",
-        "fakerphp/faker": "^1.23",
-        "larastan/larastan": "^v3.1",
-        "laravel/pail": "^1.1",
-        "laravel/pint": "^1.13",
-        "laravel/sail": "^1.26",
+        "brianium/paratest": "^7.10",
+        "fakerphp/faker": "^1.24",
+        "larastan/larastan": "^v3.5",
+        "laravel/pail": "^1.2",
+        "laravel/pint": "^1.23",
+        "laravel/sail": "^1.43",
         "mockery/mockery": "^1.6",
-        "nunomaduro/collision": "^8.1",
+        "nunomaduro/collision": "^v8.8",
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^11.4"
+        "phpunit/phpunit": "^12.2.6",
+        "roave/security-advisories": "dev-latest"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Illuminate\Pagination\LengthAwarePaginator;`
`8`	`8`
`9`	`9`	`/**`
`10`		`- * @property LengthAwarePaginator<self> $resource`
	`10`	`+ * @property LengthAwarePaginator<int, self> $resource`
`11`	`11`	`*/`
`12`	`12`	`class BaseResourceCollection extends ResourceCollection`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`interface BookRepositoryInterface`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`		`- * @return LengthAwarePaginator<Book>`
	`13`	`+ * @return LengthAwarePaginator<int, Book>`
`14`	`14`	`*/`
`15`	`15`	`public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator;`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`class BookRepository implements BookRepositoryInterface`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * @return LengthAwarePaginator<Book>`
	`15`	`+ * @return LengthAwarePaginator<int, Book>`
`16`	`16`	`*/`
`17`	`17`	`public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`class PublisherRepository implements PublisherRepositoryInterface`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * @return LengthAwarePaginator<Publisher>`
	`16`	`+ * @return LengthAwarePaginator<int, Publisher>`
`17`	`17`	`*/`
`18`	`18`	`public function getAllPublisher(int $perPage = 10, int $page = 1): LengthAwarePaginator`
`19`	`19`	`{`
`@@ -26,7 +26,7 @@ public function findPublisherById(int $id): ?Publisher`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`29`		`- * @return LengthAwarePaginator<Book>`
	`29`	`+ * @return LengthAwarePaginator<int, Book>`
`30`	`30`	`*`
`31`	`31`	`* @throws PublisherNotFoundException`
`32`	`32`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * @return LengthAwarePaginator<Book>`
	`25`	`+ * @return LengthAwarePaginator<int, Book>`
`26`	`26`	`*/`
`27`	`27`	`public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct(`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/**`
`22`		`- * @return LengthAwarePaginator<Publisher>`
	`22`	`+ * @return LengthAwarePaginator<int, Publisher>`
`23`	`23`	`*/`
`24`	`24`	`public function getAllPublisher(int $perPage = 10, int $page = 1): LengthAwarePaginator`
`25`	`25`	`{`
`@@ -41,7 +41,7 @@ public function findPublisherById(int $id): ?Publisher`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * @return LengthAwarePaginator<Book>`
	`44`	`+ * @return LengthAwarePaginator<int, Book>`
`45`	`45`	`*/`
`46`	`46`	`public function findBooksByPublisherId(`
`47`	`47`	`int $publisherId,`