From 293a61ad2a6701c493662a15f0a97c5de275d634 Mon Sep 17 00:00:00 2001 From: Marc Reichel Date: Sun, 10 Mar 2024 12:17:05 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A7=B9=20Cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/code-quality-pr.yml | 18 --------- .github/workflows/code-quality.yml | 5 +-- .github/workflows/code-style-pr.yml | 18 --------- .github/workflows/code-style.yml | 5 +-- .github/workflows/codecov.yml | 6 +-- .github/workflows/deploy-docs.yml | 6 +-- .github/workflows/tests-pr.yml | 58 --------------------------- .github/workflows/tests.yml | 12 ++---- .gitignore | 1 + composer.json | 4 +- phpunit.xml | 26 +++++------- 11 files changed, 24 insertions(+), 135 deletions(-) delete mode 100644 .github/workflows/code-quality-pr.yml delete mode 100644 .github/workflows/code-style-pr.yml delete mode 100644 .github/workflows/tests-pr.yml diff --git a/.github/workflows/code-quality-pr.yml b/.github/workflows/code-quality-pr.yml deleted file mode 100644 index c3a353d..0000000 --- a/.github/workflows/code-quality-pr.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: PHPStan (PR) - -on: - pull_request: - branches: [ main ] - paths-ignore: - - 'LICENSE' - - 'README.md' - -jobs: - phpstan-pr: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: composer install --prefer-dist --no-progress --dev - - name: Run analysis - run: composer stan diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index d8cc103..94c43db 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -3,9 +3,8 @@ name: PHPStan on: push: branches: [ main ] - paths-ignore: - - 'LICENSE' - - 'README.md' + pull_request: + branches: [ main ] jobs: phpstan: diff --git a/.github/workflows/code-style-pr.yml b/.github/workflows/code-style-pr.yml deleted file mode 100644 index 7cde8e0..0000000 --- a/.github/workflows/code-style-pr.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Pint (PR) - -on: - pull_request: - branches: [ main ] - paths-ignore: - - 'LICENSE' - - 'README.md' - -jobs: - pint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: composer install --prefer-dist --no-progress --dev - - name: Run pint - run: composer pint diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index de560fb..b84c223 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -3,9 +3,8 @@ name: Pint on: push: branches: [ main ] - paths-ignore: - - 'LICENSE' - - 'README.md' + pull_request: + branches: [ main ] jobs: pint: diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index f4f4351..18dd534 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -2,11 +2,7 @@ name: Code coverage on: push: - branches: - - main - paths-ignore: - - LICENSE - - README.md + branches: [ main ] jobs: build: diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 40d5525..a6033b5 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -2,10 +2,8 @@ name: Deploy docs on: push: - branches: - - main - paths: - - docs/**/* + branches: [ main ] + paths: [ docs/**/* ] workflow_dispatch: jobs: diff --git a/.github/workflows/tests-pr.yml b/.github/workflows/tests-pr.yml deleted file mode 100644 index cbcf9c4..0000000 --- a/.github/workflows/tests-pr.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Tests (PR) - -on: - pull_request: - branches: - - main - paths-ignore: - - LICENSE - - README.md - -jobs: - run-tests-pr: - runs-on: ${{ matrix.os }} - - strategy: - fail-fast: true - matrix: - os: [ubuntu-latest] - php: [8.3, 8.2, 8.1] - laravel: ['8.*', '9.*', '10.*', '11.*'] - stability: [prefer-stable] - include: - - laravel: 10.* - testbench: 8.* - - laravel: 9.* - testbench: 7.* - - laravel: 8.* - testbench: 6.* - - laravel: 11.* - testbench: 9.* - exclude: - - laravel: 11.* - php: 8.1 - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo - - - name: Setup problem matchers - run: | - echo "::add-matcher::${{ runner.tool_cache }}/php.json" - echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.stability }} --prefer-dist --no-interaction - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8057275..4c33c57 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,11 +2,9 @@ name: Tests on: push: - branches: - - main - paths-ignore: - - LICENSE - - README.md + branches: [ main ] + pull_request: + branches: [ main ] jobs: run-tests: @@ -17,15 +15,13 @@ jobs: matrix: os: [ubuntu-latest] php: [8.3, 8.2, 8.1] - laravel: ['8.*', '9.*', '10.*', '11.*'] + laravel: ['9.*', '10.*', '11.*'] stability: [prefer-stable] include: - laravel: 10.* testbench: 8.* - laravel: 9.* testbench: 7.* - - laravel: 8.* - testbench: 6.* - laravel: 11.* testbench: 9.* exclude: diff --git a/.gitignore b/.gitignore index a8b19ee..15b97d6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ vendor/ build/ report/ composer.lock +.phpunit.cache .phpunit.result.cache cghooks.lock diff --git a/composer.json b/composer.json index 242ba46..b89e614 100644 --- a/composer.json +++ b/composer.json @@ -10,11 +10,11 @@ "wrapper" ], "type": "library", - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": "^8.1", "ext-json": "*", - "illuminate/support": "^8.40.0|^9.0|^10.0|^11.0", + "illuminate/support": "^9.0|^10.0|^11.0", "guzzlehttp/guzzle": "~6.0|~7.0", "nesbot/carbon": "^2.53.1|^3.0" }, diff --git a/phpunit.xml b/phpunit.xml index 7597002..2009745 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,25 +1,14 @@ - + tests - - ./src - @@ -30,6 +19,11 @@ - + + + + ./src + + From e18f36ee0a2af0a16a1f02ecc77901d6d1d12687 Mon Sep 17 00:00:00 2001 From: Marc Reichel Date: Sun, 10 Mar 2024 12:18:11 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20Minimum=20stability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b89e614..5087e90 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "wrapper" ], "type": "library", - "minimum-stability": "stable", + "minimum-stability": "dev", "require": { "php": "^8.1", "ext-json": "*",