Remove null check on $type when testing for a CSS URL pattern and reduce the conditional code

hashbanged · hashbanged · commit 935221742a58 · 2023-12-14T00:51:24.000-06:00
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -339,12 +339,9 @@ private function makeImportsBare(string $content, array &$dependencies, array &$
     private function resolveUrlPattern(string $packageName, string $path, ImportMapType $type = null): string
     {
         // The URL for the es-module-shims polyfill package uses the CSS pattern to
-        // prevent a syntax error in the browser console.
-        if (self::ES_MODULE_SHIMS === $packageName) {
-            return self::URL_PATTERN_DIST_CSS;
-        }
-
-        if (str_ends_with($path, '.css') || ($type && ImportMapType::CSS === $type)) {
+        // prevent a syntax error in the browser console, so check the package name
+        // as part of the condition.
+        if (self::ES_MODULE_SHIMS === $packageName || str_ends_with($path, '.css') || ImportMapType::CSS === $type) {
             return self::URL_PATTERN_DIST_CSS;
         }
 
