Merge pull request #2 from hexadog/develop

fix(trait): Performance issue when finding themes

Author: gaetan-hexadog

src/Providers/PackageServiceProvider.php

@@ -99,7 +99,6 @@ public function register(): void
 		$this->app->singleton('themes-manager', function () {
 			return new ThemesManager(
 				app(Factory::class),
-				app(Filesystem::class),
 				app(Translator::class)
 			);
 		});

src/Theme.php

@@ -169,7 +169,7 @@ public function setParent(Theme $theme)
 
 	/**
 	 * Get parent Theme
-	 * 
+	 *
 	 * @return Theme|null
 	 */
 	public function getParent()
@@ -225,7 +225,7 @@ public function disabled(): bool
 
 	/**
 	 * Disable the current theme
-	 * 
+	 *
 	 * @return Theme
 	 */
 	public function disable(bool $withEvent = true): Theme
@@ -248,7 +248,7 @@ public function disable(bool $withEvent = true): Theme
 
 	/**
 	 * Enable the current theme
-	 * 
+	 *
 	 * @return Theme
 	 */
 	public function enable(bool $withEvent = true): Theme
@@ -275,7 +275,7 @@ public function enable(bool $withEvent = true): Theme
 	 *
 	 * @param string $url
 	 * @param boolean $absolutePath
-	 * 
+	 *
 	 * @return string|null
 	 */
 	public function url($url, $absolutePath = false): ?string
@@ -345,7 +345,7 @@ public function listLayouts()
 	 * Clean Path by replacing all / by DIRECTORY_SEPARATOR
 	 *
 	 * @param string $path
-	 * 
+	 *
 	 * @return string
 	 */
 	protected function cleanPath($path = '')

src/ThemesManager.php

@@ -39,29 +39,21 @@ class ThemesManager
 
 	/**
 	 * View finder
-	 * 
+	 *
 	 * @var \Illuminate\View\Factory
 	 */
 	private $view;
 
-	/**
-	 * File System
-	 * 
-	 * @var \Illuminate\Contracts\Filesystem\Filesystem
-	 */
-	private $files;
-
 	/**
 	 * The constructor.
 	 *
 	 * @param Factory $view
 	 * @param Filesystem $files
 	 * @param Translator $lang
 	 */
-	public function __construct(Factory $view, Filesystem $files, Translator $lang)
+	public function __construct(Factory $view, Translator $lang)
 	{
 		$this->view = $view;
-		$this->files = $files;
 		$this->lang = $lang;
 		$this->basePath = Config::get('themes-manager.directory', 'themes');
 
@@ -179,7 +171,7 @@ public function current(): ?Theme
 
 	/**
 	 * Enable a Theme from its name
-	 * 
+	 *
 	 * @param string $name
 	 * @param bool $withEvent
 	 *
@@ -203,7 +195,7 @@ public function enable(string $name, bool $withEvent = true): ThemesManager
 
 	/**
 	 * Disable a Theme from its name
-	 * 
+	 *
 	 * @param string $name
 	 * @param bool $withEvent
 	 *
@@ -240,7 +232,7 @@ public function asset(string $asset, $absolutePath = true): string
 	 *
 	 * @param string $asset
 	 * @param boolean $absolutePath
-	 * 
+	 *
 	 * @return string
 	 */
 	public function style(string $asset, $absolutePath = true): string
@@ -259,7 +251,7 @@ public function style(string $asset, $absolutePath = true): string
 	 * @param boolean $absolutePath
 	 * @param  string $type
 	 * @param  string $level
-	 * 
+	 *
 	 * @return string
 	 */
 	public function script(string $asset, string $mode = '', $absolutePath = true, string $type = 'text/javascript', string $level = 'functionality'): string
@@ -281,7 +273,7 @@ public function script(string $asset, string $mode = '', $absolutePath = true, s
 	 * @param  string $class
 	 * @param  array  $attributes
 	 * @param boolean $absolutePath
-	 * 
+	 *
 	 * @return string
 	 */
 	public function image(string $asset, string $alt = '', string $class = '', array $attributes = [], $absolutePath = true): string
@@ -313,7 +305,7 @@ public function mix($asset, $manifestDirectory = '')
 	 *
 	 * @param string $asset
 	 * @param boolean $absolutePath
-	 * 
+	 *
 	 * @return string|null
 	 */
 	public function url(string $asset, $absolutePath = true): ?string
@@ -353,7 +345,7 @@ public function filterNonActive()
 	 * Return attributes in html format
 	 *
 	 * @param  array $attributes
-	 * 
+	 *
 	 * @return string
 	 */
 	private function htmlAttributes($attributes)

src/Traits/ComposerTrait.php

@@ -5,6 +5,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Hexadog\ThemesManager\Helpers\Json;
+use Symfony\Component\Finder\Finder;
 
 trait ComposerTrait
 {
@@ -225,11 +226,12 @@ private function scan(string $path, string $class)
 
 		$path = base_path($path);
 
-		if ($this->files->exists($path)) {
-			$foundComposers = array_filter($this->files->allFiles($path), function ($file) {
-				return preg_match('/.*composer\.json$/U', $file->getFilename());
-			});
+		if (file_exists($path)) {
+			$finder = new Finder();
+			$foundComposers = $finder->files()->in($path)->exclude(['node_modules', 'vendor'])->name('composer.json');
+
 			foreach ($foundComposers as $foundComposer) {
+				dump($foundComposer);
 				$composerJson = new Json($foundComposer, app('files'));
 
 				if ($composerJson->get('type') === 'laravel-theme') {