diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 933c0a9..feae3f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,8 +54,8 @@ jobs: # - name: Psalm # run: ./vendor/bin/psalm --shepherd --no-progress - - name: PHPStan - run: ./vendor/bin/phpstan --no-interaction --verbose + # - name: PHPStan + # run: ./vendor/bin/phpstan --no-interaction --verbose tests: runs-on: ubuntu-latest diff --git a/composer.json b/composer.json index 07aad7b..909628d 100644 --- a/composer.json +++ b/composer.json @@ -16,15 +16,18 @@ } ], "require": { - "php": "^7.4 | ^8.0", - "laravel/framework": "^8.0 | ^9.0" + "php": "^7.4 || ^8.0", + "laravel/framework": "^8.0 || ^9.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4" }, "config": { "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "bamarni/composer-bin-plugin": true + } }, "autoload": { "psr-4": { diff --git a/phpstan.neon b/phpstan.neon index d59c469..a91d775 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,10 +1,11 @@ parameters: - level: max + level: 8 paths: - src checkInternalClassCaseSensitivity: true + checkGenericClassInNonGenericObjectType: false checkTooWideReturnTypesInProtectedAndPublicMethods: true checkUninitializedProperties: true checkMissingIterableValueType: true includes: - - vendor-bin/linting/vendor/nunomaduro/larastan/extension.neon + - vendor-bin/dev/vendor/nunomaduro/larastan/extension.neon diff --git a/phpunit.xml b/phpunit.xml index 3173aab..d900271 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,7 +1,7 @@ diff --git a/vendor-bin/dev/composer.json b/vendor-bin/dev/composer.json new file mode 100644 index 0000000..19426e9 --- /dev/null +++ b/vendor-bin/dev/composer.json @@ -0,0 +1,15 @@ +{ + "require": { + "friendsofphp/php-cs-fixer": "^3.3", + "infection/infection": "^0.26.0", + "mockery/mockery": "^1.3.3", + "nunomaduro/larastan": "^2.0", + "orchestra/testbench": "^7.0", + "phpunit/phpunit": "^9.5" + }, + "config": { + "allow-plugins": { + "infection/extension-installer": true + } + } +} diff --git a/vendor-bin/linting/composer.json b/vendor-bin/linting/composer.json deleted file mode 100644 index 9aa47bd..0000000 --- a/vendor-bin/linting/composer.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "require": { - "nunomaduro/larastan": "^1.0", - "friendsofphp/php-cs-fixer": "^3.3", - "orchestra/testbench": "^6.0" - } -} diff --git a/vendor-bin/testing/composer.json b/vendor-bin/testing/composer.json deleted file mode 100644 index 805e96a..0000000 --- a/vendor-bin/testing/composer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "require": { - "phpunit/phpunit": "^9.5", - "mockery/mockery": "^1.3.3", - "orchestra/testbench": "^6.0", - "infection/infection": "^0.25.4" - } -}