diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0644638..81e542b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,9 +20,10 @@ jobs: - '8.2' - '8.3' - '8.4' + - '8.5' future-release: [false] include: - - php-version: '8.5' + - php-version: '8.6' future-release: true fail-fast: false name: PHP ${{ matrix.php-version }} diff --git a/README.md b/README.md index 7048713..1632684 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Installation instructions to use the `composer` command can be found on https:// ### 📋 Requirements -PHP Curl Class works with PHP versions 8.4, 8.3, 8.2, 8.1, and 8.0. +PHP Curl Class works with PHP versions 8.5, 8.4, 8.3, 8.2, 8.1, and 8.0. ### 🚀 Quick Start and Examples diff --git a/tests/.php-cs-fixer.php b/tests/.php-cs-fixer.php index b9014c2..44e14a5 100644 --- a/tests/.php-cs-fixer.php +++ b/tests/.php-cs-fixer.php @@ -4,6 +4,13 @@ $finder = PhpCsFixer\Finder::create() ->in(dirname(__DIR__)); $config = new PhpCsFixer\Config(); + +// Turn on unsupported PHP versions when the method exists for compatibility +// with older PHP CS Fixer versions. +if (is_callable([$config, 'setUnsupportedPhpVersionAllowed'])) { + $config->setUnsupportedPhpVersionAllowed(true); +} + $config ->setRiskyAllowed(true) ->setRules([ diff --git a/tests/run.sh b/tests/run.sh index e0b8432..fa15f56 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -20,7 +20,17 @@ if [[ "${CI}" == "true" ]]; then # - vimeo/psalm[6.5.1, ..., 6.8.8] require php ~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3 -> your php version (8.5.0-dev) does not satisfy that requirement. # # Error: Your requirements could not be resolved to an installable set of packages. - if ! "${CI_PHP_FUTURE_RELEASE}"; then + if "${CI_PHP_FUTURE_RELEASE}"; then + install_psalm=false + # Skip attempting to install psalm on PHP version 8.5 and higher as psalm + # does not yet support these versions. + elif [[ $(echo "${CI_PHP_VERSION} >= 8.5" | bc) -eq 1 ]]; then + install_psalm=false + else + install_psalm=true + fi + + if ${install_psalm}; then composer require --dev "vimeo/psalm:>=5.26.1" fi