nystudio107 / craft-retour

src/helpers/Manifest.php

Spacing +29 added lines, -29 removed lines

@@ -64,12 +64,12 @@ 
         if ($legacyModule === null) {
             return '';
         }
-        $lines = [];
+        $lines = [ ];
         if ($async) {
-            $lines[] = "<link rel=\"preload\" href=\"{$legacyModule}\" as=\"style\" onload=\"this.onload=null;this.rel='stylesheet'\" />";
-            $lines[] = "<noscript><link rel=\"stylesheet\" href=\"{$legacyModule}\"></noscript>";
+            $lines[ ] = "<link rel=\"preload\" href=\"{$legacyModule}\" as=\"style\" onload=\"this.onload=null;this.rel='stylesheet'\" />";
+            $lines[ ] = "<noscript><link rel=\"stylesheet\" href=\"{$legacyModule}\"></noscript>";
         } else {
-            $lines[] = "<link rel=\"stylesheet\" href=\"{$legacyModule}\" />";
+            $lines[ ] = "<link rel=\"stylesheet\" href=\"{$legacyModule}\" />";
         }
 
         return implode("\r\n", $lines);
@@ -84,7 +84,7 @@ 
     {
         $result = self::getFile($path);
         if ($result) {
-            $result = "<style>\r\n".$result."</style>\r\n";
+            $result = "<style>\r\n" . $result . "</style>\r\n";
             return $result;
         }
 
@@ -127,12 +127,12 @@ 
                 return '';
             }
         }
-        $lines = [];
+        $lines = [ ];
         if ($async) {
-            $lines[] = "<script type=\"module\" src=\"{$modernModule}\"></script>";
-            $lines[] = "<script nomodule src=\"{$legacyModule}\"></script>";
+            $lines[ ] = "<script type=\"module\" src=\"{$modernModule}\"></script>";
+            $lines[ ] = "<script nomodule src=\"{$legacyModule}\"></script>";
         } else {
-            $lines[] = "<script src=\"{$legacyModule}\"></script>";
+            $lines[ ] = "<script src=\"{$legacyModule}\"></script>";
         }
 
         return implode("\r\n", $lines);
@@ -183,8 +183,8 @@ 
         $module = self::getModuleEntry($config, $moduleName, $type, $soft);
         if ($module !== null) {
             $prefix = self::$isHot
-                ? $config['devServer']['publicPath']
-                : $config['server']['publicPath'];
+                ? $config[ 'devServer' ][ 'publicPath' ]
+                : $config[ 'server' ][ 'publicPath' ];
             // If the module isn't a full URL, prefix it
             if (!UrlHelper::isAbsoluteUrl($module)) {
                 $module = self::combinePaths($prefix, $module);
@@ -225,16 +225,16 @@ 
         $manifest = self::getManifestFile($config, $type);
         if ($manifest !== null) {
             // Make sure it exists in the manifest
-            if (empty($manifest[$moduleName])) {
+            if (empty($manifest[ $moduleName ])) {
                 self::reportError(Craft::t(
                     'retour',
                     'Module does not exist in the manifest: {moduleName}',
-                    ['moduleName' => $moduleName]
+                    [ 'moduleName' => $moduleName ]
                 ), $soft);
 
                 return null;
             }
-            $module = $manifest[$moduleName];
+            $module = $manifest[ $moduleName ];
         }
 
         return $module;
@@ -254,14 +254,14 @@ 
         $manifest = null;
         // Determine whether we should use the devServer for HMR or not
         $devMode = Craft::$app->getConfig()->getGeneral()->devMode;
-        self::$isHot = ($devMode && $config['useDevServer']);
+        self::$isHot = ($devMode && $config[ 'useDevServer' ]);
         // Try to get the manifest
         while ($manifest === null) {
             $manifestPath = self::$isHot
-                ? $config['devServer']['manifestPath']
-                : $config['server']['manifestPath'];
+                ? $config[ 'devServer' ][ 'manifestPath' ]
+                : $config[ 'server' ][ 'manifestPath' ];
             // Normalize the path
-            $path = self::combinePaths($manifestPath, $config['manifest'][$type]);
+            $path = self::combinePaths($manifestPath, $config[ 'manifest' ][ $type ]);
             $manifest = self::getJsonFile($path);
             // If the manifest isn't found, and it was hot, fall back on non-hot
             if ($manifest === null) {
@@ -269,7 +269,7 @@ 
                 self::reportError(Craft::t(
                     'retour',
                     'Manifest file not found at: {manifestPath}',
-                    ['manifestPath' => $manifestPath]
+                    [ 'manifestPath' => $manifestPath ]
                 ), true);
                 if (self::$isHot) {
                     // Try again, but not with home module replacement
@@ -312,7 +312,7 @@ 
         }
         if ($path !== null) {
             $path = self::combinePaths(
-                $config['localFiles']['basePath'],
+                $config[ 'localFiles' ][ 'basePath' ],
                 $path
             );
 
@@ -331,7 +331,7 @@ 
      */
     protected static function getJsonFile(string $path)
     {
-        return self::getFileFromUri($path, [self::class, 'jsonFileDecode']);
+        return self::getFileFromUri($path, [ self::class, 'jsonFileDecode' ]);
     }
 
     /**
@@ -385,14 +385,14 @@ 
     protected static function getFileContents(string $path, callable $callback = null)
     {
         // Return the memoized manifest if it exists
-        if (!empty(self::$files[$path])) {
-            return self::$files[$path];
+        if (!empty(self::$files[ $path ])) {
+            return self::$files[ $path ];
         }
         // Create the dependency tags
         $dependency = new TagDependency([
             'tags' => [
                 self::CACHE_TAG,
-                self::CACHE_TAG.$path,
+                self::CACHE_TAG . $path,
             ],
         ]);
         // Set the cache duration based on devMode
@@ -402,8 +402,8 @@ 
         // Get the result from the cache, or parse the file
         $cache = Craft::$app->getCache();
         $file = $cache->getOrSet(
-            self::CACHE_KEY.$path,
-            function () use ($path, $callback) {
+            self::CACHE_KEY . $path,
+            function() use ($path, $callback) {
                 $result = null;
                 $contents = @file_get_contents($path);
                 if ($contents) {
@@ -418,7 +418,7 @@ 
             $cacheDuration,
             $dependency
         );
-        self::$files[$path] = $file;
+        self::$files[ $path ] = $file;
 
         return $file;
     }
@@ -433,7 +433,7 @@ 
     protected static function combinePaths(string ...$paths): string
     {
         $last_key = \count($paths) - 1;
-        array_walk($paths, function (&$val, $key) use ($last_key) {
+        array_walk($paths, function(&$val, $key) use ($last_key) {
             switch ($key) {
                 case 0:
                     $val = rtrim($val, '/ ');
@@ -451,7 +451,7 @@ 
         $last = array_pop($paths);
         $paths = array_filter($paths);
         array_unshift($paths, $first);
-        $paths[] = $last;
+        $paths[ ] = $last;
 
         return implode('/', $paths);
     }

src/variables/ManifestVariable.php

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
     {
         ManifestHelper::invalidateCaches();
         $bundle = new RetourAsset();
-        self::$config['server']['manifestPath'] = Craft::getAlias($bundle->sourcePath);
+        self::$config[ 'server' ][ 'manifestPath' ] = Craft::getAlias($bundle->sourcePath);
         $useDevServer = getenv('NYS_PLUGIN_DEVSERVER');
         if ($useDevServer !== false) {
-            self::$config['useDevServer'] = (bool)$useDevServer;
+            self::$config[ 'useDevServer' ] = (bool) $useDevServer;
         }
     }