Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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
Expand Down Expand Up @@ -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:"
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Resources/BaseResourceCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Illuminate\Pagination\LengthAwarePaginator;

/**
* @property LengthAwarePaginator<self> $resource
* @property LengthAwarePaginator<int, self> $resource
*/
class BaseResourceCollection extends ResourceCollection
{
Expand Down
2 changes: 1 addition & 1 deletion app/Interfaces/BookRepositoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
interface BookRepositoryInterface
{
/**
* @return LengthAwarePaginator<Book>
* @return LengthAwarePaginator<int, Book>
*/
public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator;

Expand Down
4 changes: 2 additions & 2 deletions app/Interfaces/PublisherRepositoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/Repositories/BookRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions app/Repositories/PublisherRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -26,7 +26,7 @@ public function findPublisherById(int $id): ?Publisher
}

/**
* @return LengthAwarePaginator<Book>
* @return LengthAwarePaginator<int, Book>
*
* @throws PublisherNotFoundException
*/
Expand Down
2 changes: 1 addition & 1 deletion app/Services/BookService.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function __construct(
}

/**
* @return LengthAwarePaginator<Book>
* @return LengthAwarePaginator<int, Book>
*/
public function getAllBooks(int $perPage = 10, int $page = 1): LengthAwarePaginator
{
Expand Down
4 changes: 2 additions & 2 deletions app/Services/PublisherService.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function __construct(
}

/**
* @return LengthAwarePaginator<Publisher>
* @return LengthAwarePaginator<int, Publisher>
*/
public function getAllPublisher(int $perPage = 10, int $page = 1): LengthAwarePaginator
{
Expand All @@ -41,7 +41,7 @@ public function findPublisherById(int $id): ?Publisher
}

/**
* @return LengthAwarePaginator<Book>
* @return LengthAwarePaginator<int, Book>
*/
public function findBooksByPublisherId(
int $publisherId,
Expand Down
25 changes: 13 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading