[TASK] Re-order a couple of variable assignments in AssetService

FluidTYPO3 · Jul 24, 2023 · 7b1ea83 · 7b1ea83
1 parent 390beb4
commit 7b1ea83
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Classes/Service/AssetService.php b/Classes/Service/AssetService.php
@@ -657,12 +657,11 @@ protected function buildAsset($asset): ?string
     protected function extractAssetContent($asset): ?string
     {
         $assetSettings = $this->extractAssetSettings($asset);
-        $fileRelativePathAndFilename = $assetSettings['path'];
-        $fileRelativePath = dirname($assetSettings['path'] ?? '');
-        $absolutePathAndFilename = GeneralUtility::getFileAbsFileName($fileRelativePathAndFilename);
-        $isExternal = $assetSettings['external'] ?? false;
-        $isFluidTemplate = $assetSettings['fluid'] ?? false;
+        $fileRelativePathAndFilename = $assetSettings['path'] ?? null;
         if (!empty($fileRelativePathAndFilename)) {
+            $isExternal = $assetSettings['external'] ?? false;
+            $isFluidTemplate = $assetSettings['fluid'] ?? false;
+            $absolutePathAndFilename = GeneralUtility::getFileAbsFileName($fileRelativePathAndFilename);
             if (!$isExternal && !file_exists($absolutePathAndFilename)) {
                 throw new \RuntimeException('Asset "' . $absolutePathAndFilename . '" does not exist.');
             }
@@ -675,6 +674,7 @@ protected function extractAssetContent($asset): ?string
             $content = $this->buildAsset($asset);
         }
         if ($content !== null && 'css' === $assetSettings['type'] && ($assetSettings['rewrite'] ?? false)) {
+            $fileRelativePath = dirname($assetSettings['path'] ?? '');
             $content = $this->detectAndCopyFileReferences($content, $fileRelativePath);
         }
         return $content;