Refactor code

Author: sangnguyenplus

src/Assets.php

@@ -189,11 +189,7 @@ public function getScripts($location = null)
             $scripts = array_merge($scripts, $this->getScriptItem($location, $configName, $script));
         }
 
-        if (isset($this->appendedScripts[$location])) {
-            $scripts = array_merge($scripts, $this->appendedScripts[$location]);
-        }
-
-        return $scripts;
+        return array_merge($scripts, array_get($this->appendedScripts, $location, []));
     }
 
     /**
@@ -241,35 +237,6 @@ public function styleToHtml($name)
         return $this->itemToHtml($name, 'style');
     }
 
-    /**
-     * Render assets to header.
-     *
-     * @param array $lastStyles
-     * @return string
-     * @throws \Throwable
-     */
-    public function renderHeader($lastStyles = [])
-    {
-        $styles = $this->getStyles($lastStyles);
-
-        $headScripts = $this->getScripts(self::ASSETS_SCRIPT_POSITION_HEADER);
-
-        return view('assets::header', compact('styles', 'headScripts'))->render();
-    }
-
-    /**
-     * Render assets to footer.
-     *
-     * @return string
-     * @throws \Throwable
-     */
-    public function renderFooter()
-    {
-        $bodyScripts = $this->getScripts(self::ASSETS_SCRIPT_POSITION_FOOTER);
-
-        return view('assets::footer', compact('bodyScripts'))->render();
-    }
-
     /**
      * Get script item.
      *
@@ -289,22 +256,6 @@ protected function getScriptItem($location, $configName, $script)
         return $scripts;
     }
 
-    /**
-     * Fallback to local script if CDN fails.
-     *
-     * @param string $src
-     * @param string $configName
-     * @return array
-     */
-    protected function getFallbackScript($src, $configName)
-    {
-        return [
-            'src'         => $src,
-            'fallback'    => array_get($this->config, $configName . '.fallback'),
-            'fallbackURL' => array_get($this->config, $configName . '.src.local'),
-        ];
-    }
-
     /**
      * Convert item to html.
      *
@@ -388,7 +339,11 @@ protected function getSource($configName, $location = null)
             $isUsingCdn &&
             $location === self::ASSETS_SCRIPT_POSITION_HEADER &&
             array_has($this->config, $configName . '.fallback')) {
-            $scripts[] = $this->getFallbackScript($src, $configName);
+            $scripts[] = [
+                'src'         => $src,
+                'fallback'    => array_get($this->config, $configName . '.fallback'),
+                'fallbackURL' => array_get($this->config, $configName . '.src.local'),
+            ];
         }
 
         return $scripts;
@@ -409,4 +364,33 @@ public function getHtmlBuilder()
     {
         return $this->htmlBuilder;
     }
+
+    /**
+     * Render assets to header.
+     *
+     * @param array $lastStyles
+     * @return string
+     * @throws \Throwable
+     */
+    public function renderHeader($lastStyles = [])
+    {
+        $styles = $this->getStyles($lastStyles);
+
+        $headScripts = $this->getScripts(self::ASSETS_SCRIPT_POSITION_HEADER);
+
+        return view('assets::header', compact('styles', 'headScripts'))->render();
+    }
+
+    /**
+     * Render assets to footer.
+     *
+     * @return string
+     * @throws \Throwable
+     */
+    public function renderFooter()
+    {
+        $bodyScripts = $this->getScripts(self::ASSETS_SCRIPT_POSITION_FOOTER);
+
+        return view('assets::footer', compact('bodyScripts'))->render();
+    }
 }