Merge pull request #12 from hexadog/develop

Develop

Author: gaetan-hexadog

src/Providers/PackageServiceProvider.php

@@ -6,7 +6,6 @@
 use ReflectionClass;
 use Illuminate\Support\Str;
 use Illuminate\Routing\Router;
-use Illuminate\Cache\CacheManager;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\AliasLoader;
@@ -100,8 +99,7 @@ public function register(): void
         $this->app->singleton('themes-manager', function () {
             return new ThemesManager(
                 app(Factory::class),
-                app(Translator::class),
-                app(CacheManager::class)
+                app(Translator::class)
             );
         });
 

src/ThemesManager.php

@@ -11,7 +11,7 @@
 use Hexadog\ThemesManager\Exceptions\ThemeNotFoundException;
 use Hexadog\ThemesManager\Exceptions\ComposerLoaderException;
 use Hexadog\ThemesManager\Exceptions\ThemeNotActiveException;
-use Illuminate\Cache\CacheManager;
+use Illuminate\Support\Facades\Cache;
 
 class ThemesManager
 {
@@ -44,25 +44,17 @@ class ThemesManager
      */
     private $view;
 
-    /**
-     * Cache Manager.
-     * 
-     * @var \Illuminate\Cache\CacheManager
-     */
-    private $cache;
-
     /**
      * The constructor.
      *
      * @param \Illuminate\View\Factory $view
      * @param \Illuminate\Contracts\Translation\Translator $lang
      * @param \Illuminate\Cache\CacheManager $lang
      */
-    public function __construct(Factory $view, Translator $lang, CacheManager $cache)
+    public function __construct(Factory $view, Translator $lang)
     {
         $this->view = $view;
         $this->lang = $lang;
-        $this->cache = $cache;
 
         if (Config::get('themes-manager.cache.enabled', false)) {
             $this->themes = $this->getCache();
@@ -88,18 +80,18 @@ public function all()
      */
     public function buildCache(): bool
     {
-        return $this->cache->put(Config::get('themes-manager.cache.key', 'themes-manager'), $this->findThemes(), Config::get('themes-manager.cache.lifetime', 86400));
+        return Cache::put(Config::get('themes-manager.cache.key', 'themes-manager'), $this->findThemes(), Config::get('themes-manager.cache.lifetime', 86400));
     }
 
     /**
      * Clear the themes cache if it is enabled.
-     * 
+     *
      * @return bool
      */
     public function clearCache(): bool
     {
         if (Config::get('themes-manager.cache.enabled', false) === true) {
-            return $this->cache->forget(Config::get('themes-manager.cache.key', 'themes-manager'));
+            return Cache::forget(Config::get('themes-manager.cache.key', 'themes-manager'));
         }
 
         return true;
@@ -109,7 +101,7 @@ public function clearCache(): bool
      * Check if theme with given name exists.
      *
      * @param string $name
-     * 
+     *
      * @return boolean
      */
     public function has(string $name = null)
@@ -119,7 +111,8 @@ public function has(string $name = null)
             $name = str_replace(['-theme', 'theme-'], '', $name);
             // Check if $name contains vendor
             if (strpos($name, '/') !== false) {
-                return Str::lower($theme->getName()) === Str::lower(substr($name, $pos + 1, strlen($name)));;
+                return Str::lower($theme->getName()) === Str::lower(substr($name, $pos + 1, strlen($name)));
+                ;
             } else {
                 return $theme->getLowerName() === Str::lower($name);
             }
@@ -143,7 +136,8 @@ public function get(string $name = null)
                 $name = str_replace(['-theme', 'theme-'], '', $name);
                 // Check if $name contains vendor
                 if (strpos($name, '/') !== false) {
-                    return Str::lower($theme->getName()) === Str::lower(substr($name, $pos + 1, strlen($name)));;
+                    return Str::lower($theme->getName()) === Str::lower(substr($name, $pos + 1, strlen($name)));
+                    ;
                 } else {
                     return $theme->getLowerName() === Str::lower($name);
                 }
@@ -404,7 +398,6 @@ protected function findThemes(): Collection
                 }
             });
         } catch (ComposerLoaderException $e) {
-            
         }
 
         return $themes;
@@ -417,7 +410,7 @@ protected function findThemes(): Collection
      */
     protected function getCache(): Collection
     {
-        return $this->cache->remember(Config::get('themes-manager.cache.key', 'themes-manager'), Config::get('themes-manager.cache.lifetime', 86400), function () {
+        return Cache::remember(Config::get('themes-manager.cache.key', 'themes-manager'), Config::get('themes-manager.cache.lifetime', 86400), function () {
             return $this->findThemes();
         });
     }

src/Traits/ComposerTrait.php

@@ -221,7 +221,7 @@ private function json($file = null): Json
         }
 
         return Arr::get($this->json, $file, function () use ($file) {
-            return $this->json[$file] = new Json($this->getPath($file), app('files'));
+            return $this->json[$file] = Json::make($this->getPath($file), app('files'));
         });
     }
 
@@ -244,7 +244,7 @@ private function scan(string $path, string $class)
             $foundComposers = Finder::create()->files()->followLinks()->in($path)->exclude(['node_modules', 'vendor'])->name('composer.json');
 
             foreach ($foundComposers as $foundComposer) {
-                $composerJson = new Json($foundComposer, app('files'));
+                $composerJson = Json::make($foundComposer, app('files'));
 
                 if ($composerJson->get('type') === $this->packageType) {
                     $content->put($composerJson->get('name'), new $class(dirname($foundComposer)));