Add PHP 8.2 support (#5)

Also add shell.nix for easier development.
This commit is contained in:
Daniel Siepmann 2023-04-03 08:41:22 +02:00 committed by GitHub
parent 948913fe10
commit d682c14252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 107 additions and 3 deletions

1
.gitattributes vendored
View file

@ -1,5 +1,6 @@
Tests export-ignore Tests export-ignore
.gitlab-ci.yml export-ignore .gitlab-ci.yml export-ignore
shell.nix export-ignore
.gitattributes export-ignore .gitattributes export-ignore
.gitignore export-ignore .gitignore export-ignore

View file

@ -20,6 +20,7 @@ jobs:
- 7.4 - 7.4
- 8.0 - 8.0
- 8.1 - 8.1
- 8.2
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -71,7 +72,7 @@ jobs:
- name: Install PHP - name: Install PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: "8.1" php-version: "8.2"
tools: composer:v2 tools: composer:v2
- name: Install dependencies - name: Install dependencies
@ -99,6 +100,8 @@ jobs:
typo3-version: '^11.5' typo3-version: '^11.5'
- php-version: '8.1' - php-version: '8.1'
typo3-version: '^11.5' typo3-version: '^11.5'
- php-version: '8.2'
typo3-version: '^11.5'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -134,6 +137,8 @@ jobs:
typo3-version: '^11.5' typo3-version: '^11.5'
- php-version: '8.1' - php-version: '8.1'
typo3-version: '^11.5' typo3-version: '^11.5'
- php-version: '8.2'
typo3-version: '^11.5'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View file

@ -0,0 +1,27 @@
3.3.0
=====
Breaking
--------
Nothing
Features
--------
* Add PHP 8.2 support.
Fixes
-----
Nothing
Tasks
-----
Nothing
Deprecation
-----------
Nothing

View file

@ -15,7 +15,7 @@
} }
], ],
"require": { "require": {
"php": "~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0", "php": "~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0",
"typo3/cms-core": "^10.4 || ^11.5", "typo3/cms-core": "^10.4 || ^11.5",
"typo3/cms-extbase": "^10.4 || ^11.5", "typo3/cms-extbase": "^10.4 || ^11.5",
"typo3/cms-fluid": "^10.4 || ^11.5", "typo3/cms-fluid": "^10.4 || ^11.5",

View file

@ -9,7 +9,7 @@ $EM_CONF['events'] = [
'state' => 'alpha', 'state' => 'alpha',
'createDirs' => '', 'createDirs' => '',
'clearCacheOnLoad' => 0, 'clearCacheOnLoad' => 0,
'version' => '3.2.2', 'version' => '3.3.0',
'constraints' => [ 'constraints' => [
'depends' => [ 'depends' => [
'typo3' => '10.4.00-11.5.99', 'typo3' => '10.4.00-11.5.99',

71
shell.nix Normal file
View file

@ -0,0 +1,71 @@
{ pkgs ? import <nixpkgs> { } }:
let
php = pkgs.php82;
inherit(pkgs.php82Packages) composer;
projectInstall = pkgs.writeShellApplication {
name = "project-install";
runtimeInputs = [
php
composer
];
text = ''
rm -rf vendor/ composer.lock .Build/
composer install --prefer-dist --no-progress --working-dir="$PROJECT_ROOT"
'';
};
projectValidateComposer = pkgs.writeShellApplication {
name = "project-validate-composer";
runtimeInputs = [
php
composer
];
text = ''
composer validate
'';
};
projectValidateXml = pkgs.writeShellApplication {
name = "project-validate-xml";
runtimeInputs = [
pkgs.libxml2
pkgs.wget
projectInstall
];
text = ''
project-install
xmllint --schema vendor/phpunit/phpunit/phpunit.xsd --noout phpunit.xml.dist
wget --no-check-certificate https://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd --output-document=xliff-core-1.2-strict.xsd
# shellcheck disable=SC2046
xmllint --schema xliff-core-1.2-strict.xsd --noout $(find Resources -name '*.xlf')
'';
};
projectCodingGuideline = pkgs.writeShellApplication {
name = "project-coding-guideline";
runtimeInputs = [
php
projectInstall
];
text = ''
project-install
./vendor/bin/ecs check --no-progress-bar --clear-cache
'';
};
in pkgs.mkShell {
name = "TYPO3 Extension Watchlist";
buildInputs = [
projectInstall
projectValidateComposer
projectValidateXml
projectCodingGuideline
php
composer
];
shellHook = ''
export PROJECT_ROOT="$(pwd)"
export typo3DatabaseDriver=pdo_sqlite
'';
}