From 2f3c331b1859508cd15397f4c00b2d5ac0c52f44 Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Sat, 3 Apr 2021 00:33:14 -0300 Subject: [PATCH 1/2] Allow PHP 8.x --- .github/workflows/tests.yml | 6 ++++-- composer.json | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 34cf06b..49aefcf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,6 +22,8 @@ jobs: symfony-version: 5.1.* - php-version: 7.4 symfony-version: 5.1.* + - php-version: 8.0 + symfony-version: 5.1.* steps: - name: "Checkout" @@ -48,7 +50,7 @@ jobs: strategy: matrix: include: - - php-version: 7.4 + - php-version: 8.0 symfony-version: 5.1.* steps: @@ -75,7 +77,7 @@ jobs: strategy: matrix: include: - - php-version: 7.4 + - php-version: 8.0 symfony-version: 5.1.* steps: diff --git a/composer.json b/composer.json index 3359a8b..3f4f433 100644 --- a/composer.json +++ b/composer.json @@ -25,12 +25,12 @@ } }, "require": { - "php": "^7.1", + "php": "^7.1|^8.0", "sonata-project/admin-bundle": "^3.0", "symfony/workflow": "^4.4|^5.0" }, "require-dev": { - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^7.5|^8.5|^9.5", "squizlabs/php_codesniffer": "^3.5" } } From c8d2fa19e9f5c9c75e4f3d135b176f5bb4a77f14 Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Sat, 3 Apr 2021 00:48:51 -0300 Subject: [PATCH 2/2] Drop support for PHP < 7.3 --- .github/workflows/tests.yml | 16 +++++++--------- composer.json | 4 ++-- tests/Controller/WorkflowControllerTest.php | 4 +++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 49aefcf..daaaf79 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,16 +14,14 @@ jobs: strategy: matrix: include: - - php-version: 7.1 + - php-version: 7.3 symfony-version: 4.4.* + - php-version: 7.3 + symfony-version: 5.2.* - php-version: 7.4 - symfony-version: 4.4.* - - php-version: 7.2 - symfony-version: 5.1.* - - php-version: 7.4 - symfony-version: 5.1.* + symfony-version: 5.2.* - php-version: 8.0 - symfony-version: 5.1.* + symfony-version: 5.2.* steps: - name: "Checkout" @@ -51,7 +49,7 @@ jobs: matrix: include: - php-version: 8.0 - symfony-version: 5.1.* + symfony-version: 5.2.* steps: - name: "Checkout" @@ -78,7 +76,7 @@ jobs: matrix: include: - php-version: 8.0 - symfony-version: 5.1.* + symfony-version: 5.2.* steps: - name: "Checkout" diff --git a/composer.json b/composer.json index 3f4f433..0107063 100644 --- a/composer.json +++ b/composer.json @@ -25,12 +25,12 @@ } }, "require": { - "php": "^7.1|^8.0", + "php": "^7.3|^8.0", "sonata-project/admin-bundle": "^3.0", "symfony/workflow": "^4.4|^5.0" }, "require-dev": { - "phpunit/phpunit": "^7.5|^8.5|^9.5", + "phpunit/phpunit": "^8.5|^9.5", "squizlabs/php_codesniffer": "^3.5" } } diff --git a/tests/Controller/WorkflowControllerTest.php b/tests/Controller/WorkflowControllerTest.php index a5a9a38..95f09b2 100644 --- a/tests/Controller/WorkflowControllerTest.php +++ b/tests/Controller/WorkflowControllerTest.php @@ -59,8 +59,10 @@ class WorkflowControllerTest extends TestCase */ private $flashBag; - public function setUp() + protected function setUp(): void { + parent::setUp(); + $this->container = $this->prophesize(ContainerInterface::class); $this->admin = $this->prophesize(AdminInterface::class); $this->registry = new Registry();