nWidart / laravel-modules

src/Module.php

Spacing +6 added lines, -6 removed lines

@@ -197,7 +197,7 @@ 
     {
         $lowerName = $this->getLowerName();
 
-        $langPath = $this->getPath() . '/Resources/lang';
+        $langPath = $this->getPath().'/Resources/lang';
 
         if (is_dir($langPath)) {
             $this->loadTranslationsFrom($langPath, $lowerName);
@@ -217,8 +217,8 @@ 
             $file = 'module.json';
         }
 
-        return Arr::get($this->moduleJson, $file, function () use ($file) {
-            return $this->moduleJson[$file] = new Json($this->getPath() . '/' . $file, $this->files);
+        return Arr::get($this->moduleJson, $file, function() use ($file) {
+            return $this->moduleJson[$file] = new Json($this->getPath().'/'.$file, $this->files);
         });
     }
 
@@ -271,7 +271,7 @@ 
      */
     protected function fireEvent($event)
     {
-        $this->app['events']->dispatch(sprintf('modules.%s.' . $event, $this->getLowerName()), [$this]);
+        $this->app['events']->dispatch(sprintf('modules.%s.'.$event, $this->getLowerName()), [$this]);
     }
     /**
      * Register the aliases from this module.
@@ -296,7 +296,7 @@ 
     protected function registerFiles()
     {
         foreach ($this->get('files', []) as $file) {
-            include $this->path . '/' . $file;
+            include $this->path.'/'.$file;
         }
     }
 
@@ -399,7 +399,7 @@ 
      */
     public function getExtraPath(string $path) : string
     {
-        return $this->getPath() . '/' . $path;
+        return $this->getPath().'/'.$path;
     }
 
     /**

Doc Comments +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
     /**
      * Get a specific data from composer.json file by given the key.
      *
-     * @param $key
+     * @param string $key
      * @param null $default
      *
      * @return mixed

src/Commands/MigrateCommand.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         }
 
         foreach ($this->module->getOrdered($this->option('direction')) as $module) {
-            $this->line('Running for module: <info>' . $module->getName() . '</info>');
+            $this->line('Running for module: <info>'.$module->getName().'</info>');
 
             $this->migrate($module);
         }
@@ -63,7 +63,7 @@ 
         $path = str_replace(base_path(), '', (new Migrator($module, $this->getLaravel()))->getPath());
 
         if ($this->option('subpath')) {
-            $path = $path . "/" . $this->option("subpath");
+            $path = $path."/".$this->option("subpath");
         }
 
         $this->call('migrate', [

src/FileRepository.php

Doc Comments +2 added lines, -4 removed lines

@@ -126,9 +126,7 @@ 
     /**
      * Creates a new Module instance
      *
-     * @param Container $app
-     * @param string $args
-     * @param string $path
+     * @param string[] $args
      * @return \Nwidart\Modules\Module
      */
     abstract protected function createModule(...$args);
@@ -632,7 +630,7 @@ 
     /**
      * Get stub path.
      *
-     * @return string|null
+     * @return string|boolean
      */
     public function getStubPath()
     {

Spacing +9 added lines, -9 removed lines

@@ -116,7 +116,7 @@ 
             $paths = array_merge($paths, $this->config('scan.paths'));
         }
 
-        $paths = array_map(function ($path) {
+        $paths = array_map(function($path) {
             return Str::endsWith($path, '/*') ? $path : Str::finish($path, '/*');
         }, $paths);
 
@@ -200,7 +200,7 @@ 
      */
     public function getCached()
     {
-        return $this->cache->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () {
+        return $this->cache->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() {
             return $this->toCollection()->toArray();
         });
     }
@@ -288,7 +288,7 @@ 
     {
         $modules = $this->allEnabled();
 
-        uasort($modules, function (Module $a, Module $b) use ($direction) {
+        uasort($modules, function(Module $a, Module $b) use ($direction) {
             if ($a->order == $b->order) {
                 return 0;
             }
@@ -427,9 +427,9 @@ 
     public function getModulePath($module)
     {
         try {
-            return $this->findOrFail($module)->getPath() . '/';
+            return $this->findOrFail($module)->getPath().'/';
         } catch (ModuleNotFoundException $e) {
-            return $this->getPath() . '/' . Str::studly($module) . '/';
+            return $this->getPath().'/'.Str::studly($module).'/';
         }
     }
 
@@ -442,7 +442,7 @@ 
      */
     public function assetPath($module) : string
     {
-        return $this->config('paths.assets') . '/' . $module;
+        return $this->config('paths.assets').'/'.$module;
     }
 
     /**
@@ -450,7 +450,7 @@ 
      */
     public function config(string $key, $default = null)
     {
-        return $this->config->get('modules.' . $key, $default);
+        return $this->config->get('modules.'.$key, $default);
     }
 
     /**
@@ -540,9 +540,9 @@ 
         }
         list($name, $url) = explode(':', $asset);
 
-        $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath());
+        $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath());
 
-        $url = $this->url->asset($baseUrl . "/{$name}/" . $url);
+        $url = $this->url->asset($baseUrl."/{$name}/".$url);
 
         return str_replace(['http://', 'https://'], '//', $url);
     }

src/LaravelModulesServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -31,9 +31,9 @@ 
      */
     public function setupStubPath()
     {
-        Stub::setBasePath(__DIR__ . '/Commands/stubs');
+        Stub::setBasePath(__DIR__.'/Commands/stubs');
 
-        $this->app->booted(function ($app) {
+        $this->app->booted(function($app) {
             /** @var RepositoryInterface $moduleRepository */
             $moduleRepository = $app[RepositoryInterface::class];
             if ($moduleRepository->config('stubs.enabled') === true) {
@@ -47,14 +47,14 @@ 
      */
     protected function registerServices()
     {
-        $this->app->singleton(Contracts\RepositoryInterface::class, function ($app) {
+        $this->app->singleton(Contracts\RepositoryInterface::class, function($app) {
             $path = $app['config']->get('modules.paths.modules');
 
             return new Laravel\LaravelFileRepository($app, $path);
         });
-        $this->app->singleton(Contracts\ActivatorInterface::class, function ($app) {
+        $this->app->singleton(Contracts\ActivatorInterface::class, function($app) {
             $activator = $app['config']->get('modules.activator');
-            $class = $app['config']->get('modules.activators.' . $activator)['class'];
+            $class = $app['config']->get('modules.activators.'.$activator)['class'];
 
             return new $class($app);
         });

src/Activators/FileActivator.php

Indentation +140 added lines, -140 removed lines

@@ -11,144 +11,144 @@ 
 
 class FileActivator implements ActivatorInterface
 {
-	/**
-	 * Laravel cache instance
-	 * 
-	 * @var CacheManager
-	 */
-	protected $cache;
-
-	/**
-	 * Laravel Filesystem instance
-	 * 
-	 * @var Filesystem
-	 */
-	protected $files;
-
-	/**
-	 * Laravel config instance
-	 * 
-	 * @var Config
-	 */
-	protected $config;
-
-	/**
-	 * @var string
-	 */
-	protected $cacheKey;
-
-	/**
-	 * @var string
-	 */
-	protected $cacheLifetime;
-
-	/**
-	 * Array of modules activation statuses
-	 * 
-	 * @var array
-	 */
-	protected $modulesStatuses;
-
-	/**
-	 * File used to store activation statuses
-	 * 
-	 * @var string
-	 */
-	protected $statusesFile;
-
-	public function __construct(Container $app)
-	{
-		$this->cache = $app['cache'];
-		$this->files = $app['files'];
-		$this->config = $app['config'];
-		$this->statusesFile = $this->config('statuses-file');
-		$this->cacheKey = $this->config('cache-key');
-		$this->cacheLifetime = $this->config('cache-lifetime');
-		$this->modulesStatuses = $this->getModulesStatuses();
-	}
-
-	/**
-	 * Get modules statuses, either from the cache or 
-	 * from the json statuses file if the cache is disabled.
-	 * 
-	 * @return array
-	 */
-	private function getModulesStatuses()
-	{
-		if(!$this->config->get('modules.cache.enabled')) return $this->readJson();
+    /**
+     * Laravel cache instance
+     * 
+     * @var CacheManager
+     */
+    protected $cache;
+
+    /**
+     * Laravel Filesystem instance
+     * 
+     * @var Filesystem
+     */
+    protected $files;
+
+    /**
+     * Laravel config instance
+     * 
+     * @var Config
+     */
+    protected $config;
+
+    /**
+     * @var string
+     */
+    protected $cacheKey;
+
+    /**
+     * @var string
+     */
+    protected $cacheLifetime;
+
+    /**
+     * Array of modules activation statuses
+     * 
+     * @var array
+     */
+    protected $modulesStatuses;
+
+    /**
+     * File used to store activation statuses
+     * 
+     * @var string
+     */
+    protected $statusesFile;
+
+    public function __construct(Container $app)
+    {
+        $this->cache = $app['cache'];
+        $this->files = $app['files'];
+        $this->config = $app['config'];
+        $this->statusesFile = $this->config('statuses-file');
+        $this->cacheKey = $this->config('cache-key');
+        $this->cacheLifetime = $this->config('cache-lifetime');
+        $this->modulesStatuses = $this->getModulesStatuses();
+    }
+
+    /**
+     * Get modules statuses, either from the cache or 
+     * from the json statuses file if the cache is disabled.
+     * 
+     * @return array
+     */
+    private function getModulesStatuses()
+    {
+        if(!$this->config->get('modules.cache.enabled')) return $this->readJson();
 		
-		return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () {
+        return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () {
             return $this->readJson();
         });
-	}
-
-	/**
-	 * Flushes the modules activation statuses cache
-	 */
-	private function flushCache()
-	{
-		$this->cache->forget($this->cacheKey);
-	}
-
-	/**
-	 * Reads a config parameter
-	 * 
-	 * @param  string $key     [description]
-	 * @param  $default
-	 * @return mixed
-	 */
-	private function config(string $key, $default = null)
+    }
+
+    /**
+     * Flushes the modules activation statuses cache
+     */
+    private function flushCache()
+    {
+        $this->cache->forget($this->cacheKey);
+    }
+
+    /**
+     * Reads a config parameter
+     * 
+     * @param  string $key     [description]
+     * @param  $default
+     * @return mixed
+     */
+    private function config(string $key, $default = null)
     {
         return $this->config->get('modules.activators.file.' . $key, $default);
     }
 
-	/**
-	 * Reads the json file that contains the activation statuses.
-	 * 
-	 * @return array
-	 */
-	private function readJson()
-	{
-		if(!$this->files->exists($this->statusesFile)) return [];
-		return json_decode($this->files->get($this->statusesFile), true);
-	}
-
-	/**
-	 * Writes the activation statuses in a file, as json
-	 */
-	private function writeJson()
-	{
-		$this->files->put($this->statusesFile, json_encode($this->modulesStatuses, JSON_PRETTY_PRINT));
-	}
-
-	/**
-	 * Get the path of the file where statuses are stored
-	 * 
-	 * @return string
-	 */
-	public function getStatusesFilePath()
-	{
-		return $this->statusesFile;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function reset()
-	{
-		if($this->files->exists($this->statusesFile)){
-			$this->files->delete($this->statusesFile);
-		}
-		$this->modulesStatuses = [];
-		$this->flushCache();
-	}
-
-	/**
+    /**
+     * Reads the json file that contains the activation statuses.
+     * 
+     * @return array
+     */
+    private function readJson()
+    {
+        if(!$this->files->exists($this->statusesFile)) return [];
+        return json_decode($this->files->get($this->statusesFile), true);
+    }
+
+    /**
+     * Writes the activation statuses in a file, as json
+     */
+    private function writeJson()
+    {
+        $this->files->put($this->statusesFile, json_encode($this->modulesStatuses, JSON_PRETTY_PRINT));
+    }
+
+    /**
+     * Get the path of the file where statuses are stored
+     * 
+     * @return string
+     */
+    public function getStatusesFilePath()
+    {
+        return $this->statusesFile;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function reset()
+    {
+        if($this->files->exists($this->statusesFile)){
+            $this->files->delete($this->statusesFile);
+        }
+        $this->modulesStatuses = [];
+        $this->flushCache();
+    }
+
+    /**
      * @inheritDoc
      */
     public function enable(Module $module)
     {
-    	$this->setActiveByName($module->getName(), true);
+        $this->setActiveByName($module->getName(), true);
     }
 
     /**
@@ -156,7 +156,7 @@ 
      */
     public function disable(Module $module)
     {
-		$this->setActiveByName($module->getName(), false);
+        $this->setActiveByName($module->getName(), false);
     }
 
     /**
@@ -164,10 +164,10 @@ 
      */
     public function isStatus(Module $module, bool $status): bool
     {
-    	if(!isset($this->modulesStatuses[$module->getName()])){
-    		return $status === false;
-    	}
-    	return $this->modulesStatuses[$module->getName()] === $status;
+        if(!isset($this->modulesStatuses[$module->getName()])){
+            return $status === false;
+        }
+        return $this->modulesStatuses[$module->getName()] === $status;
     }
 
     /**
@@ -175,7 +175,7 @@ 
      */
     public function setActive(Module $module, bool $active)
     {
-    	$this->setActiveByName($module->getName(), $active);
+        $this->setActiveByName($module->getName(), $active);
     }
 
     /**
@@ -183,9 +183,9 @@ 
      */
     public function setActiveByName(string $name, bool $status)
     {
-    	$this->modulesStatuses[$name] = $status;
-    	$this->writeJson();
-    	$this->flushCache();
+        $this->modulesStatuses[$name] = $status;
+        $this->writeJson();
+        $this->flushCache();
     }
 
     /**
@@ -193,9 +193,9 @@ 
      */
     public function delete(Module $module)
     {
-    	if(!isset($this->modulesStatuses[$module->getName()])) return;
-    	unset($this->modulesStatuses[$module->getName()]);
-    	$this->writeJson();
-    	$this->flushCache();
+        if(!isset($this->modulesStatuses[$module->getName()])) return;
+        unset($this->modulesStatuses[$module->getName()]);
+        $this->writeJson();
+        $this->flushCache();
     }
 }

Spacing +7 added lines, -7 removed lines

@@ -75,9 +75,9 @@ 
 	 */
 	private function getModulesStatuses()
 	{
-		if(!$this->config->get('modules.cache.enabled')) return $this->readJson();
+		if (!$this->config->get('modules.cache.enabled')) return $this->readJson();
 		
-		return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () {
+		return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function() {
             return $this->readJson();
         });
 	}
@@ -99,7 +99,7 @@ 
 	 */
 	private function config(string $key, $default = null)
     {
-        return $this->config->get('modules.activators.file.' . $key, $default);
+        return $this->config->get('modules.activators.file.'.$key, $default);
     }
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	private function readJson()
 	{
-		if(!$this->files->exists($this->statusesFile)) return [];
+		if (!$this->files->exists($this->statusesFile)) return [];
 		return json_decode($this->files->get($this->statusesFile), true);
 	}
 
@@ -136,7 +136,7 @@ 
 	 */
 	public function reset()
 	{
-		if($this->files->exists($this->statusesFile)){
+		if ($this->files->exists($this->statusesFile)) {
 			$this->files->delete($this->statusesFile);
 		}
 		$this->modulesStatuses = [];
@@ -164,7 +164,7 @@ 
      */
     public function isStatus(Module $module, bool $status): bool
     {
-    	if(!isset($this->modulesStatuses[$module->getName()])){
+    	if (!isset($this->modulesStatuses[$module->getName()])) {
     		return $status === false;
     	}
     	return $this->modulesStatuses[$module->getName()] === $status;
@@ -193,7 +193,7 @@ 
      */
     public function delete(Module $module)
     {
-    	if(!isset($this->modulesStatuses[$module->getName()])) return;
+    	if (!isset($this->modulesStatuses[$module->getName()])) return;
     	unset($this->modulesStatuses[$module->getName()]);
     	$this->writeJson();
     	$this->flushCache();

Braces +9 added lines, -3 removed lines

@@ -75,7 +75,9 @@ 
 	 */
 	private function getModulesStatuses()
 	{
-		if(!$this->config->get('modules.cache.enabled')) return $this->readJson();
+		if(!$this->config->get('modules.cache.enabled')) {
+		    return $this->readJson();
+		}
 		
 		return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () {
             return $this->readJson();
@@ -109,7 +111,9 @@ 
 	 */
 	private function readJson()
 	{
-		if(!$this->files->exists($this->statusesFile)) return [];
+		if(!$this->files->exists($this->statusesFile)) {
+		    return [];
+		}
 		return json_decode($this->files->get($this->statusesFile), true);
 	}
 
@@ -193,7 +197,9 @@ 
      */
     public function delete(Module $module)
     {
-    	if(!isset($this->modulesStatuses[$module->getName()])) return;
+    	if(!isset($this->modulesStatuses[$module->getName()])) {
+    	    return;
+    	}
     	unset($this->modulesStatuses[$module->getName()]);
     	$this->writeJson();
     	$this->flushCache();

src/LumenModulesServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
      */
     public function setupStubPath()
     {
-        Stub::setBasePath(__DIR__ . '/Commands/stubs');
+        Stub::setBasePath(__DIR__.'/Commands/stubs');
 
         if (app('modules')->config('stubs.enabled') === true) {
             Stub::setBasePath(app('modules')->config('stubs.path'));
@@ -43,14 +43,14 @@ 
      */
     protected function registerServices()
     {
-        $this->app->singleton(Contracts\RepositoryInterface::class, function ($app) {
+        $this->app->singleton(Contracts\RepositoryInterface::class, function($app) {
             $path = $app['config']->get('modules.paths.modules');
 
             return new Lumen\LumenFileRepository($app, $path);
         });
-        $this->app->singleton(Contracts\ActivatorInterface::class, function ($app) {
+        $this->app->singleton(Contracts\ActivatorInterface::class, function($app) {
             $activator = $app['config']->get('modules.activator');
-            $class = $app['config']->get('modules.activators.' . $activator)['class'];
+            $class = $app['config']->get('modules.activators.'.$activator)['class'];
 
             return new $class($app);
         });