diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69e3afe..ab45988 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: run: "composer test-coverage" - name: "Run PHP CS Check" - run: "PHP_CS_FIXER_IGNORE_ENV=1 composer cs-check" + run: "composer cs-check" - name: "Run PHPStan" run: "composer analyze" @@ -119,7 +119,7 @@ jobs: run: "composer test-coverage" - name: "Run PHP CS Check" - run: "PHP_CS_FIXER_IGNORE_ENV=1 composer cs-check" + run: "composer cs-check" - name: "Run PHPStan" run: "composer analyze" @@ -133,4 +133,46 @@ jobs: - name: "Run infection" env: INFECTION_BADGE_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }} + run: "composer infection-ci" + + php84: + name: PHP 8.4 + runs-on: ubuntu-latest + steps: + - name: "Checkout" + uses: "actions/checkout@v4" + with: + fetch-depth: 2 + + - name: "Install PHP 8.4" + uses: "shivammathur/setup-php@v2" + with: + php-version: "8.4" + + - name: "Cache composer packages" + uses: "actions/cache@v4" + with: + path: "vendor" + key: "php-composer-locked-php-8.4-${{ hashFiles('**/composer.lock') }}" + restore-keys: "php-composer-locked-php-8.3-" + + - name: "Install dependencies with composer" + run: "composer install --no-interaction --prefer-dist" + + - name: "Run PHPUnit Tests" + run: "composer test-coverage" + + - name: "Run PHP CS Check" + run: "PHP_CS_FIXER_IGNORE_ENV=1 composer cs-check" + + - name: "Run PHPStan" + run: "composer analyze" + + - name: "Run Psalm" + run: "composer psalm" + + - name: "PHP Lint" + run: "composer lint" + + - name: "Run infection" run: "composer infection-ci" \ No newline at end of file diff --git a/.gitignore b/.gitignore index bec9efc..4704602 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # PHPUnit specific .phpunit.result.cache +.php-cs-fixer.cache # Composer /vendor/ diff --git a/README.md b/README.md index a464f82..8d9f729 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ JMS-Serializer: https://github.com/schmittjoh/serializer You are also welcome to use the Issue Tracker to set bugs, improvements or upgrade requests. +> Please use the new package https://github.com/Dropelikeit/laravel-responsefactory in the future. The new package contains some new and useful functions! +This package will only be supported until the end of Laravel 11. Until then, you should use the new package. + ### Installation ``` composer require dropelikeit/laravel-jms-serializer ``` diff --git a/composer.json b/composer.json index 4466ba8..9f66d95 100644 --- a/composer.json +++ b/composer.json @@ -4,6 +4,7 @@ "keywords": ["Lumen", "Laravel", "JMS Serializer", "JMS"], "minimum-stability": "stable", "license": "MIT", + "abandoned": "dropelikeit/laravel-responsefactory", "authors": [ { "name": "Marcel Strahl", @@ -44,10 +45,10 @@ "phpstan/phpstan-phpunit": "^1.3", "php-parallel-lint/php-parallel-lint": "^1.3", "symfony/cache": "^6.3|^7.0", - "vimeo/psalm": "^5.23", - "psalm/plugin-laravel": "^2.10", + "vimeo/psalm": "^5.0|^6.0", + "psalm/plugin-laravel": "^2.11", "psalm/plugin-phpunit": "^0.19", - "infection/infection": "^0.27.10", + "infection/infection": "0.27.10|^0.29.10", "laravel/framework": "^10.0|^v11.0" }, "scripts": { diff --git a/src/Config/Config.php b/src/Config/Config.php index 116b230..ee3be57 100644 --- a/src/Config/Config.php +++ b/src/Config/Config.php @@ -45,8 +45,8 @@ private function __construct( array $customHandlers, ) { $cacheDir = sprintf('%s%s', $cacheDir, self::CACHE_DIR); - #Assert::stringNotEmpty($cacheDir); + // @phpstan-ignore-next-line $this->cacheDir = $cacheDir; $this->customHandlers = $customHandlers; }