Skip to content

Commit

Permalink
Merge pull request #27 from RinkAttendant6/php8-compat
Browse files Browse the repository at this point in the history
PHP 8 compatibility
  • Loading branch information
RinkAttendant6 authored Feb 8, 2025
2 parents 7d10075 + ba7096e commit d0168f0
Show file tree
Hide file tree
Showing 13 changed files with 2,452 additions and 1,191 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/.devcontainer export-ignore
/.github export-ignore
/.vscode export-ignore
/tests export-ignore
/.gitignore export-ignore
/.phpcs.xml export-ignore
/.phplint.yml export-ignore
/.styleci.yml export-ignore
/phpunit.xml export-ignore
6 changes: 3 additions & 3 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.1', '7.2', '7.3', '7.4']
php-versions: ['7.1', '7.2', '7.3', '7.4', '8.1', '8.2', '8.3']
steps:
- uses: actions/checkout@v4

Expand All @@ -30,7 +30,7 @@ jobs:

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache composer dependencies
uses: actions/cache@v4
Expand All @@ -40,7 +40,7 @@ jobs:
restore-keys: ${{ runner.os }}-composer-

- name: Install Composer dependencies
run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
run: composer update && composer install --no-progress --prefer-dist

- name: Run lint
run: composer lint
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
vendor/
.phplint-cache
.phplint.cache/
12 changes: 5 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,22 @@
"sort-packages": true
},
"require": {
"php": "^7.1",
"php": "^7.1|^8.1",
"ext-intl": "*",
"ext-json": "*"
},
"require-dev": {
"overtrue/phplint": "^1.1",
"overtrue/phplint": "^3|^9",
"pds/skeleton": "^1.0.0",
"phpmd/phpmd": "@stable",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^7.5",
"sebastian/phpcpd": "^4.1",
"squizlabs/php_codesniffer": "^3.5"
"phpstan/phpstan": "^1|^2.1",
"phpunit/phpunit": "^7|^10.5|^11.5",
"squizlabs/php_codesniffer": "^3.11"
},
"scripts": {
"lint": [
"phplint",
"phpcs src",
"phpcpd src",
"phpstan analyse src tests --level=1",
"phpmd src text codesize,unusedcode,naming,design --ignore-violations-on-exit"
],
Expand Down
Loading

0 comments on commit d0168f0

Please sign in to comment.