Merge pull request #628 from Chris53897/feature/drop-outdated-php

feat: drop support for php 7.2, 7.3
liip · May 14, 2023 · 5658b8a · 5658b8a
2 parents a6dc147 + bfa2233
commit 5658b8a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,17 +10,13 @@ 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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +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
 

diff --git 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
@@ -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
@@ -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
@@ -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'],