Skip to content

Commit

Permalink
Upgrade PHP to support 8.2 and 8.3 only; Remove CaptainHook (#93)
Browse files Browse the repository at this point in the history
* Upgrade PHP to support 8.1-8.3; Remove CaptainHook

* Fix Psalm

* Fix CS

* Exclude PHP 8.1 as PHPUnit requires at least 8.2
  • Loading branch information
Menelion authored Mar 31, 2024
1 parent e45a9ca commit 33f5040
Show file tree
Hide file tree
Showing 13 changed files with 1,259 additions and 1,664 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Fix coding style

on: [push]
on: [push, pull_request]

jobs:
php-cs-fixer:
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.3
extensions: mbstring, pdo, pdo_sqlite, openssl
coverage: none

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: check coding style

on: [push]
on: [push, pull_request]

jobs:
phpcs:
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.3
extensions: mbstring, pdo, pdo_sqlite, openssl
coverage: none

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.0, 7.4]
php: [8.3, 8.2]
stability: [prefer-lowest, prefer-stable]

name: P${{ matrix.php }} - ${{ matrix.stability }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.1, 8.0, 7.4]
php: [8.3, 8.2]
stability: [prefer-lowest, prefer-stable]

name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
Expand Down
56 changes: 0 additions & 56 deletions captainhook.json

This file was deleted.

8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
}
],
"require": {
"php": ">=7.4"
"php": ">=8.1"
},
"require-dev": {
"captainhook/captainhook": "*",
"captainhook/plugin-composer": "*",
"friendsofphp/php-cs-fixer": "*",
"oire/php-code-style": "dev-master",
"phpunit/phpunit": "*",
Expand All @@ -24,7 +22,7 @@
"license": "MIT",
"authors": [
{
"name": "Andre Polykanine also known as Menelion Elensúlë",
"name": "André Polykanine also known as Menelion Elensúlë",
"email": "[email protected]",
"homepage": "https://github.com/Menelion",
"role": "developer"
Expand All @@ -51,7 +49,7 @@
},
"allow-plugins": {
"composer/package-versions-deprecated": true,
"captainhook/plugin-composer": true
"captainhook/plugin-composer": false
}
},
"scripts": {
Expand Down
Loading

0 comments on commit 33f5040

Please sign in to comment.