diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml index db81606..790372e 100644 --- a/.github/workflows/code-style.yaml +++ b/.github/workflows/code-style.yaml @@ -17,7 +17,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 - name: Validate composer.json and composer.lock run: composer validate --strict diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml index 18c7226..cbef257 100644 --- a/.github/workflows/phpstan.yaml +++ b/.github/workflows/phpstan.yaml @@ -17,7 +17,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 - name: Validate composer.json and composer.lock run: composer validate --strict diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 153a328..ec67e41 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - php-versions: [8.0, 8.1] + php-versions: [8.1, 8.2] steps: - name: Checkout diff --git a/.github/workflows/psalm.yaml b/.github/workflows/psalm.yaml deleted file mode 100644 index a1e25d9..0000000 --- a/.github/workflows/psalm.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: psalm - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - psalm: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.0 - - - name: Validate composer.json and composer.lock - run: composer validate --strict - - - name: Cache Composer packages - id: composer-cache - uses: actions/cache@v2 - with: - path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php- - - - name: Install dependencies - run: composer install --prefer-dist --no-progress - - - name: Run psalm - run: composer psalm diff --git a/.github/workflows/rector.yaml b/.github/workflows/rector.yaml index 2820981..6947580 100644 --- a/.github/workflows/rector.yaml +++ b/.github/workflows/rector.yaml @@ -17,7 +17,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 - name: Validate composer.json and composer.lock run: composer validate --strict diff --git a/composer.json b/composer.json index 3c4c971..53bf9e5 100644 --- a/composer.json +++ b/composer.json @@ -22,18 +22,18 @@ } ], "require": { - "php": "^8.0", - "bavix/laravel-wallet": "^9.0|^10.0" + "php": "^8.1", + "bavix/laravel-wallet": "^10.0" }, "require-dev": { + "driftingly/rector-laravel": "^0.21", "ergebnis/phpstan-rules": "^1.0", - "infection/infection": "^0.26", - "orchestra/testbench": "^7.0", - "phpstan/phpstan": "^1.2", - "phpunit/phpunit": "^9.5", - "rector/rector": "^0.14", - "symplify/easy-coding-standard": "^11.0", - "vimeo/psalm": "^4.13" + "infection/infection": "^0.27", + "orchestra/testbench": "^8.5", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^10.2", + "rector/rector": "^0.17", + "symplify/easy-coding-standard": "^11.5" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index b5d92a5..9781990 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,9 +1,6 @@ - + - - src/ - @@ -18,4 +15,9 @@ + + + src/ + + diff --git a/psalm.xml b/psalm.xml deleted file mode 100644 index f5e279d..0000000 --- a/psalm.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/rector.php b/rector.php index d3545f2..1fbc7fc 100644 --- a/rector.php +++ b/rector.php @@ -3,9 +3,8 @@ declare(strict_types=1); use Rector\Config\RectorConfig; -use Rector\Laravel\Set\LaravelSetList; -use Rector\Php74\Rector\Property\TypedPropertyRector; use Rector\Set\ValueObject\SetList; +use RectorLaravel\Set\LaravelSetList; return static function (RectorConfig $config): void { $config->parallel(); @@ -17,11 +16,5 @@ // Define what rule sets will be applied $config->import(LaravelSetList::LARAVEL_90); $config->import(SetList::DEAD_CODE); - $config->import(SetList::PHP_80); - - // get services (needed for register a single rule) - $services = $config->services(); - - // register a single rule - $services->set(TypedPropertyRector::class); + $config->import(SetList::PHP_81); };