From 6aa6ca1cc2754f697a0e9322c97a02f48e6e1e8c Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Mon, 12 Aug 2024 20:38:40 +0200 Subject: [PATCH] fix: PHP version and update github actions --- .github/workflows/phpstan.yml | 2 +- .github/workflows/pint.yml | 8 +------- .github/workflows/tests.yml | 2 +- composer.json | 3 +-- packages/core/composer.json | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index cc52492a4..092846094 100755 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -38,7 +38,7 @@ jobs: coverage: none - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "shopper/core" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "shopper/core" --dev --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Run PHPStan run: ./vendor/bin/phpstan diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml index 54781937a..bc5c5631e 100755 --- a/.github/workflows/pint.yml +++ b/.github/workflows/pint.yml @@ -15,16 +15,10 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: 8.3 - - name: Set up Node - uses: actions/setup-node@v2 - name: Install dependencies - run: | - composer install --no-interaction - npm ci + run: composer install --no-interaction - name: Run Laravel Pint run: composer pint - - name: Run Prettier - run: npm run prettier - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v4 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aaceddf28..2510929d6 100755 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: coverage: none - name: Install Composer dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "shopper/core" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "shopper/core" --dev --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests env: diff --git a/composer.json b/composer.json index 2e48bbf5e..4a4148151 100755 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^8.2", + "php": "^8.1|^8.2", "ext-intl": "*", "composer-runtime-api": "^2.1" }, @@ -40,7 +40,6 @@ "pestphp/pest-plugin-livewire": "^2.1", "phpstan/phpstan": "^1.8", "phpunit/phpunit": "^10.5", - "reecem/mocker": "^1.2", "shopper/core": "*", "spatie/laravel-livewire-wizard": "^2.2", "stevebauman/location": "^7.2", diff --git a/packages/core/composer.json b/packages/core/composer.json index 571e42559..176c42e7a 100755 --- a/packages/core/composer.json +++ b/packages/core/composer.json @@ -4,7 +4,7 @@ "license": "MIT", "require": { "ext-intl": "*", - "php": "^8.2", + "php": "^8.1|^8.2", "filament/support": "^3.2", "laravel/prompts": "^0.1.15", "livewire/livewire": "^3.4",