From 3a6cacf9cd26fa4d68578b1c2c5b2fecfa447719 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 12 May 2023 09:36:02 +0200 Subject: [PATCH 1/2] feat: drop support for php 7.2, 7.3 --- .github/workflows/tests.yml | 14 ++++++-------- CHANGELOG.md | 1 + composer.json | 4 ++-- tests/Command/CommandTest.php | 2 +- .../ConfigurationConfigTest.php | 2 +- tests/DependencyInjection/ConfigurationTest.php | 6 +++--- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 71f3a86a..6e4dba22 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,23 +10,21 @@ jobs: strategy: fail-fast: false matrix: - php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php-version: ['7.4', '8.0', '8.1', '8.2'] composer-flags: [''] symfony-version: ['^5.4'] include: - - php-version: 7.2 + - php-version: 7.4 symfony-version: "^4.4" composer-flags: "--prefer-lowest" - - php-version: 7.2 - symfony-version: "^4.4" - - php-version: 7.3 - symfony-version: "^4.4" - php-version: 7.4 symfony-version: "^4.4" - php-version: 8.0 symfony-version: "^4.4" - php-version: 8.1 - symfony-version: "^6.0" + symfony-version: "^6.2" + - php-version: 8.2 + symfony-version: "^6.2" steps: - name: Checkout @@ -39,7 +37,7 @@ jobs: - name: Get composer cache directory id: composercache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache composer dependencies uses: actions/cache@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index fbe33fd6..90c8abe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 5.0 (to be released) Removed features deprecated in [4.6](#4.6) +Drop support for php 7.2, 7.3 ## 4.7 diff --git a/composer.json b/composer.json index 65e4e985..702a679a 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,8 @@ } ], "require": { - "php": "^7.2 || ^8.0", - "phpunit/phpunit": "^7.5.0 || ^8.0 || ^9.0 || ^10.0", + "php": "^7.4 || ^8.0", + "phpunit/phpunit": "^9.6 || ^10.0", "symfony/browser-kit": "^4.4 || ^5.1 || ^6.0", "symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0" }, diff --git a/tests/Command/CommandTest.php b/tests/Command/CommandTest.php index 59ab69a4..6f31ea60 100644 --- a/tests/Command/CommandTest.php +++ b/tests/Command/CommandTest.php @@ -111,7 +111,7 @@ public function testRunCommandWithoutOptionsAndNotReuseKernel(bool $useEnv): voi $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay()); } - public function useEnvProvider(): array + public static function useEnvProvider(): array { return [ [true], diff --git a/tests/DependencyInjection/ConfigurationConfigTest.php b/tests/DependencyInjection/ConfigurationConfigTest.php index ac095190..cd0b1418 100644 --- a/tests/DependencyInjection/ConfigurationConfigTest.php +++ b/tests/DependencyInjection/ConfigurationConfigTest.php @@ -36,7 +36,7 @@ protected static function getKernelClass(): string /** * Override values to be tested. */ - public function parametersProvider(): array + public static function parametersProvider(): array { return [ ['command_verbosity', 'very_verbose'], diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php index 3552d13c..31de4f48 100644 --- a/tests/DependencyInjection/ConfigurationTest.php +++ b/tests/DependencyInjection/ConfigurationTest.php @@ -14,14 +14,14 @@ namespace Liip\Acme\Tests\DependencyInjection; use Liip\FunctionalTestBundle\Test\WebTestCase; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Test default configuration. */ class ConfigurationTest extends WebTestCase { - /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ - private $clientContainer = null; + private ?ContainerInterface $clientContainer = null; protected function setUp(): void { @@ -52,7 +52,7 @@ public function testParameter($node, $value): void ); } - public function parametersProvider(): array + public static function parametersProvider(): array { return [ ['command_verbosity', 'normal'], From bfa2233b52503b15841e7ab220fd0d3185adcb73 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sun, 14 May 2023 10:13:27 +0200 Subject: [PATCH 2/2] feat: drop support for php 7.2, 7.3 --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c8abe6..846dd9db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,15 @@ ## 5.0 (to be released) -Removed features deprecated in [4.6](#4.6) +Removed features deprecated in [4.6](#46) + +## 4.10 + Drop support for php 7.2, 7.3 ## 4.7 -Deprecations from [4.6](#4.6) will now trigger an `E_USER_DEPRECATED` deprecation +Deprecations from [4.6](#46) will now trigger an `E_USER_DEPRECATED` deprecation ## 4.6