diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39cc4d71785..a0694e360dc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,20 +6,25 @@ jobs: strategy: fail-fast: false matrix: - php: [ '8.0', '8.1', '8.2' ] + php: [ '8.0', '8.1', '8.2', '8.5' ] typo3: [ '11', '12' ] exclude: - php: '8.0' typo3: '12' steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v6 - name: Setup PHP with PECL extension uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} extensions: imagick + - name: Install the security-fixed SVG sanitizer in CI + run: | + alias=0.22.99 + if [ "${{ matrix.typo3 }}" = "11" ]; then alias=0.18.99; fi + composer require "enshrined/svg-sanitize:1.0.0 as $alias" --dev --no-update --sort-packages --no-interaction - name: Composer install - run: composer require typo3/minimal="^${{ matrix.typo3 }}" --dev --optimize-autoloader --prefer-dist + run: composer require typo3/minimal="^${{ matrix.typo3 }}" --sort-packages --dev --optimize-autoloader --prefer-dist - name: Composer phpstan run: composer phpstan - name: Composer test diff --git a/composer.json b/composer.json index 15b3c4c33eb..b2e64f27c8e 100755 --- a/composer.json +++ b/composer.json @@ -1,98 +1,98 @@ { - "name": "lochmueller/staticfilecache", - "type": "typo3-cms-extension", - "description": "Transparent static file cache solution using mod_rewrite and mod_expires. Increase performance for static pages by a factor of 230!!", - "autoload": { - "psr-4": { - "SFC\\Staticfilecache\\": "Classes" - } - }, - "autoload-dev": { - "psr-4": { - "SFC\\Staticfilecache\\Tests\\": "Tests" - } - }, - "keywords": [ - "TYPO3 CMS", - "StaticFileCache", - "Static", - "File", - "Cache", - "Speed", - "Magic" - ], - "authors": [ - { - "name": "Tim Lochmüller", - "email": "tim@fruit-lab.de", - "role": "Developer", - "homepage": "https://github.com/lochmueller" - } - ], - "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", - "ext-pdo": "*", - "ext-zlib": "*", - "typo3/cms-core": "^11.5 || ^12.4", - "typo3/cms-backend": "^11.5 || ^12.4", - "typo3/cms-extensionmanager": "^11.5 || ^12.4" - }, - "replace": { - "typo3-ter/staticfilecache": "self.version" - }, - "license": "GPL-2.0-or-later", - "homepage": "https://extensions.typo3.org/extension/staticfilecache", - "support": { - "docs": "https://docs.typo3.org/p/lochmueller/staticfilecache/main/en-us/", - "issues": "https://github.com/lochmueller/staticfilecache/issues", - "source": "https://github.com/lochmueller/staticfilecache" - }, - "require-dev": { - "typo3/testing-framework": "^7.0", - "friendsofphp/php-cs-fixer": "^3.9", - "phpmetrics/phpmetrics": "^2.5", - "ssch/typo3-rector": "^1.2", - "phpstan/phpstan": "^1.10", - "saschaegerer/phpstan-typo3": "^1.8", - "andersundsehr/phpstan-git-files": "^1.0", - "phpstan/extension-installer": "^1.3" - }, - "suggest": { - "lochmueller/seocli": "Scan websites against SEO criteria and/or trigger the indexing process and cache warming in deployment scripts", - "friendsofsymfony/http-cache": "For HTTP proxy cache services like Varnish" - }, - "conflict": { - "tomasnorre/crawler": "<11.0.1" - }, - "config": { - "vendor-dir": ".Build/vendor", - "bin-dir": ".Build/bin", - "allow-plugins": { - "typo3/class-alias-loader": true, - "typo3/cms-composer-installers": true, - "phpstan/extension-installer": true - } - }, - "extra": { - "typo3/cms": { - "extension-key": "staticfilecache", - "cms-package-dir": "{$vendor-dir}/typo3/cms", - "web-dir": ".Build/Web" - } - }, - "scripts": { - "code-fix": [ - "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --config Resources/Private/Build/PhpCsFixer.php --cache-file=.Build/phpcs.cache" - ], - "code-check": [ - "phpmetrics --report-html=.Build/PhpMetrics . --exclude='.Build,Tests'", - "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --config Resources/Private/Build/PhpCsFixer.php --cache-file=.Build/phpcs.cache --dry-run" - ], - "test": [ - "phpunit -c Tests/UnitTests.xml" - ], - "phpstan": [ - ".Build/bin/phpstan" - ] - } + "name": "lochmueller/staticfilecache", + "type": "typo3-cms-extension", + "description": "Transparent static file cache solution using mod_rewrite and mod_expires. Increase performance for static pages by a factor of 230!!", + "autoload": { + "psr-4": { + "SFC\\Staticfilecache\\": "Classes" + } + }, + "autoload-dev": { + "psr-4": { + "SFC\\Staticfilecache\\Tests\\": "Tests" + } + }, + "keywords": [ + "TYPO3 CMS", + "StaticFileCache", + "Static", + "File", + "Cache", + "Speed", + "Magic" + ], + "authors": [ + { + "name": "Tim Lochm\u00fcller", + "email": "tim@fruit-lab.de", + "role": "Developer", + "homepage": "https://github.com/lochmueller" + } + ], + "require": { + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.5.0", + "ext-pdo": "*", + "ext-zlib": "*", + "typo3/cms-core": "^11.5 || ^12.4", + "typo3/cms-backend": "^11.5 || ^12.4", + "typo3/cms-extensionmanager": "^11.5 || ^12.4" + }, + "replace": { + "typo3-ter/staticfilecache": "self.version" + }, + "license": "GPL-2.0-or-later", + "homepage": "https://extensions.typo3.org/extension/staticfilecache", + "support": { + "docs": "https://docs.typo3.org/p/lochmueller/staticfilecache/main/en-us/", + "issues": "https://github.com/lochmueller/staticfilecache/issues", + "source": "https://github.com/lochmueller/staticfilecache" + }, + "require-dev": { + "typo3/testing-framework": "^7.0", + "friendsofphp/php-cs-fixer": "^3.9", + "phpmetrics/phpmetrics": "^2.5", + "ssch/typo3-rector": "^1.2", + "phpstan/phpstan": "^1.10", + "saschaegerer/phpstan-typo3": "^1.8", + "andersundsehr/phpstan-git-files": "^1.0", + "phpstan/extension-installer": "^1.3" + }, + "suggest": { + "lochmueller/seocli": "Scan websites against SEO criteria and/or trigger the indexing process and cache warming in deployment scripts", + "friendsofsymfony/http-cache": "For HTTP proxy cache services like Varnish" + }, + "conflict": { + "tomasnorre/crawler": "<11.0.1" + }, + "config": { + "vendor-dir": ".Build/vendor", + "bin-dir": ".Build/bin", + "allow-plugins": { + "typo3/class-alias-loader": true, + "typo3/cms-composer-installers": true, + "phpstan/extension-installer": true + } + }, + "extra": { + "typo3/cms": { + "extension-key": "staticfilecache", + "cms-package-dir": "{$vendor-dir}/typo3/cms", + "web-dir": ".Build/Web" + } + }, + "scripts": { + "code-fix": [ + "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --config Resources/Private/Build/PhpCsFixer.php --cache-file=.Build/phpcs.cache" + ], + "code-check": [ + "phpmetrics --report-html=.Build/PhpMetrics . --exclude='.Build,Tests'", + "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --config Resources/Private/Build/PhpCsFixer.php --cache-file=.Build/phpcs.cache --dry-run" + ], + "test": [ + "phpunit -c Tests/UnitTests.xml" + ], + "phpstan": [ + ".Build/bin/phpstan" + ] + } }