x-systems / epesi-core

tests/ModuleManagerTest.php

Indentation +18 added lines, -18 removed lines

@@ -8,28 +8,28 @@
 
 class ModuleManagerTest extends TestCase
 {
-    /**
-     * Setup the test environment.
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
+	/**
+	 * Setup the test environment.
+	 */
+	protected function setUp(): void
+	{
+		parent::setUp();
         
-        config([
-                'epesi.modules' => [
-                        '\\Epesi\\Core\\' => __DIR__ . implode(DIRECTORY_SEPARATOR, ['..', '..', 'src']),
-                ]
-        ]);
+		config([
+				'epesi.modules' => [
+						'\\Epesi\\Core\\' => __DIR__ . implode(DIRECTORY_SEPARATOR, ['..', '..', 'src']),
+				]
+		]);
         
-        ModuleManager::install('system');
-    }
+		ModuleManager::install('system');
+	}
     
-    public function testContentStorage()
-    {
-        $installedModules = ModuleManager::getInstalled();
+	public function testContentStorage()
+	{
+		$installedModules = ModuleManager::getInstalled();
         
-        $this->assertArrayHasKey('system', $installedModules, 'System module not installed');
-    }
+		$this->assertArrayHasKey('system', $installedModules, 'System module not installed');
+	}
     
 
 }
\ No newline at end of file

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/HomePage/HomePageSettings.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 		
 		$grid->setModel(HomePage::create());
 
-		$grid->addDragHandler()->onReorder(function ($order) {
+		$grid->addDragHandler()->onReorder(function($order) {
 			foreach (HomePage::create() as $homepage) {
 				$homepage->save(['priority' => array_search($homepage['id'], $order)]);
 			}

src/HomePage/Models/HomePage.php

Indentation +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
 
 class HomePage extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	public $table = 'home_pages';
 	
@@ -29,7 +29,7 @@ 
 		parent::init();
 		
 		$this->addFields([
-		        'path' => [
+				'path' => [
 						'type' => 'enum',
 						'caption' => __('Page'),
 						'values' => self::list(),
@@ -40,7 +40,7 @@ 
 								'filter' => true
 						],
 				],
-		        'role' => [
+				'role' => [
 						'type' => 'enum', 
 						'caption' => __('Role'), 
 						'values' => Role::get()->pluck('name', 'name')->all(), 
@@ -48,16 +48,16 @@ 
 								'filter' => true
 						]
 				],
-		        'date' => [
+				'date' => [
 						'type' => 'date', 
 						'caption' => __('Date'),
-		                'never_persist' => true,
+						'never_persist' => true,
 						'ui' => [
 								'filter' => true
 						]
 				],
 				'priority' => [
-				        'default' => 0
+						'default' => 0
 				],
 		]);
 		

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 		$this->setOrder('priority');
 
 		$this->addHook('beforeInsert', function($model, & $data) {
-			$data['priority'] = $data['priority']?: $this->action('fx', ['max', 'priority'])->getOne() + 1;
+			$data['priority'] = $data['priority'] ?: $this->action('fx', ['max', 'priority'])->getOne() + 1;
 		});
 	}
 	
@@ -77,7 +77,7 @@ 
 	{
 		static $cache;
 		
-		if (! isset($cache)) {
+		if (!isset($cache)) {
 			$cache = [];
 			foreach (HomePageJoint::collect() as $joint) {
 				$cache[$joint->link()] = $joint->caption();
@@ -94,7 +94,7 @@ 
 	 */
 	public static function ofUser()
 	{
-		if (! $user = Auth::user()) return;
+		if (!$user = Auth::user()) return;
 		
 		return self::create()->addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny();
 	}
@@ -106,6 +106,6 @@ 
 	 */
 	public static function pathOfUser()
 	{
-		return HomePage::ofUser()['path']?: self::$defaultPath;
+		return HomePage::ofUser()['path'] ?: self::$defaultPath;
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -94,7 +94,9 @@
 	 */
 	public static function ofUser()
 	{
-		if (! $user = Auth::user()) return;
+		if (! $user = Auth::user()) {
+			return;
+		}
 		
 		return self::create()->addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny();
 	}

src/HomePage/HomePageCore.php

Indentation +5 added lines, -5 removed lines

@@ -21,14 +21,14 @@
 	
 	public function install()
 	{
-	    Models\HomePage::migrate();
+		Models\HomePage::migrate();
 	    
 		// setup default home pages
 		Models\HomePage::create()->import([
-	    		[
-			    		'path' => 'view/dashboard',
-			    		'role' => 'Super Admin'
-	    		],
+				[
+						'path' => 'view/dashboard',
+						'role' => 'Super Admin'
+				],
 				[
 						'path' => 'view/dashboard',
 						'role' => 'Employee'

src/Data/HasEpesiConnection.php

Indentation +20 added lines, -20 removed lines

@@ -41,33 +41,33 @@
 	 */
 	public static function pluck($value, $key = null)
 	{
-	    return collect(self::create()->export())->pluck($value, $key);
+		return collect(self::create()->export())->pluck($value, $key);
 	}
 	
 	// to be removed for atk4/data 2.0
 	public function addFields($fields = [], $defaults = [])
 	{
-	    foreach ($fields as $key => $field) {
-	        if (!is_int($key)) {
-	            // field name can be passed as array key
-	            $name = $key;
-	        } elseif (is_string($field)) {
-	            // or it can be simple string = field name
-	            $name = $field;
-	            $field = [];
-	        } elseif (is_array($field) && isset($field[0]) && is_string($field[0])) {
-	            // or field name can be passed as first element of seed array (old behaviour)
-	            $name = array_shift($field);
-	        } else {
-	            // some unsupported format, maybe throw exception here?
-	            continue;
-	        }
+		foreach ($fields as $key => $field) {
+			if (!is_int($key)) {
+				// field name can be passed as array key
+				$name = $key;
+			} elseif (is_string($field)) {
+				// or it can be simple string = field name
+				$name = $field;
+				$field = [];
+			} elseif (is_array($field) && isset($field[0]) && is_string($field[0])) {
+				// or field name can be passed as first element of seed array (old behaviour)
+				$name = array_shift($field);
+			} else {
+				// some unsupported format, maybe throw exception here?
+				continue;
+			}
 	        
-	        $seed = array_merge($defaults, (array) $field);
+			$seed = array_merge($defaults, (array) $field);
 	        
-	        $this->addField($name, $seed);
-	    }
+			$this->addField($name, $seed);
+		}
 	    
-	    return $this;
+		return $this;
 	}
 }
\ No newline at end of file

src/Layout/LayoutView.php

Indentation +68 added lines, -68 removed lines

@@ -30,36 +30,36 @@ 
  */
 class LayoutView extends ModuleView
 {
-    public $menuLeft;    // vertical menu
-    public $menu;        // horizontal menu
-    public $menuRight;   // vertical pull-down
-    public $actionBar;   
-    public $locationBar;
+	public $menuLeft;    // vertical menu
+	public $menu;        // horizontal menu
+	public $menuRight;   // vertical pull-down
+	public $actionBar;   
+	public $locationBar;
     
-    public $burger = true;      // burger menu item
+	public $burger = true;      // burger menu item
 
-    /*
+	/*
      * Whether or not left Menu is visible on Page load.
      */
-    public $isMenuLeftVisible = true;
+	public $isMenuLeftVisible = true;
 
-    public $defaultTemplate = 'layout/admin.html';
+	public $defaultTemplate = 'layout/admin.html';
     
-    protected $location;
+	protected $location;
 
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
 
-        $this->setMenu();
-        $this->setActionBar();
+		$this->setMenu();
+		$this->setActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->setMenuLeft();        
-        $this->setMenuRight();
+		$this->setMenuLeft();        
+		$this->setMenuRight();
         
-        $this->setVersion();
+		$this->setVersion();
         
 //         $this->js(true, null, 'body')->niceScroll();
         
@@ -68,26 +68,26 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
  
-        $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
+		$this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
-        // company logo
-        // see Epesi\Core\Controllers\SystemController::logo
-        $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see Epesi\Core\Controllers\SystemController::logo
+		$this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
         
-        if ($this->burger) {
-        	/** @scrutinizer ignore-call */
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			/** @scrutinizer ignore-call */
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon redirects to /home path 
 		// see Epesi\Core\Controllers\SystemController::home
-        $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
 		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
@@ -130,50 +130,50 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
+		$this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+		if (! $this->burger) return;
 
-        if (! session()->get('menu', 1)) {
-        	$this->isMenuLeftVisible = false;
-        }
+		if (! session()->get('menu', 1)) {
+			$this->isMenuLeftVisible = false;
+		}
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
-        		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
-        			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
-        ]);
-    }
+		$this->burger->add(['Icon',	'content'])->on('click', [
+				(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+				(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+				(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+				$this->burger->add('jsCallback')->set(function($j, $visible) {
+					session()->put('menu', $visible? 1: 0);
+					session()->save();
+				}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+		]);
+	}
     
-    public function setActionBar()
-    {
-    	if ($this->actionBar) return;
+	public function setActionBar()
+	{
+		if ($this->actionBar) return;
     	
-    	$this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar');
-    }
+		$this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar');
+	}
     
-    public function setVersion()
-    {
-    	$this->template->trySet('version', $this->app->version);
-    }
+	public function setVersion()
+	{
+		$this->template->trySet('version', $this->app->version);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
+	/**
+	 * {@inheritdoc}
+	 */
     
-    public function renderView()
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView()
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

src/Controllers/SystemController.php

Indentation +43 added lines, -43 removed lines

@@ -11,66 +11,66 @@
 
 class SystemController extends Controller
 {
-    public function index()
-    {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
-    }
+	public function index()
+	{
+		return SystemCore::isInstalled()? redirect('home'): redirect('install');
+	}
     
-    public function install(Epesi $epesi)
-    {
-    	// make sure the installation information is fresh
-    	ModuleManager::clearCache();
+	public function install(Epesi $epesi)
+	{
+		// make sure the installation information is fresh
+		ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
+		$epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
     	
-    	$epesi->initLayout('Centered');
+		$epesi->initLayout('Centered');
     	
-    	$epesi->layout->set('logo', url('logo'));
-    	$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
+		$epesi->layout->set('logo', url('logo'));
+		$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
     	
-    	$epesi->add(new \Epesi\Core\System\SystemInstallWizard());
+		$epesi->add(new \Epesi\Core\System\SystemInstallWizard());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
     
-    public function home()
-    {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
-    }
+	public function home()
+	{
+		return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+	}
     
-    public function logo()
-    { 
-    	$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
+	public function logo()
+	{ 
+		$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
 
-    	return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
-    }
+		return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
+	}
     
-    public function view(Epesi $epesi, $module, $method = 'body', $args = [])
-    {
-    	$epesi->initLayout(new LayoutView());
+	public function view(Epesi $epesi, $module, $method = 'body', $args = [])
+	{
+		$epesi->initLayout(new LayoutView());
     	
-    	$alias = explode(':', $module);
+		$alias = explode(':', $module);
     	
-    	$moduleAlias = $alias[0];
-    	$viewAlias = $alias[1]?? null;
+		$moduleAlias = $alias[0];
+		$viewAlias = $alias[1]?? null;
     	
-    	$view = null;
-    	if ($module = ModuleManager::getClass($moduleAlias, true)) {
-    		$viewClass = $module::view($viewAlias);
+		$view = null;
+		if ($module = ModuleManager::getClass($moduleAlias, true)) {
+			$viewClass = $module::view($viewAlias);
 
-    		if (class_exists($viewClass)) {
-    			$view = new $viewClass();
-    		}
-    	}
+			if (class_exists($viewClass)) {
+				$view = new $viewClass();
+			}
+		}
 
-    	if (! $view) abort(404);
+		if (! $view) abort(404);
     	
-    	$epesi->add($view)->displayModuleContent($method, $args);
+		$epesi->add($view)->displayModuleContent($method, $args);
     	
-    	$epesi->setLocation($view->location());
+		$epesi->setLocation($view->location());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function index()
     {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
+    	return SystemCore::isInstalled() ? redirect('home') : redirect('install');
     }
     
     public function install(Epesi $epesi)
@@ -37,7 +37,7 @@ 
     
     public function home()
     {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+    	return redirect(SystemCore::isInstalled() ? \Epesi\Core\HomePage\Models\HomePage::pathOfUser() : 'install');
     }
     
     public function logo()
@@ -65,7 +65,7 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (!$view) abort(404);
     	
     	$epesi->add($view)->displayModuleContent($method, $args);
     	

src/App.php

Indentation +25 added lines, -25 removed lines

@@ -83,43 +83,43 @@
 	
 	public function renderException($exception)
 	{
-	    ob_start();
-	    if ($exception instanceof TokenMismatchException) {
-	        $this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
-	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
-	        $this->caughtException($exception);
-	    }
+		ob_start();
+		if ($exception instanceof TokenMismatchException) {
+			$this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...'));
+		}
+		elseif ($exception instanceof NotFoundHttpException) {
+			$this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
+		}	    
+		else {
+			$this->caughtException($exception);
+		}
 	    
-	    return ob_get_clean();
+		return ob_get_clean();
 	}
 	
 	public function jsRedirectHomepage($message)
 	{
-	    $homepageUrl = url(\Epesi\Core\HomePage\Database\Models\HomePage::pathOfUser());
+		$homepageUrl = url(\Epesi\Core\HomePage\Database\Models\HomePage::pathOfUser());
 	    
-	    $redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
+		$redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
 	    
-	    if ($this->isJsonRequest()) {
-	        $this->outputResponseJSON([
-	                'success'   => true,
-	                'message'   => $message,
-	                'atkjs'   => $redirectJs
-	        ]);
-	    }
-	    else {
-	        $this->outputResponseHTML('<script>' . $redirectJs . '</script>');
-	    }
+		if ($this->isJsonRequest()) {
+			$this->outputResponseJSON([
+					'success'   => true,
+					'message'   => $message,
+					'atkjs'   => $redirectJs
+			]);
+		}
+		else {
+			$this->outputResponseHTML('<script>' . $redirectJs . '</script>');
+		}
 	}
 	
 	public function jsRedirectConfirm($page, $message)
 	{
-	    $redirectJs = $this->jsRedirect($page)->jsRender();
+		$redirectJs = $this->jsRedirect($page)->jsRender();
 	    
-	    return new jsExpression("if (confirm([])) { $redirectJs }", [$message]);
+		return new jsExpression("if (confirm([])) { $redirectJs }", [$message]);
 	}
 	
 	/**

Braces +3 added lines, -6 removed lines

@@ -86,11 +86,9 @@ 
 	    ob_start();
 	    if ($exception instanceof TokenMismatchException) {
 	        $this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
+	    } elseif ($exception instanceof NotFoundHttpException) {
 	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
+	    } else {
 	        $this->caughtException($exception);
 	    }
 	    
@@ -109,8 +107,7 @@ 
 	                'message'   => $message,
 	                'atkjs'   => $redirectJs
 	        ]);
-	    }
-	    else {
+	    } else {
 	        $this->outputResponseHTML('<script>' . $redirectJs . '</script>');
 	    }
 	}