From e45087cc9d70ec62bce27bd05dffda78f3886a4e Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 11 Jan 2024 09:52:18 +0100 Subject: [PATCH] fix(ci): Readd php8.0 Signed-off-by: Marcel Klehr --- .github/workflows/phpunit-mysql.yml | 2 +- composer.json | 4 ++-- vendor-bin/php-scoper/composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 88df21a6..c3a8efa2 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.0', '8.1', '8.2', '8.3'] server-versions: ['master', 'stable28'] services: diff --git a/composer.json b/composer.json index f80cf92b..fb612dee 100644 --- a/composer.json +++ b/composer.json @@ -23,12 +23,12 @@ "psalm": "psalm.phar", "test:unit": "phpunit --config tests/phpunit.xml", "post-install-cmd": [ - "@composer bin all install --ansi", + "@composer bin all install --ansi --ignore-platform-req=php", "grep -r 'OCA\\\\Recognize\\\\Rubix' ./vendor/rubix/ml/ || ( vendor/bin/php-scoper add-prefix --prefix='OCA\\Recognize' --output-dir=\".\" --working-dir=\"./vendor/rubix/ml/\" -f --config=\"../../../scoper.inc.php\" && sed -i 's:Rubix\\\\\\\\ML\\\\\\\\:OCA\\\\\\\\Recognize\\\\\\\\Rubix\\\\\\\\ML\\\\\\\\:' vendor/composer/installed.json )", "composer dump-autoload" ], "post-update-cmd": [ - "@composer bin all update --ansi", + "@composer bin all update --ansi --ignore-platform-req=php", "grep -r 'OCA\\\\Recognize\\\\Rubix' ./vendor/rubix/ml/ || ( vendor/bin/php-scoper add-prefix --prefix='OCA\\Recognize' --output-dir=\".\" --working-dir=\"./vendor/rubix/ml/\" -f --config=\"../../../scoper.inc.php\" && sed -i 's:Rubix\\\\\\\\ML\\\\\\\\:OCA\\\\\\\\Recognize\\\\\\\\Rubix\\\\\\\\ML\\\\\\\\:' vendor/composer/installed.json )", "composer dump-autoload" ] diff --git a/vendor-bin/php-scoper/composer.json b/vendor-bin/php-scoper/composer.json index 61735d40..4ba7244b 100644 --- a/vendor-bin/php-scoper/composer.json +++ b/vendor-bin/php-scoper/composer.json @@ -1,5 +1,5 @@ { "require-dev": { - "humbug/php-scoper": "^0.18.7" + "humbug/php-scoper": "^0.18.10" } }