From 932753216e5990e7fcb1ff24c9ea60c5daca59ed Mon Sep 17 00:00:00 2001 From: Alessio Date: Sat, 19 Feb 2022 10:22:43 +0100 Subject: [PATCH 1/4] Allow PHP 8.x and upgrade dev dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 7ff0083..0c89f93 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "illuminate/auth": "^8.0", "illuminate/console": "^8.0", "illuminate/encryption": "^8.0", @@ -28,9 +28,9 @@ "socialiteproviders/dropbox": "^4.1" }, "require-dev": { - "fzaninotto/faker": "~1.9.1", - "mockery/mockery": "^1.3.1", - "phpunit/phpunit": "^8.5.19|^9.5.8", + "fakerphp/faker": "^1.9.1", + "mockery/mockery": "^1.4.4", + "phpunit/phpunit": "^9.5.10", "orchestra/testbench": "^6.15", "friendsofphp/php-cs-fixer": "^2.16" }, From 45d71a12aa53e64741aae9f7dc57645216c3dbe9 Mon Sep 17 00:00:00 2001 From: Alessio Date: Sat, 19 Feb 2022 10:32:29 +0100 Subject: [PATCH 2/4] Run code style with PHP 8.0 --- .github/workflows/code-style.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index 08fb0db..ef3a827 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -12,11 +12,6 @@ jobs: name: Check PHP code style runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [7.4] - steps: - uses: actions/checkout@v2 with: @@ -26,18 +21,24 @@ jobs: uses: actions/cache@v1 with: path: ~/.composer/cache/files - key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + key: dependencies-php-code-style-composer-${{ hashFiles('composer.json') }} - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} + php-version: 8.0 + tools: composer:v2 extensions: dom, curl, libxml, mbstring, zip coverage: none - name: Install dependencies run: | - composer install --prefer-dist --no-scripts + composer update --prefer-stable --prefer-dist --no-interaction --no-progress - name: Run CS Fixer run: ./vendor/bin/php-cs-fixer fix --dry-run + + # - name: Commit changes + # uses: stefanzweifel/git-auto-commit-action@v4 + # with: + # commit_message: Fix styling From b7de498fbfc6fd82b430dacf07446cb92651ce93 Mon Sep 17 00:00:00 2001 From: Alessio Date: Sat, 19 Feb 2022 10:32:58 +0100 Subject: [PATCH 3/4] Add PHP 8.0 and 8.1 to test suite matrix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 444d150..c4b00af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.3, 7.4] + php: [7.3, 7.4, 8.0, 8.1] laravel: ["8.*"] steps: From 5215c2c0a72d30bceb421a4fc25a464517792294 Mon Sep 17 00:00:00 2001 From: Alessio Date: Sat, 19 Feb 2022 10:36:15 +0100 Subject: [PATCH 4/4] Enable auto-commit for code style changes --- .github/workflows/code-style.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index ef3a827..425495a 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -36,9 +36,9 @@ jobs: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - name: Run CS Fixer - run: ./vendor/bin/php-cs-fixer fix --dry-run + run: ./vendor/bin/php-cs-fixer fix - # - name: Commit changes - # uses: stefanzweifel/git-auto-commit-action@v4 - # with: - # commit_message: Fix styling + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Fix styling