feature #833 Bump flex to v2, composer >= 2.1, php >= 8.0 (nicolas-gr…

…ekas) This PR was merged into the 2.x branch. Discussion ---------- Bump flex to v2, composer >= 2.1, php >= 8.0 Let's drop the legacy since Symfony 6.0 will require composer >= 2.1 anyway. Commits ------- fce7def Bump flex to v2, composer >= 2.1, php >= 8.0
symfony · Nov 28, 2021 · b7883bd · b7883bd
2 parents 72c4bc7 + fce7def
commit b7883bd
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 1,449 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,13 +19,8 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                  - php: '7.1'
-                  - php: '7.2'
-                  - php: '7.3'
-                  - php: '7.4'
                   - php: '8.0'
                   - php: '8.1'
-                  - php: '7.4'
                     mode: low-deps
 
         steps:
@@ -42,9 +37,8 @@ jobs:
             - name: "Validate composer.json"
               run: "composer validate --strict --no-check-lock"
 
-            - run: |
-                composer require --no-update composer/composer:^1.0.2 --ansi
-
+            - name: "Install dependencies"
+              run: |
                 if [[ "${{ matrix.mode }}" = low-deps ]]; then
                     composer u --prefer-lowest --prefer-stable --ansi
                 else
@@ -56,17 +50,6 @@ jobs:
 
             - run: vendor/bin/simple-phpunit
 
-            - run: |
-                composer require --no-update composer/composer:^2 --ansi
-
-                if [[ "${{ matrix.mode }}" = low-deps ]]; then
-                    composer u --prefer-lowest --prefer-stable --ansi
-                else
-                    composer u --ansi
-                fi
-
-            - run: vendor/bin/simple-phpunit
-
-            - if: matrix.php == '7.1'
+            - if: matrix.php == '8.0'
               name: "Lint PHP files"
               run: find src/ -name '*.php' | xargs -n1 php -l
diff --git a/composer.json b/composer.json
@@ -11,25 +11,28 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=7.1",
-        "composer-plugin-api": "^1.0|^2.0"
+        "php": ">=8.0",
+        "composer-plugin-api": "^2.1"
     },
     "require-dev": {
-        "composer/composer": "^1.0.2|^2.0",
-        "symfony/dotenv": "^4.4|^5.0|^6.0",
-        "symfony/filesystem": "^4.4|^5.0|^6.0",
-        "symfony/phpunit-bridge": "^4.4.12|^5.0|^6.0",
-        "symfony/process": "^4.4|^5.0|^6.0"
+        "composer/composer": "^2.1",
+        "symfony/dotenv": "^5.4|^6.0",
+        "symfony/filesystem": "^5.4|^6.0",
+        "symfony/phpunit-bridge": "^5.4|^6.0",
+        "symfony/process": "^5.4|^6.0"
     },
     "autoload": {
         "psr-4": {
             "Symfony\\Flex\\": "src"
         }
     },
+    "replace": {
+        "symfony/polyfill-php72": "*",
+        "symfony/polyfill-php73": "*",
+        "symfony/polyfill-php74": "*",
+        "symfony/polyfill-php80": "*"
+    },
     "extra": {
-        "branch-alias": {
-            "dev-main": "1.17-dev"
-        },
         "class": "Symfony\\Flex\\Flex"
     }
 }
diff --git a/src/Cache.php b/src/Cache.php
diff --git a/src/Command/GenerateIdCommand.php b/src/Command/GenerateIdCommand.php
diff --git a/src/Command/RecipesCommand.php b/src/Command/RecipesCommand.php
@@ -30,10 +30,10 @@ class RecipesCommand extends BaseCommand
     /** @var \Symfony\Flex\Flex */
     private $flex;
 
-    private $symfonyLock;
-    private $downloader;
+    private Lock $symfonyLock;
+    private HttpDownloader $downloader;
 
-    public function __construct(/* cannot be type-hinted */ $flex, Lock $symfonyLock, $downloader)
+    public function __construct(/* cannot be type-hinted */ $flex, Lock $symfonyLock, HttpDownloader $downloader)
     {
         $this->flex = $flex;
         $this->symfonyLock = $symfonyLock;
@@ -102,7 +102,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $write = [];
         $hasOutdatedRecipes = false;
-        /** @var Recipe $recipe */
         foreach ($recipes as $name => $recipe) {
             $lockRef = $this->symfonyLock->get($name)['recipe']['ref'] ?? null;
 
@@ -375,11 +374,7 @@ private function findRecipeCommitDataFromTreeRef(string $package, string $repo,
 
     private function requestGitHubApi(string $path)
     {
-        if ($this->downloader instanceof HttpDownloader) {
-            $contents = $this->downloader->get($path)->getBody();
-        } else {
-            $contents = $this->downloader->getContents('api.github.com', $path, false);
-        }
+        $contents = $this->downloader->get($path)->getBody();
 
         return json_decode($contents, true);
     }

diff --git a/src/Command/RequireCommand.php b/src/Command/RequireCommand.php
@@ -15,7 +15,6 @@
 use Composer\Factory;
 use Composer\Json\JsonFile;
 use Composer\Json\JsonManipulator;
-use Composer\Plugin\PluginInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -56,10 +55,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $input->setArgument('packages', $this->resolver->resolve($input->getArgument('packages'), true));
         }
 
-        if (version_compare('2.0.0', PluginInterface::PLUGIN_API_VERSION, '>') && $input->hasOption('no-suggest')) {
-            $input->setOption('no-suggest', true);
-        }
-
         $file = Factory::getComposerFile();
         $contents = file_get_contents($file);
         $json = JsonFile::parseJson($contents);