Optimized calculation of path of assets

lib/Assets.php

@@ -138,20 +138,22 @@ public static function resolve($name, $type = false, $source = false, $version =
             $type = 'css';
           }
 
-          if ($type === 'js' && file_exists('sites/default/js/' . $name)) {
-
-            $path = $basePath . 'sites/default/js/' . $name;
-
-          } else if ($type === 'css' && file_exists('sites/default/css/' . $name)){
-
-            $path = $basePath . 'sites/default/css/' . $name;
-
-          } else {
-
-            $path = $name;
-
+          $path = $name;
+
+          // If type is js or css, look for file in local filestsyem, with and without basePath.
+          if ($type === 'js' || $type === 'css') {
+            foreach ([
+              "{$basePath}sites/default/{$type}/{$name}",
+              "sites/default/{$type}/{$name}",
+              "{$basePath}{$type}/{$name}",
+              "{$type}/{$name}",
+              "{$name}",
+            ] as $p) {
+              if (file_exists($p)){
+                $path = $basePath . $p;
+              }
+            }
           }
-
         }
 
         return [

version

@@ -1,3 +1,4 @@
+5.6.2[] = "Optimized calculation of path of assets"
 5.6.1[] = "Updated Twig to v. 3.3.2"
 5.5.13[] = "Fixed bug with link to controller in protected tags public forms"
 5.5.12[] = "Fixed issue with serach string not being url_decoded"