Skip to content

Commit

Permalink
Merge pull request #72 from jtl-scx/EA-6324
Browse files Browse the repository at this point in the history
EA-6324: make it compatible to php 8.2 and  php 8.3
  • Loading branch information
KaiSchwendig committed Mar 8, 2024
2 parents 03f7965 + cc25e3a commit 080f15f
Show file tree
Hide file tree
Showing 4 changed files with 324 additions and 753 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'

- name: Checkout Code
uses: actions/checkout@v2
Expand All @@ -32,8 +32,9 @@ jobs:
fail-fast: false
matrix:
php-version:
- "8.0"
- "8.1"
- "8.2"
- "8.3"

steps:
- name: "Install PHP"
Expand Down
11 changes: 11 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php declare(strict_types=1);

$finder = PhpCsFixer\Finder::create();
$finder->in(['src', 'tests']);
$finder->exclude('Model');

$config = new PhpCsFixer\Config();
$config->setFinder($finder);
$config->setRules(['@PSR2' => true]);

return $config;
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
"description": "SCX-API Base Client",
"license": "MIT",
"require": {
"php": "8.0.*|8.1.*",
"php": "8.1.* || 8.2.* || 8.3.*",
"ext-json": "*",
"guzzlehttp/guzzle": "^7.2",
"guzzlehttp/uri-template": "^0.2.0 || ^1.0.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.15",
"friendsofphp/php-cs-fixer": " ^3.50.0",
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^9.0",
"phpspec/prophecy": "^1.12.1",
"phpunit/phpunit": " ^9.5.11",
"psalm/phar": "^4.17"
},
"autoload": {
Expand All @@ -27,10 +28,10 @@
},
"scripts": {
"phpcs": [
"vendor/bin/php-cs-fixer fix --config=./.php_cs.dist"
"vendor/bin/php-cs-fixer fix --config=./.php-cs-fixer.dist.php"
],
"phpcs-dry": [
"vendor/bin/php-cs-fixer fix --config=./.php_cs.dist --dry-run"
"vendor/bin/php-cs-fixer fix --config=./.php-cs-fixer.dist.php --dry-run"
]
},
"config": {
Expand Down

0 comments on commit 080f15f

Please sign in to comment.