Merge pull request #61 from hexadog/develop

Develop
hexadog · Apr 25, 2023 · a456e7d · a456e7d
2 parents cd7d4fa + 2dff43d
commit a456e7d
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 44 deletions.
diff --git a/composer.json b/composer.json
@@ -14,6 +14,8 @@
     ],
     "minimum-stability": "stable",
     "require": {
+        "php": ">=7.4",
+        "ext-json": "*",
         "hexadog/laravel-theme-installer": "^1.0",
         "illuminate/view": "^7.0|^8.0|^9.0|^10.0"
     },

diff --git a/src/Helpers/Json.php b/src/Helpers/Json.php
@@ -201,7 +201,8 @@ public function save(): bool
     /**
      * Get the specified attribute from json file.
      *
-     * @param null $default
+     * @param null  $default
+     * @param mixed $key
      *
      * @return mixed
      */

diff --git a/src/Theme.php b/src/Theme.php
@@ -99,27 +99,6 @@ public function getAssetsPath(string $path = null): string
         return Config::get('themes-manager.symlink_path', 'themes') . '/' . mb_strtolower($this->vendor) . '/' . mb_strtolower($this->name) . ($path ? '/' . $path : '');
     }
 
-    /**
-     * Get theme views paths.
-     * Build Paths array.
-     * All paths are relative to Config::get('themes-manager.directory').
-     */
-    public function getViewPaths(string $path = ''): array
-    {
-        $paths = [];
-        $theme = $this;
-
-        do {
-            $viewsPath = $theme->getPath('resources/views' . ($path ? "/{$path}" : ''));
-
-            if (!in_array($viewsPath, $paths)) {
-                $paths[] = $viewsPath;
-            }
-        } while ($theme = $theme->getParent());
-
-        return array_reverse($paths);
-    }
-
     /**
      * Set extra data.
      */
@@ -356,28 +335,6 @@ public function url(string $url, bool $absolute = true): string
         return ltrim(str_replace('\\', '/', $url));
     }
 
-    /**
-     * List theme's available layouts.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function listLayouts()
-    {
-        $layouts = collect();
-
-        $layoutDirs = $this->getViewPaths('layouts');
-
-        foreach ($layoutDirs as $layoutDir) {
-            if ($layoutFiles = glob($layoutDir . '/{**/*,*}.php', GLOB_BRACE)) {
-                foreach ($layoutFiles as $layout) {
-                    $layouts->put($layout, basename($layout, '.blade.php'));
-                }
-            }
-        }
-
-        return $layouts;
-    }
-
     /**
      * Create public assets directory path.
      */

diff --git a/src/Traits/HasViews.php b/src/Traits/HasViews.php
@@ -9,6 +9,49 @@
 
 trait HasViews
 {
+    /**
+     * Get theme views paths.
+     * Build Paths array.
+     * All paths are relative to Config::get('themes-manager.directory').
+     */
+    public function getViewPaths(string $path = ''): array
+    {
+        $paths = [];
+        $theme = $this;
+
+        do {
+            $viewsPath = $theme->getPath('resources/views' . ($path ? "/{$path}" : ''));
+
+            if (!in_array($viewsPath, $paths)) {
+                $paths[] = $viewsPath;
+            }
+        } while ($theme = $theme->getParent());
+
+        return $paths;
+    }
+
+    /**
+     * List theme's available layouts.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public function listLayouts()
+    {
+        $layouts = collect();
+
+        $layoutDirs = $this->getViewPaths('layouts');
+
+        foreach ($layoutDirs as $layoutDir) {
+            if ($layoutFiles = glob($layoutDir . '/{**/*,*}.php', GLOB_BRACE)) {
+                foreach ($layoutFiles as $layout) {
+                    $layouts->put($layout, basename($layout, '.blade.php'));
+                }
+            }
+        }
+
+        return $layouts;
+    }
+
     /**
      * Register theme's views in ViewFinder.
      */