From 7414d2dfe9fe791c2f7b0552c788e53cddb86832 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Fri, 12 Feb 2021 23:40:15 +0100 Subject: [PATCH] Allow php8 --- .github/workflows/test.yaml | 9 +-------- composer.json | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a7ec9e25..07c09cc1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,6 +27,7 @@ jobs: php-version: - '7.3' - '7.4' + - '8.0' dependencies: [highest] allowed-to-fail: [false] variant: [normal] @@ -35,10 +36,6 @@ jobs: dependencies: lowest allowed-to-fail: false variant: normal - - php-version: '8.0' - dependencies: highest - allowed-to-fail: true - variant: normal steps: - name: Checkout @@ -54,10 +51,6 @@ jobs: - name: Add PHPUnit matcher run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Configuration required for PHP 8.0 - if: matrix.php-version == '8.0' - run: composer config platform.php 7.4.99 - - name: Install variant if: matrix.variant != 'normal' run: composer require ${{ matrix.variant }} --no-update diff --git a/composer.json b/composer.json index b4b97047..ff4d45fa 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "license": "LGPL-2.1", "require": { - "php": "^7.3", + "php": "^7.3 || ^8.0", "doctrine/dbal": "^2.5", "doctrine/orm": "^2.4" },