x-systems / epesi-core

tests/VariablesTest.php

Indentation +24 added lines, -24 removed lines

@@ -7,41 +7,41 @@
 
 class VariablesTest extends TestCase
 {
-    /**
-     * Setup the test environment.
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
+	/**
+	 * Setup the test environment.
+	 */
+	protected function setUp(): void
+	{
+		parent::setUp();
 
-        Variable::migrate();
-    }
+		Variable::migrate();
+	}
     
-    public function testVariableStorage()
-    {
-        $varString = 'test';
+	public function testVariableStorage()
+	{
+		$varString = 'test';
         
-        Variable::memorize('testString', $varString);
+		Variable::memorize('testString', $varString);
         
-        $this->assertEquals($varString, Variable::recall('testString'), 'String variable not stored correctly in database');
+		$this->assertEquals($varString, Variable::recall('testString'), 'String variable not stored correctly in database');
         
-        Variable::forget('testString');
+		Variable::forget('testString');
         
-        $this->assertEmpty(Variable::recall('testString'), 'String variable not cleared correctly from database');
+		$this->assertEmpty(Variable::recall('testString'), 'String variable not cleared correctly from database');
         
-        $varArray = [
-                'aa' => 'test1',
-                'bb' => 'test2'
-        ];
+		$varArray = [
+				'aa' => 'test1',
+				'bb' => 'test2'
+		];
         
-        Variable::memorize('testArray', $varArray);
+		Variable::memorize('testArray', $varArray);
         
-        $this->assertEquals($varArray, Variable::recall('testArray'), 'Array variable not stored correctly in database');
+		$this->assertEquals($varArray, Variable::recall('testArray'), 'Array variable not stored correctly in database');
         
-        Variable::forget('testArray');
+		Variable::forget('testArray');
         
-        $this->assertEmpty(Variable::recall('testArray'), 'String variable not cleared correctly from database');
-    }
+		$this->assertEmpty(Variable::recall('testArray'), 'String variable not cleared correctly from database');
+	}
     
 
 }
\ No newline at end of file

src/System/User/Database/Models/atk4/User.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class User extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	public $table = 'users';
 	

src/System/Modules/ModuleCore.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
 	 * Label of the module
 	 */
 	public static function label() {
-		return static::$label?: ucwords(str_ireplace('.', ' ', static::alias()));
+		return static::$label ?: ucwords(str_ireplace('.', ' ', static::alias()));
 	}
 	
 	/**
@@ -76,11 +76,11 @@ 
 	{
 		$templatesDir = static::path() . DIRECTORY_SEPARATOR . 'Templates';
 		
-		if (! is_dir($templatesDir)) return;
+		if (!is_dir($templatesDir)) return;
 		
 		$skinDir = $templatesDir . DIRECTORY_SEPARATOR . $skin;
 		
-		return is_dir($skinDir)? $skinDir: $templatesDir;
+		return is_dir($skinDir) ? $skinDir : $templatesDir;
 	}
 	
 	public static function translations()

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,9 @@
 	{
 		$templatesDir = static::path() . DIRECTORY_SEPARATOR . 'Templates';
 		
-		if (! is_dir($templatesDir)) return;
+		if (! is_dir($templatesDir)) {
+			return;
+		}
 		
 		$skinDir = $templatesDir . DIRECTORY_SEPARATOR . $skin;
 		

src/System/Modules/Concerns/HasModule.php

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 	{
 		$class = self::namespace() . '\\' . ($alias? Str::studly($alias): (static::name() . 'View'));
 		
-		if ($alias) return $class;
+		if ($alias) {
+			return $class;
+		}
 		
 		return static::$view?: $class;
 	}

Spacing +4 added lines, -4 removed lines

@@ -14,11 +14,11 @@ 
 	 */
 	final public static function view($alias = null)
 	{
-		$class = self::namespace() . '\\' . ($alias? Str::studly($alias): (static::name() . 'View'));
+		$class = self::namespace() . '\\' . ($alias ? Str::studly($alias) : (static::name() . 'View'));
 		
 		if ($alias) return $class;
 		
-		return static::$view?: $class;
+		return static::$view ?: $class;
 	}
 	
 	/**
@@ -32,7 +32,7 @@ 
 			throw new \Exception('Undefined alias in module core class ' . static::class);
 		}
 		
-		return static::$alias?? static::module()::alias();
+		return static::$alias ?? static::module()::alias();
 	}
 	
 	/**
@@ -65,7 +65,7 @@ 
 	{
 		$names = array_slice(explode('\\', static::class), -2, -1);
 		
-		return $names? reset($names): '';
+		return $names ? reset($names) : '';
 	}
 	
 	/**

src/System/Modules/Concerns/HasLaunchButton.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	{
 		$link = $this->link();
 		
-		$link = is_array($link)? ModuleView::moduleLink(...$link): $link;
+		$link = is_array($link) ? ModuleView::moduleLink(...$link) : $link;
 		
 		return (new LaunchButton([
 				'label' => $this->label(),

src/System/Modules/Concerns/HasPackageManifest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	
 	final public static function packageManifest()
 	{
-		return self::$packageManifest = self::$packageManifest?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
+		return self::$packageManifest = self::$packageManifest ?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
 	}
 	
 	final public static function getCachedManifestPath()

src/System/Modules/Concerns/HasMigrations.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 	{
 		$paths = $this->migrations();
 		
-		foreach (is_array($paths)? $paths: [$paths] as $path) {
+		foreach (is_array($paths) ? $paths : [$paths] as $path) {
 			\Illuminate\Support\Facades\Artisan::call('migrate', ['--path' => $path, '--force' => true]);
 		}
 		
@@ -31,7 +31,7 @@ 
 	{
 		$paths = $this->migrations();
 		
-		foreach (is_array($paths)? $paths: [$paths] as $path) {
+		foreach (is_array($paths) ? $paths : [$paths] as $path) {
 			\Illuminate\Support\Facades\Artisan::call('migrate:rollback', ['--path' => $path]);
 		}
 		

src/System/Modules/Concerns/HasLinks.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 		$alias = class_exists($module)? $module::alias(): $module;
 		
 		if (is_array($method) && !$args) {
-		    $args = $method;
-		    $method = 'body';
+			$args = $method;
+			$method = 'body';
 		}
 		
 		return url(implode('/', ['view', $alias, $method, self::encodeArgs($args)]));

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	{
 		$defaultView = self::module()::view();
 		
-		$viewClass = is_a(static::class, ModuleView::class, true)? static::class: $defaultView;
+		$viewClass = is_a(static::class, ModuleView::class, true) ? static::class : $defaultView;
 		
 		$viewAlias = null;
 		if ($viewClass !== $defaultView) {
@@ -45,7 +45,7 @@ 
 	 */
 	final public static function moduleLink($module, $method = 'body', $args = [])
 	{
-		$alias = class_exists($module)? $module::alias(): $module;
+		$alias = class_exists($module) ? $module::alias() : $module;
 		
 		if (is_array($method) && !$args) {
 		    $args = $method;
@@ -64,7 +64,7 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (!$hash) return [];
 		
 		$args = session($hash);
 
@@ -82,7 +82,7 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (!$args) return;
 		
 		$hash = md5(serialize($args));
 		

Braces +9 added lines, -3 removed lines

@@ -64,11 +64,15 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (! $hash) {
+			return [];
+		}
 		
 		$args = session($hash);
 
-		if (is_null($args)) abort(419);
+		if (is_null($args)) {
+			abort(419);
+		}
 		
 		return (array) $args;
 	}
@@ -82,7 +86,9 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (! $args) {
+			return;
+		}
 		
 		$hash = md5(serialize($args));
 		

src/System/Modules/ModuleManager.php

Indentation +15 added lines, -16 removed lines

@@ -64,7 +64,7 @@ 
 	{
 		return self::$installed = self::$installed?? self::getCached('epesi-modules-installed', function() {
 			try {
-			    $installedModules = Module::pluck('class', 'alias');
+				$installedModules = Module::pluck('class', 'alias');
 			} catch (\Exception $e) {
 				$installedModules = collect();
 			}
@@ -104,27 +104,27 @@ 
 	 */
 	protected static function discoverModuleClasses($namespace, $basePath)
 	{
-	    $ret = collect();
+		$ret = collect();
 	    
-	    $moduleNamespace = trim($namespace, '\\');
+		$moduleNamespace = trim($namespace, '\\');
 	    
-	    $names = array_slice(explode('\\', $moduleNamespace), - 1);
+		$names = array_slice(explode('\\', $moduleNamespace), - 1);
 	    
-	    if ($name = $names? reset($names): '') {
-	        $moduleClass = $moduleNamespace . '\\' . $name . 'Core';
+		if ($name = $names? reset($names): '') {
+			$moduleClass = $moduleNamespace . '\\' . $name . 'Core';
 	        
-	        if (is_subclass_of($moduleClass, ModuleCore::class)) {
-	            $ret->add($moduleClass);
-	        }
-	    }
+			if (is_subclass_of($moduleClass, ModuleCore::class)) {
+				$ret->add($moduleClass);
+			}
+		}
 	    
-	    foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
-	        $subModuleNamespace = $moduleNamespace . '\\' . basename($path);
+		foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+			$subModuleNamespace = $moduleNamespace . '\\' . basename($path);
 	        
-	        $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
-	    }
+			$ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
+		}
 	    
-	    return $ret;
+		return $ret;
 	}
 	
 	/**
@@ -356,7 +356,6 @@ 
 	 * 
 	 * @param string $classOrAlias
 	 * @throws \Exception
-
 	 * @return boolean
 	 */
 	public static function uninstall($classOrAlias)

Braces +6 added lines, -2 removed lines

@@ -36,7 +36,9 @@ 
 	public static function getClass($classOrAlias, $installedOnly = false) {
 		$modules = $installedOnly? self::getInstalled(): self::getAll();
 		
-		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
+		if (collect($modules)->contains($classOrAlias)) {
+			return $classOrAlias;
+		}
 		
 		return $modules[$classOrAlias]?? null;
 	}
@@ -138,7 +140,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (! $list = $module::$method(...$args)) {
+				continue;
+			}
 			
 			$ret = array_merge($ret, is_array($list)? $list: [$list]);
 		}

Spacing +21 added lines, -21 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias, true)? 1: 0;
+		return self::getClass($classOrAlias, true) ? 1 : 0;
 	}
 	
 	/**
@@ -48,11 +48,11 @@ 
 	 * @return string;
 	 */
 	public static function getClass($classOrAlias, $installedOnly = false) {
-		$modules = $installedOnly? self::getInstalled(): self::getAll();
+		$modules = $installedOnly ? self::getInstalled() : self::getAll();
 
 		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
 		
-		return $modules[$classOrAlias]?? null;
+		return $modules[$classOrAlias] ?? null;
 	}
 	
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	public static function getInstalled()
 	{
-		return self::$installed = self::$installed?? self::getCached('epesi-modules-installed', function() {
+		return self::$installed = self::$installed ?? self::getCached('epesi-modules-installed', function() {
 			try {
 			    $installedModules = Module::pluck('class', 'alias');
 			} catch (\Exception $e) {
@@ -80,9 +80,9 @@ 
 	 */
 	public static function getAll()
 	{
-		return self::getCached('epesi-modules-available', function () {
+		return self::getCached('epesi-modules-available', function() {
 			$modules = collect();
-			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules()?: []) as $namespace => $path) {
+			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules() ?: []) as $namespace => $path) {
 				foreach (self::discoverModuleClasses($namespace, $path) as $moduleClass) {
 					$modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]);
 				}
@@ -110,7 +110,7 @@ 
 	    
 	    $names = array_slice(explode('\\', $moduleNamespace), - 1);
 	    
-	    if ($name = $names? reset($names): '') {
+	    if ($name = $names ? reset($names) : '') {
 	        $moduleClass = $moduleNamespace . '\\' . $name . 'Core';
 	        
 	        if (is_subclass_of($moduleClass, ModuleCore::class)) {
@@ -118,7 +118,7 @@ 
 	        }
 	    }
 	    
-	    foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+	    foreach (glob($basePath . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $path) {
 	        $subModuleNamespace = $moduleNamespace . '\\' . basename($path);
 	        
 	        $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
@@ -136,7 +136,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -174,12 +174,12 @@ 
 	 */
 	public static function collect($method, $args = [])
 	{
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
 		$installedModules = self::getInstalled();
 		
 		// if epesi is not installed fake having the system module to enable its functionality
-		if (! $installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
+		if (!$installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
 			$installedModules = collect([
 				'system' => \Epesi\Core\System\SystemCore::class
 			]);
@@ -187,9 +187,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (!$list = $module::$method(...$args)) continue;
 			
-			$ret = array_merge($ret, is_array($list)? $list: [$list]);
+			$ret = array_merge($ret, is_array($list) ? $list : [$list]);
 		}
 		
 		return $ret;
@@ -208,7 +208,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -238,7 +238,7 @@ 
 		]);
 		
 		if ($installRecommended) {
-			$installRecommended = is_array($installRecommended)? $installRecommended: $module->recommended();
+			$installRecommended = is_array($installRecommended) ? $installRecommended : $module->recommended();
 			
 			foreach ($installRecommended as $recommendedModule) {
 				try {
@@ -270,11 +270,11 @@ 
 		while ($unsatisfiedDependencies = self::unsatisfiedDependencies($moduleClass)) {
 			$parentModule = array_shift($unsatisfiedDependencies);
 				
-			if (self::$processing[$parentModule]?? false) {
-				throw new \Exception('Cross dependency: '. $parentModule);
+			if (self::$processing[$parentModule] ?? false) {
+				throw new \Exception('Cross dependency: ' . $parentModule);
 			}
 				
-			if (! self::isAvailable($parentModule)) {
+			if (!self::isAvailable($parentModule)) {
 				throw new \Exception('Module not found: "' . $parentModule . '"');
 			}
 	
@@ -361,17 +361,17 @@ 
 	 */
 	public static function uninstall($classOrAlias)
 	{
-		if (! self::isInstalled($classOrAlias)) {
+		if (!self::isInstalled($classOrAlias)) {
 			print ('Module "' . $classOrAlias . '" is not installed!');
 			
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {
+		if (!$moduleClass = self::getClass($classOrAlias)) {
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
-		foreach (self::listDependents()[$moduleClass]?? [] as $childModule) {
+		foreach (self::listDependents()[$moduleClass] ?? [] as $childModule) {
 			self::uninstall($childModule);
 		}