From 0670a4dc3c496b4a8d5cefca69aa40ce5da82143 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 23 Jan 2021 05:46:15 +0100 Subject: [PATCH 1/4] Added package fixing PHP 8 error --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 9ef7dc73..bf588bba 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "php": "^7.4", "ext-json": "*", "ext-pdo": "*", + "acelaya/qrcode-detector-decoder": "^1.0", "akrabat/ip-address-middleware": "^2.0", "cakephp/chronos": "^2.0", "cocur/slugify": "^4.0", From 823242a6c2e73cc319ac5a2f349ee146c993cf66 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 23 Jan 2021 06:01:12 +0100 Subject: [PATCH 2/4] Updated endroid --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bf588bba..60dbc94a 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/cache": "^1.9", "doctrine/migrations": "^3.0.2", "doctrine/orm": "^2.8", - "endroid/qr-code": "^3.6", + "endroid/qr-code": "dev-master#0f1613a as 3.10", "geoip2/geoip2": "^2.9", "guzzlehttp/guzzle": "^7.0", "happyr/doctrine-specification": "2.0.x-dev#cb116d3 as 2.0", From a61235a5d1252fdff55beb1af33679f48145ce3b Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 23 Jan 2021 06:07:16 +0100 Subject: [PATCH 3/4] Removed dependency on acelaya/qrcode-detector-decoder --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 60dbc94a..f47cb296 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,6 @@ "php": "^7.4", "ext-json": "*", "ext-pdo": "*", - "acelaya/qrcode-detector-decoder": "^1.0", "akrabat/ip-address-middleware": "^2.0", "cakephp/chronos": "^2.0", "cocur/slugify": "^4.0", From 80012b8ee86ee0fa989e1c64a6029aadd463880f Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 23 Jan 2021 06:16:04 +0100 Subject: [PATCH 4/4] Do not allow unit tests to fail --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c426f4a3..de1064d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,6 @@ jobs: unit-tests: runs-on: ubuntu-20.04 - continue-on-error: ${{ matrix.php-version == '8.0' }} strategy: matrix: php-version: ['7.4', '8.0']