tweaks thanks to Fab

weaverryan · weaverryan · commit d95d406cc420 · 2023-10-08T10:16:05.000-04:00
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapVersionChecker.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapVersionChecker.php
@@ -80,18 +80,19 @@ public function checkVersions(): array
             foreach ($dependencies as $dependencyName) {
                 $dependencyVersionConstraint = $packageDependencies[$dependencyName] ?? null;
 
-                if (null === $dependencyVersionConstraint) {
-                    // odd that this would happen
-                    continue;
-                }
-
                 $dependencyPackageName = $this->extractPackageNameFromImport($dependencyName);
                 if (!$entries->has($dependencyPackageName)) {
                     $problems[] = new PackageVersionProblem($packageName, $dependencyName, $dependencyVersionConstraint, null);
 
                     continue;
                 }
 
+                if (null === $dependencyVersionConstraint) {
+                    // local file imports this, but the package doesn't have it as a dependency
+                    // odd, but not technically a problem
+                    continue;
+                }
+
                 if (!$this->isVersionSatisfied($dependencyVersionConstraint, $entries->get($dependencyName)->version)) {
                     $problems[] = new PackageVersionProblem($packageName, $dependencyName, $dependencyVersionConstraint, $entries->get($dependencyName)->version);
                 }
@@ -112,11 +113,7 @@ public function checkVersions(): array
 
     private function isVersionSatisfied(string $versionConstraint, ?string $version): bool
     {
-        if (null === $version) {
-            return false;
-        }
-
-        return Semver::satisfies($version, $versionConstraint);
+        return $version ? Semver::satisfies($version, $versionConstraint) : false;
     }
 
     private function extractPackageNameFromImport(string $importName): string
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/PackageVersionProblem.php b/src/Symfony/Component/AssetMapper/ImportMap/PackageVersionProblem.php
@@ -14,10 +14,10 @@
 final class PackageVersionProblem
 {
     public function __construct(
-        public string $packageName,
-        public string $dependencyPackageName,
-        public string $requiredVersionConstraint,
-        public ?string $installedVersion
+        public readonly string $packageName,
+        public readonly string $dependencyPackageName,
+        public readonly string $requiredVersionConstraint,
+        public readonly ?string $installedVersion
     ) {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@`
`14`	`14`	`final class PackageVersionProblem`
`15`	`15`	`{`
`16`	`16`	`public function __construct(`
`17`		`- public string $packageName,`
`18`		`- public string $dependencyPackageName,`
`19`		`- public string $requiredVersionConstraint,`
`20`		`- public ?string $installedVersion`
	`17`	`+ public readonly string $packageName,`
	`18`	`+ public readonly string $dependencyPackageName,`
	`19`	`+ public readonly string $requiredVersionConstraint,`
	`20`	`+ public readonly ?string $installedVersion`
`21`	`21`	`) {`
`22`	`22`	`}`
`23`	`23`	`}`