Bump dependencies (#1093)

- Remove support for PHP 7.3 - Remove support for Symfony 2.8, 3.4, 4.x except 4.4 (the LTS), 5.x except 5.2 (current stable)
nelmio · Oct 12, 2021 · a97f88f · a97f88f
1 parent 9d104bf
commit a97f88f
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 97 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,33 +12,23 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.3'
                     - '7.4'
                     - '8.0'
                     - '8.1'
                 symfony-versions: [false]
                 include:
-                    -   description: 'Symfony 3.4'
-                        php: '7.4'
-                        symfony-versions: 3.4.*
                     -   description: 'Symfony 4.4'
                         php: '7.4'
                         symfony-versions: 4.4.*
-                    -   description: 'Symfony 5.0'
-                        php: '7.4'
-                        symfony-versions: 5.0.*
-                    -   description: 'Symfony 5.2'
+                    -   description: 'Symfony 5.3'
                         php: '7.4'
-                        symfony-versions: 5.2.*
+                        symfony-versions: 5.3.*
                     -   description: 'Symfony 4.4'
                         php: '8.0'
                         symfony-versions: 4.4.*
-                    -   description: 'Symfony 5.0'
-                        php: '8.0'
-                        symfony-versions: 5.0.*
-                    -   description: 'Symfony 5.2'
+                    -   description: 'Symfony 5.3'
                         php: '8.0'
-                        symfony-versions: 5.2.*
+                        symfony-versions: 5.3.*
 
         name: PHP ${{ matrix.php }} ${{ matrix.description }}
         steps:

diff --git a/composer.json b/composer.json
@@ -20,23 +20,23 @@
     ],
 
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "fakerphp/faker": "^1.10",
         "myclabs/deep-copy": "^1.10",
         "sebastian/comparator": "^3.0 || ^4.0",
-        "symfony/property-access": "^2.8 || ^3.4 || ^4.0 || ^5.0",
-        "symfony/yaml": "^2.8 || ^3.4 || ^4.0 || ^5.0"
+        "symfony/property-access": "^4.4 || ^5.2",
+        "symfony/yaml": "^4.4 || ^5.2"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.1.0",
+        "bamarni/composer-bin-plugin": "^1.4.1",
         "phpspec/prophecy": "^1.6",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^8.5.4 || ^9.3",
+        "phpunit/phpunit": "^9.3",
         "symfony/phpunit-bridge": "^5.1.3",
-        "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0"
+        "symfony/var-dumper": "^4.4 || ^5.2"
     },
     "conflict": {
-        "symfony/framework-bundle": "<3.4"
+        "symfony/framework-bundle": "<4.4 || >=5.0.0,<5.2.0"
     },
 
     "autoload": {

diff --git a/fixtures/Bridge/Symfony/Application/AppKernel.php b/fixtures/Bridge/Symfony/Application/AppKernel.php
@@ -43,13 +43,7 @@ public function registerBundles()
 
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
-        if (3 === self::MAJOR_VERSION) {
-            $config = $this->config ?? (__DIR__.'/config_34.yml');
-        } else {
-            $config = $this->config ?? (__DIR__.'/config.yml');
-        }
-
-        $loader->load($config);
+        $loader->load($this->config ?? __DIR__.'/config.yml');
     }
 
     public function build(ContainerBuilder $container): void

diff --git a/fixtures/Bridge/Symfony/Application/AppKernelWithCustomParameters.php b/fixtures/Bridge/Symfony/Application/AppKernelWithCustomParameters.php
@@ -19,12 +19,6 @@ class AppKernelWithCustomParameters extends AppKernel
 {
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
-        if (3 === self::MAJOR_VERSION) {
-            $config = __DIR__.'/config_custom_34.yml';
-        } else {
-            $config = __DIR__.'/config_custom.yml';
-        }
-
-        $loader->load($config);
+        $loader->load(__DIR__.'/config_custom.yml');
     }
 }
diff --git a/fixtures/Bridge/Symfony/Application/config.yml b/fixtures/Bridge/Symfony/Application/config.yml
@@ -8,6 +8,8 @@
 #
 
 framework:
+    annotations:
+        enabled: false
     secret:                  NelmioAliceBundleSecret
     serializer:
         enabled: true
@@ -17,6 +19,6 @@ framework:
         utf8: true
     test:                    ~
     session:
-        storage_id:          session.storage.mock_file
+        enabled: false
     property_access:
         magic_call:          true
diff --git a/fixtures/Bridge/Symfony/Application/config_34.yml b/fixtures/Bridge/Symfony/Application/config_34.yml
diff --git a/fixtures/Bridge/Symfony/Application/config_custom.yml b/fixtures/Bridge/Symfony/Application/config_custom.yml
@@ -8,6 +8,8 @@
 #
 
 framework:
+    annotations:
+        enabled: false
     secret:                  NelmioAliceBundleSecret
     serializer:
         enabled: true
@@ -17,7 +19,7 @@ framework:
         utf8: true
     test:                    ~
     session:
-        storage_id:          session.storage.mock_file
+        enabled: false
 
 nelmio_alice:
     locale: 'fr_FR'

diff --git a/fixtures/Bridge/Symfony/Application/config_custom_34.yml b/fixtures/Bridge/Symfony/Application/config_custom_34.yml
diff --git a/tests/Bridge/Symfony/DependencyInjection/DynamicServicesConfigurationTest.php b/tests/Bridge/Symfony/DependencyInjection/DynamicServicesConfigurationTest.php
@@ -37,13 +37,9 @@ class DynamicServicesConfigurationTest extends TestCase
 
     protected function setUp(): void
     {
-        if (3 === AppKernel::MAJOR_VERSION) {
-            $config = __DIR__.'/../../../../fixtures/Bridge/Symfony/Application/config_custom_34.yml';
-        } else {
-            $config = __DIR__.'/../../../../fixtures/Bridge/Symfony/Application/config_custom.yml';
-        }
-
-        $this->kernel = KernelFactory::createKernel($config);
+        $this->kernel = KernelFactory::createKernel(
+            __DIR__.'/../../../../fixtures/Bridge/Symfony/Application/config_custom.yml',
+        );
         $this->kernel->boot();
     }
 

diff --git a/vendor-bin/covers-validator/composer.json b/vendor-bin/covers-validator/composer.json
@@ -1,7 +1,7 @@
 {
     "require-dev": {
-        "symfony/console": "^3.3",
-        "ockcyp/covers-validator": "^1.1"
+        "symfony/console": "^5.3",
+        "ockcyp/covers-validator": "^1.3"
     },
     "config": {
         "bin-dir": "bin",

diff --git a/vendor-bin/infection/composer.json b/vendor-bin/infection/composer.json
@@ -1,7 +1,7 @@
 {
     "require-dev": {
-        "infection/infection": "^0.20",
-        "theofidry/composer-inheritance-plugin": "^1.0"
+        "infection/infection": "^0.25",
+        "theofidry/composer-inheritance-plugin": "^1.2"
     },
     "config": {
         "bin-dir": "bin",

diff --git a/vendor-bin/profiling/composer.json b/vendor-bin/profiling/composer.json
@@ -3,7 +3,7 @@
         "blackfire/php-sdk": "^1.5",
         "symfony/console": "^3.1",
         "symfony/finder": "^3.1",
-        "theofidry/composer-inheritance-plugin": "^1.0"
+        "theofidry/composer-inheritance-plugin": "^1.2"
     },
     "config": {
         "bin-dir": "bin",

diff --git a/vendor-bin/symfony/composer.json b/vendor-bin/symfony/composer.json
@@ -1,7 +1,7 @@
 {
     "require-dev": {
-        "symfony/symfony": "^3.4 || ^4.0 || ^5.0",
-        "theofidry/composer-inheritance-plugin": "^1.0"
+        "symfony/symfony": "^4.4 || ^5.0",
+        "theofidry/composer-inheritance-plugin": "^1.2"
     },
     "config": {
         "bin-dir": "bin",