diff --git a/.github/workflows/tasks.yml b/.github/workflows/tasks.yml index 4827bdf..69b10f8 100644 --- a/.github/workflows/tasks.yml +++ b/.github/workflows/tasks.yml @@ -9,8 +9,15 @@ jobs: strategy: fail-fast: false matrix: - php: [ '8.2', '8.3', '8.4' ] - typo3: [ '12', '13' ] + include: + - php: '8.2' + typo3: '13' + - php: '8.3' + typo3: '13' + - php: '8.4' + typo3: '13' + - php: '8.5' + typo3: '13' steps: - name: Setup PHP with PECL extension uses: shivammathur/setup-php@v2 @@ -23,6 +30,5 @@ jobs: key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | ${{ runner.os }}-${{ matrix.php }}-composer- - - run: composer require typo3/minimal="^${{ matrix.typo3 }}" --dev --ignore-platform-req=php+ - - run: composer install --no-interaction --no-progress --ignore-platform-req=php+ + - run: composer require typo3/minimal="^${{ matrix.typo3 }}.4" --dev --with-all-dependencies --no-interaction --no-progress - run: ./vendor/bin/grumphp run --ansi diff --git a/composer.json b/composer.json index a1ba01f..c9b7cc1 100644 --- a/composer.json +++ b/composer.json @@ -6,14 +6,14 @@ ], "type": "typo3-cms-extension", "require": { - "php": "~8.2.0 || ~8.3.0 || ~8.4.0", - "typo3/cms-core": "^12.4 || ^13.4", - "typo3/cms-frontend": "^12.4 || ^13.4" + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", + "typo3/cms-core": "^13.4", + "typo3/cms-frontend": "^13.4" }, "require-dev": { - "pluswerk/grumphp-config": "^7.2.0 || ^10.1.4", + "pluswerk/grumphp-config": "^11.2.0", "saschaegerer/phpstan-typo3": "^1.10.2 || ^2.1.1", - "ssch/typo3-rector": "*" + "ssch/typo3-rector": "^3.16.0" }, "autoload": { "psr-4": { @@ -22,6 +22,7 @@ }, "config": { "allow-plugins": { + "a9f/fractor-extension-installer": true, "ergebnis/composer-normalize": true, "phpro/grumphp": true, "phpstan/extension-installer": true, diff --git a/rector.php b/rector.php index fe73218..ff12503 100644 --- a/rector.php +++ b/rector.php @@ -4,13 +4,11 @@ use PLUS\GrumPHPConfig\RectorSettings; use Rector\Config\RectorConfig; -use Rector\Caching\ValueObject\Storage\FileCacheStorage; return static function (RectorConfig $rectorConfig): void { $rectorConfig->parallel(); $rectorConfig->importNames(); $rectorConfig->importShortClasses(); - $rectorConfig->cacheClass(FileCacheStorage::class); $rectorConfig->cacheDirectory('./var/cache/rector'); $rectorConfig->paths(