From 90571a8c9d09a11d27d0526ab6c875540a801344 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Thu, 31 Mar 2022 14:41:11 +0200
Subject: [PATCH 1/2] Update seld/jsonlint

---
 composer.lock | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 79dfb584f..948ce5956 100644
--- a/composer.lock
+++ b/composer.lock
@@ -619,23 +619,24 @@
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.8.3",
+            "version": "1.8.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57"
+                "reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9ad6ce79c342fbd44df10ea95511a1b24dee5b57",
-                "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d9a308b84277a7dd651ba89bf5ed37b88497b171",
+                "reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpstan/phpstan": "^0.12.59",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
             },
             "bin": [
                 "bin/jsonlint"
@@ -666,7 +667,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/jsonlint/issues",
-                "source": "https://github.com/Seldaek/jsonlint/tree/1.8.3"
+                "source": "https://github.com/Seldaek/jsonlint/tree/1.8.9"
             },
             "funding": [
                 {
@@ -678,7 +679,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-11T09:19:24+00:00"
+            "time": "2022-03-31T11:30:35+00:00"
         },
         {
             "name": "seld/phar-utils",

From 2b99d069b22557cf87f3caacfb50251e3cf6c2ee Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Thu, 31 Mar 2022 14:42:08 +0200
Subject: [PATCH 2/2] Remove dev-master=>dev-main alias from #10372 as it does
 not work/is missing when reloading from lock file and extracting dev deps,
 refs #10651

---
 src/Composer/Repository/PathRepository.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/Composer/Repository/PathRepository.php b/src/Composer/Repository/PathRepository.php
index d2a81cee7..3335f0a79 100644
--- a/src/Composer/Repository/PathRepository.php
+++ b/src/Composer/Repository/PathRepository.php
@@ -198,7 +198,6 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
                 $package['dist']['reference'] = trim($output);
             }
 
-            $needsAlias = false;
             if (!isset($package['version'])) {
                 $versionData = $this->versionGuesser->guessVersion($package, $path);
                 if (is_array($versionData) && $versionData['pretty_version']) {
@@ -211,16 +210,10 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
                     $package['version'] = $versionData['pretty_version'];
                 } else {
                     $package['version'] = 'dev-main';
-                    $needsAlias = true;
                 }
             }
 
-            $package = $this->loader->load($package);
-            if ($needsAlias && $package instanceof CompletePackage) {
-                // keep a dev-master alias to dev-main for BC
-                $package = new CompleteAliasPackage($package, 'dev-master', 'dev-master');
-            }
-            $this->addPackage($package);
+            $this->addPackage($this->loader->load($package));
         }
     }