Remove support for PHP 7.4 & PHP 8.0 (#219)

theofidry · Jul 3, 2022 · 798ea2b · 798ea2b
1 parent 1ba759a
commit 798ea2b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 34 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -18,34 +18,13 @@ jobs:
             fail-fast: false
             matrix:
                 php-version:
-                    - '7.4'
-                    - '8.0'
                     - '8.1'
                 dependencies: [ highest ]
                 variant: [ normal ]
                 include:
-                    # This one is excluded for now as horribly slow (the
-                    # Composer update takes over 10min in the CI)
-                    # This is likely due to some Symfony conflicting rules
-                    # TODO: investigate the issue and report it to Composer/Symfony
-#                    -   php-version: '7.4'
-#                        dependencies: lowest
-#                        variant: normal
-#                        composer-flags: '--prefer-lowest'
-                    # TODO: need more work
-#                    -   php-version: '7.4'
-#                        dependencies: highest
-#                        variant: 'symfony/symfony:"^4.4"'
-#                        composer-flags: ''
-                    -   php-version: '7.4'
+                    -   php-version: '8.1'
                         dependencies: highest
                         variant: 'symfony/symfony:"^5.4"'
-                        composer-flags: ''
-                    # TODO: Should be enabled as soon as PsyshBundle supports Symfony 6.x
-#                    -   php-version: '8.1'
-#                        dependencies: highest
-#                        variant: 'symfony/symfony:"^6.0"'
-#                        composer-flags: ''
         # To keep in sync with docker-compose.yml
         services:
             mysql:
@@ -127,7 +106,7 @@ jobs:
                 run: composer bin proxy-manager update --prefer-dist --prefer-stable ${{ matrix.composer-flags }}
             -   name: Add back Symfony for ProxyManager Composer bin dependencies
                 if: matrix.variant == 'normal'
-                run: composer bin proxy-manager require --dev "symfony/symfony:^4.4.32 || ^5.4.1 || ^6.0.0" --prefer-dist --prefer-stable ${{ matrix.composer-flags }} --no-update
+                run: composer bin proxy-manager require --dev "symfony/symfony:^5.4.1 || ^6.0.0" --prefer-dist --prefer-stable ${{ matrix.composer-flags }} --no-update
             -   name: Add back Symfony (variant) for ProxyManager Composer bin dependencies
                 if: matrix.variant != 'normal'
                 run: composer bin proxy-manager require --dev ${{ matrix.variant }} --prefer-dist --prefer-stable ${{ matrix.composer-flags }} --no-update

diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "nelmio/alice": "^3.5",
+        "php": "^8.1",
+        "nelmio/alice": "^3.10",
         "psr/log": "^1 || ^2 || ^3",
         "webmozart/assert": "^1.10"
     },
@@ -37,7 +37,7 @@
         "doctrine/persistence": "<2.0",
         "illuminate/database": "<8.12",
         "ocramius/proxy-manager": "<2.1",
-        "symfony/framework-bundle": "<4.4 || >5.0,<5.4",
+        "symfony/framework-bundle": "<5.4",
         "zendframework/zend-code": "<3.3.1"
     },
     "suggest": {

diff --git a/vendor-bin/php-cs-fixer/composer.lock b/vendor-bin/php-cs-fixer/composer.lock
diff --git a/vendor-bin/symfony/composer.json b/vendor-bin/symfony/composer.json
@@ -18,6 +18,7 @@
         "doctrine/phpcr-bundle": "^2.3.0",
         "doctrine/phpcr-odm": "^1.5.4",
         "jackalope/jackalope-doctrine-dbal": "^1.7.1",
+        "monolog/monolog": "^3.1",
         "symfony/symfony": "^4.4.32 || ^5.4 || ^6.0",
         "theofidry/composer-inheritance-plugin": "^1.2",
         "wouterj/eloquent-bundle": "^2.1.1"