From 698b3b9ea4d51f5de49b34d6f893b37202769bcb Mon Sep 17 00:00:00 2001
From: Ilya Tribusean <slash3b@gmail.com>
Date: Mon, 22 Nov 2021 23:08:49 +0200
Subject: [PATCH] a bit stuck

---
 build-conflicts.php                       | 12 ++++++++----
 src/Roave/SecurityAdvisories/Advisory.php |  2 ++
 src/Roave/SecurityAdvisories/Source.php   |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build-conflicts.php b/build-conflicts.php
index c61744f2..5c0d674b 100644
--- a/build-conflicts.php
+++ b/build-conflicts.php
@@ -163,6 +163,9 @@ static function (array $components): array {
         Shell\execute('cp', [$sourceComposerJsonPath, $targetComposerJsonPath]);
     };
 
+    /**
+     * @psalm-suppress MixedAssignment
+     */
     $commitComposerJson = static function (string $composerJsonPath, array $addedAdvisories): void {
         $originalHash = Shell\execute(
             'git',
@@ -224,13 +227,14 @@ static function (array $components): array {
     ));
 
     $prevComposerJSONFileData = file_get_contents(__DIR__ . '/build/roave-security-advisories/composer.json');
+
+    /** @var array $prevComposerDecodedData
+     */
     $prevComposerDecodedData  = json_decode($prevComposerJSONFileData, true);
+
+    /** @var array<array-key, string> $oldConflictPackages */
     $oldConflictPackages      = array_keys($prevComposerDecodedData['conflict']);
 
-//    /** @var list<Advisory> $addedAdvisories */
-    /**
-     * @psalm-param $addedAdvisories Advisory
-     */
     $addedAdvisories = [];
     foreach ($getAdvisories() as $advisory) {
         if (in_array($advisory->package->packageName, $oldConflictPackages, true)) {
diff --git a/src/Roave/SecurityAdvisories/Advisory.php b/src/Roave/SecurityAdvisories/Advisory.php
index 72048b1d..0419c59c 100644
--- a/src/Roave/SecurityAdvisories/Advisory.php
+++ b/src/Roave/SecurityAdvisories/Advisory.php
@@ -28,11 +28,13 @@
 /** @psalm-immutable */
 final class Advisory
 {
+    /** @var PackageName  */
     public PackageName $package;
 
     /** @var list<VersionConstraint> */
     private array $branchConstraints;
 
+    /** @var Source */
     public Source $source;
 
     /**
diff --git a/src/Roave/SecurityAdvisories/Source.php b/src/Roave/SecurityAdvisories/Source.php
index 89ebf418..998d4909 100644
--- a/src/Roave/SecurityAdvisories/Source.php
+++ b/src/Roave/SecurityAdvisories/Source.php
@@ -9,10 +9,10 @@
 
 final class Source
 {
-    /** @var non-empty-string */
+    /** @var non-empty-string $summary */
     public string $summary;
 
-    /** @var non-empty-string */
+    /** @var non-empty-string $uri */
     public string $uri;
 
     /**