diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5bffd06..56d1728 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,9 +13,10 @@ jobs: Linux: runs-on: ubuntu-latest strategy: + max-parallel: 10 matrix: platform: ['linux/amd64', 'linux/arm64/v8', 'linux/s390x'] - version: ['8.1', '8.2', '8.3'] + version: ['8.1', '8.2', '8.3', '8.4'] type: ['cli', 'zts'] distro: ['bookworm', 'alpine'] steps: diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index f36ca77..fa1e788 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['8.3'] + version: ['8.4'] type: ['cli', 'zts'] distro: ['bookworm'] outputs: diff --git a/Dockerfile b/Dockerfile index 7d64d3b..40aa924 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG PLATFORM=${BUILDPLATFORM:-linux/amd64} ARG IMAGE=php -ARG TAG=8.3-cli-bookworm +ARG TAG=8.4-cli-bookworm FROM --platform=${PLATFORM} ${IMAGE}:${TAG} diff --git a/composer.json b/composer.json index 8fb741b..8530eea 100644 --- a/composer.json +++ b/composer.json @@ -3,15 +3,13 @@ "description": "Current time modification extension wrapper library.", "type": "library", "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.1", "ext-colopl_timeshifter": "^1.0" }, "require-dev": { "phpstan/phpstan": "^1", - "vimeo/psalm": "^5", "phpunit/phpunit": "^10", - "phpstan/phpstan-phpunit": "^1", - "psalm/plugin-phpunit": "^0.19" + "phpstan/phpstan-phpunit": "^1" }, "license": "PHP-3.01", "autoload": { diff --git a/ext/php_colopl_timeshifter.h b/ext/php_colopl_timeshifter.h index 5f41752..ea49896 100644 --- a/ext/php_colopl_timeshifter.h +++ b/ext/php_colopl_timeshifter.h @@ -29,7 +29,7 @@ bool get_is_hooked(); extern zend_module_entry colopl_timeshifter_module_entry; # define phpext_colopl_timeshifter_ptr &colopl_timeshifter_module_entry -# define PHP_COLOPL_TIMESHIFTER_VERSION "1.1.6" +# define PHP_COLOPL_TIMESHIFTER_VERSION "1.1.7" ZEND_BEGIN_MODULE_GLOBALS(colopl_timeshifter) struct pdo_dbh_methods hooked_mysql_driver_methods; diff --git a/library_test.sh b/library_test.sh index 088fb7f..197b269 100755 --- a/library_test.sh +++ b/library_test.sh @@ -12,5 +12,4 @@ cd "/project" composer install composer exec -- phpunit "tests" composer exec -- phpstan - composer exec -- psalm cd - diff --git a/psalm.xml b/psalm.xml deleted file mode 100644 index 8552af6..0000000 --- a/psalm.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/src/Manager.php b/src/Manager.php index 1841281..08485f3 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -71,11 +71,8 @@ public static function hookDateInterval(\DateInterval $dateInterval): bool */ $actualInterval = clone $dateInterval; if (is_int($actualInterval->days) && $actualInterval->days > 0 && $actualInterval->days !== $actualInterval->d) { - /** @psalm-suppress InaccessibleProperty */ $actualInterval->d = $actualInterval->days; - /** @psalm-suppress InaccessibleProperty */ $actualInterval->y = 0; - /** @psalm-suppress InaccessibleProperty */ $actualInterval->m = 0; }