diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 282ff50..f2632a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,13 +12,13 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.0', '8.1', '8.2', '8.3','8.4'] + php-versions: ['8.3','8.4'] coverage: ['xdebug'] code-style: ['no'] code-analysis: ['no'] rector-check: ['no'] include: - - php-versions: '7.4' + - php-versions: '8.2' coverage: 'xdebug' code-style: 'yes' code-analysis: 'yes' @@ -73,5 +73,5 @@ jobs: run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml - name: Code Coverage - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v6 if: matrix.coverage != 'none' diff --git a/composer.json b/composer.json index 244b623..8d450c9 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "homepage" : "https://github.com/fruux/sabre-http", "license" : "BSD-3-Clause", "require" : { - "php" : "^7.4 || ^8.0", + "php" : "^8.2", "ext-mbstring" : "*", "ext-ctype" : "*", "ext-curl" : "*", @@ -18,7 +18,7 @@ "phpstan/phpstan-phpunit": "^2.0", "phpstan/phpstan-strict-rules": "^2.0", "phpstan/extension-installer": "^1.4", - "phpunit/phpunit" : "^9.6", + "phpunit/phpunit" : "^10.5", "rector/rector": "^2.4" }, "suggest" : { @@ -74,6 +74,9 @@ "config": { "allow-plugins": { "phpstan/extension-installer": true + }, + "platform": { + "php": "8.2" } } } diff --git a/phpstan-ignore-by-php-version.neon.php b/phpstan-ignore-by-php-version.neon.php deleted file mode 100644 index 5f58a1c..0000000 --- a/phpstan-ignore-by-php-version.neon.php +++ /dev/null @@ -1,18 +0,0 @@ -= 80000) { - $includes[] = __DIR__.'/phpstan-ignore-php8.neon'; -} else { - $includes[] = __DIR__.'/phpstan-ignore-php74.neon'; -} - -$config = []; -$config['includes'] = $includes; - -// overrides config.platform.php in composer.json -$config['parameters']['phpVersion'] = PHP_VERSION_ID; - -return $config; diff --git a/phpstan-ignore-php74.neon b/phpstan-ignore-php74.neon deleted file mode 100644 index 041b324..0000000 --- a/phpstan-ignore-php74.neon +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - ignoreErrors: - - - message: "#^Left side of || is always false.$#" - count: 10 - path: lib/Client.php diff --git a/phpstan-ignore-php8.neon b/phpstan-ignore-php8.neon deleted file mode 100644 index 43b26f0..0000000 --- a/phpstan-ignore-php8.neon +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - ignoreErrors: - - - message: "#^Left side of || is always false.$#" - count: 23 - path: lib/Client.php diff --git a/phpstan.neon b/phpstan.neon index 64e8b78..97e6a2a 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,6 +1,3 @@ -includes: - - phpstan-ignore-by-php-version.neon.php - parameters: level: 6 ignoreErrors: @@ -20,3 +17,7 @@ parameters: message: "#^.* will always evaluate to true\\.$#" count: 4 path: tests/* + - + message: "#^Left side of || is always false.$#" + count: 23 + path: lib/Client.php diff --git a/rector.php b/rector.php index 7cccb12..e89e2cc 100644 --- a/rector.php +++ b/rector.php @@ -10,7 +10,7 @@ __DIR__.'/lib', __DIR__.'/tests', ]) - ->withPhpSets(false, false, false, false, true) + ->withPhpSets(false, true) ->withTypeCoverageLevel(0) ->withDeadCodeLevel(0) ->withCodeQualityLevel(0);