x-systems / epesi-base

src/Dashboard/DashboardView.php

Braces +9 added lines, -3 removed lines

@@ -142,7 +142,9 @@ 
 		
 	public function addMenu()
 	{
-		if ($this->isLocked()) return;
+		if ($this->isLocked()) {
+			return;
+		}
 		
 		$dashboardId = $this->dashboard()->id;
 		
@@ -165,14 +167,18 @@ 
 		$dashboardMenu->addItem([__('Rename dashboard'), 'icon' => 'i cursor'])->on('click', $modal->show());
 		
 		// there is only one admin default dashboard
-		if ($this->admin) return;
+		if ($this->admin) {
+			return;
+		}
 		
 		// ***** add ***** //		
 		$modal = $this->add(['Modal', 'title' => __('Add Dashboard')])->set(\Closure::fromCallable([$this, 'addDashboard']));
 		
 		$dashboardMenu->addItem([__('Add dashboard'), 'icon' => 'add'])->on('click', $modal->show());
 		
-		if ($this->isSingleDashboard()) return;
+		if ($this->isSingleDashboard()) {
+			return;
+		}
 		
 		// ***** reorder ***** //
 		$modal = $this->add(['Modal', 'title' => __('Reorder Dashboards')])->set(\Closure::fromCallable([$this, 'reorderDashboards']));

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
 	
 	public function body()
 	{
-		if (! $this->isSingleDashboard()) {
+		if (!$this->isSingleDashboard()) {
 			$this->location($this->dashboard()->name);
 		}
 		
@@ -42,7 +42,7 @@ 
 		
 		$applets = $dashboard->applets()->orderBy('column')->orderBy('row')->get();
 
-		$columns = $this->add(['Columns', 'id' => 'dashboard', 'ui' => 'three stackable grid'  . ($this->isLocked()? ' locked': '')]);
+		$columns = $this->add(['Columns', 'id' => 'dashboard', 'ui' => 'three stackable grid' . ($this->isLocked() ? ' locked' : '')]);
 		
 		foreach ([1, 2, 3] as $columnId) {
 			/** @scrutinizer ignore-call */
@@ -55,7 +55,7 @@ 
 					]
 			]);
 			
-			foreach ($applets->where('column', $columnId) as $applet ) {
+			foreach ($applets->where('column', $columnId) as $applet) {
 				$col->add([
 						new Applet(),
 						'appletId' => $applet->id,
@@ -66,7 +66,7 @@ 
 			}
 		}
 		
-		if (! $this->isLocked()) {
+		if (!$this->isLocked()) {
 			$columns->js(true)->find('.sortable')->sortable([
 					'cursor' => 'move',
 					'handle' => '.panel-sortable-handle',
@@ -84,7 +84,7 @@ 
 					])
 			]));
 			
-			$columns->js(true)->find('.applet-close')->click(new jsFunction(['e'], [new jsExpression('if (confirm("' .  __('Delete this applet?') . '")) {$(e.target).closest(".applet").fadeOut(400, function(){var col = $(this).closest(".column.sortable");this.remove();col.trigger("sortupdate");})}')]));
+			$columns->js(true)->find('.applet-close')->click(new jsFunction(['e'], [new jsExpression('if (confirm("' . __('Delete this applet?') . '")) {$(e.target).closest(".applet").fadeOut(400, function(){var col = $(this).closest(".column.sortable");this.remove();col.trigger("sortupdate");})}')]));
 		}
 		
 		$this->columns = $columns;
@@ -131,7 +131,7 @@ 
 				]
 		]);
 
-		foreach ( AppletJoint::collect() as $applet ) {
+		foreach (AppletJoint::collect() as $applet) {
 			$col->add([
 					new Applet(),
 					'appletId' => 'new_' . str_ireplace('\\', '-', get_class($applet)),
@@ -260,10 +260,10 @@ 
 	{
 		$dashboard = Dashboard::find($dashboardId);
 
-		return $dashboard->delete()? [
+		return $dashboard->delete() ? [
 				$this->notify(__('Dashboard ":name" deleted, redirecting ...', ['name' => $dashboard->name])),
 				new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [self::selfLink()])
-		]: $this->notifyError(__('Error deleting dashboard'));
+		] : $this->notifyError(__('Error deleting dashboard'));
 	}
 	
 	public function reorderDashboards($view)
@@ -282,7 +282,7 @@ 
 		$grid = $view->add(['Grid', 'paginator' => false, 'menu' => false]);
 		$grid->setModel(new \atk4\data\Model(new \atk4\data\Persistence_Static($rows)));
 		
-		$grid->addDragHandler()->onReorder(function ($order) use ($dashboards) {
+		$grid->addDragHandler()->onReorder(function($order) use ($dashboards) {
 			$result = true;
 			foreach ($dashboards as $dashboard) {
 				$dashboard->position = array_search($dashboard->id, $order);
@@ -290,7 +290,7 @@ 
 				$result &= $dashboard->save();
 			}
 			
-			return $result? $this->notify(__('Dashboards reordered!')): $this->notifyError(__('Error saving order!'));
+			return $result ? $this->notify(__('Dashboards reordered!')) : $this->notifyError(__('Error saving order!'));
 		});
 			
 		$view->add(['View', 'ui' => 'buttons'])->add(['Button', __('Done'), 'primary'])->on('click', new jsExpression('location.reload()'));
@@ -367,7 +367,7 @@ 
 	
 	public function isLocked()
 	{
-		return $this->locked || ! Auth::user()->can('edit dashboard');
+		return $this->locked || !Auth::user()->can('edit dashboard');
 	}
 	
 	protected function isSingleDashboard()
@@ -383,18 +383,18 @@ 
 	 */
 	protected function dashboard()
 	{
-		if (! is_object($this->dashboard)) {
-			$this->dashboard = $this->dashboard? Dashboard::find($this->dashboard): $this->defaultUserDashboard();
+		if (!is_object($this->dashboard)) {
+			$this->dashboard = $this->dashboard ? Dashboard::find($this->dashboard) : $this->defaultUserDashboard();
 		}
 
-		return $this->dashboard?: abort(404);
+		return $this->dashboard ?: abort(404);
 	}
 	
 	protected function defaultUserDashboard()
 	{
 		$userDashboard = $this->userDashboards()->orderBy('position')->first();
 		
-		if (! $userDashboard) {
+		if (!$userDashboard) {
 			$this->lock();
 			
 			$userDashboard = $this->defaultSystemDashboard();
@@ -418,6 +418,6 @@ 
 	 */
 	protected function userId()
 	{
-		return $this->admin? 0: Auth::id();
+		return $this->admin ? 0 : Auth::id();
 	}
 }

src/Dashboard/Seeds/Applet.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 			$this->set($joint->info())->setAttr('searchkey', strtolower($joint->caption() . ';' . $joint->info()));
 		}
 		else {
-			if (! $this->locked) {
+			if (!$this->locked) {
 				$this->addControl('close', 'applet-close')->setAttr('title', __('Close applet'));
 			}
 			

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
 		
 		if ($this->admin) {
 			$this->set($joint->info())->setAttr('searchkey', strtolower($joint->caption() . ';' . $joint->info()));
-		}
-		else {
+		} else {
 			if (! $this->locked) {
 				$this->addControl('close', 'applet-close')->setAttr('title', __('Close applet'));
 			}

src/Dashboard/Integration/DashboardNavMenu.php

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 			];
 		}
 
-		return $ret? [
-				__('DASHBOARD') => count($ret) > 1? [
+		return $ret ? [
+				__('DASHBOARD') => count($ret) > 1 ? [
 						'access' => true,
 						'group' => $ret,
 						'weight' => -10000
-				]: array_merge(reset($ret), ['weight' => -10000]),
-		]: [];
+				] : array_merge(reset($ret), ['weight' => -10000]),
+		] : [];
 	}
 }
\ No newline at end of file

src/Dashboard/DashboardCore.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	{
 		// create user default dashboard as copy of the system default
 		User::created(function(User $user) {
-			if (! $defaultDashboard = Dashboard::where('user_id', 0)->first()) return;
+			if (!$defaultDashboard = Dashboard::where('user_id', 0)->first()) return;
 			
 			$userDefaultDashboard = $defaultDashboard->replicate();
 			

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 	{
 		// create user default dashboard as copy of the system default
 		User::created(function(User $user) {
-			if (! $defaultDashboard = Dashboard::where('user_id', 0)->first()) return;
+			if (! $defaultDashboard = Dashboard::where('user_id', 0)->first()) {
+				return;
+			}
 			
 			$userDefaultDashboard = $defaultDashboard->replicate();
 			

src/Dashboard/Database/Migrations/2019_09_18_173148_create_dashboard_tables.php

Spacing +2 added lines, -2 removed lines

@@ -15,14 +15,14 @@
     {
     	$this->down();
     	
-    	Schema::create('dashboards', function (Blueprint $table) {
+    	Schema::create('dashboards', function(Blueprint $table) {
     		$table->increments('id');
     		$table->unsignedInteger('user_id');
             $table->string('name', 64);
             $table->smallInteger('position')->default(0);
         });
 
-    	Schema::create('dashboard_applets', function (Blueprint $table) {
+    	Schema::create('dashboard_applets', function(Blueprint $table) {
     		$table->increments('id');
     		$table->unsignedInteger('dashboard_id');
             $table->string('class', 512);            

Indentation +34 added lines, -34 removed lines

@@ -6,42 +6,42 @@
 
 class CreateDashboardTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-    	$this->down();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$this->down();
     	
-    	Schema::create('dashboards', function (Blueprint $table) {
-    		$table->increments('id');
-    		$table->unsignedInteger('user_id');
-            $table->string('name', 64);
-            $table->smallInteger('position')->default(0);
-        });
+		Schema::create('dashboards', function (Blueprint $table) {
+			$table->increments('id');
+			$table->unsignedInteger('user_id');
+			$table->string('name', 64);
+			$table->smallInteger('position')->default(0);
+		});
 
-    	Schema::create('dashboard_applets', function (Blueprint $table) {
-    		$table->increments('id');
-    		$table->unsignedInteger('dashboard_id');
-            $table->string('class', 512);            
-            $table->smallInteger('column')->default(1);
-            $table->smallInteger('row')->default(0);
-            $table->text('options')->nullable();
+		Schema::create('dashboard_applets', function (Blueprint $table) {
+			$table->increments('id');
+			$table->unsignedInteger('dashboard_id');
+			$table->string('class', 512);            
+			$table->smallInteger('column')->default(1);
+			$table->smallInteger('row')->default(0);
+			$table->text('options')->nullable();
             
-            $table->foreign('dashboard_id')->references('id')->on('dashboards');
-        });
-    }
+			$table->foreign('dashboard_id')->references('id')->on('dashboards');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    	Schema::dropIfExists('dashboard_applets');
-    	Schema::dropIfExists('dashboards');    	
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('dashboard_applets');
+		Schema::dropIfExists('dashboards');    	
+	}
 }

src/CommonData/Database/Migrations/2019_11_10_213529_create_commondata_table.php

Indentation +25 added lines, -25 removed lines

@@ -6,31 +6,31 @@
 
 class CreateCommondataTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('commondata', function (Blueprint $table) {
-            $table->bigIncrements('id');            
-            $table->nestedSet();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('commondata', function (Blueprint $table) {
+			$table->bigIncrements('id');            
+			$table->nestedSet();
             
-            $table->string('key', 64);
-            $table->text('value')->nullable();
-            $table->integer('position')->nullable()->default(0);
-            $table->smallInteger('readonly')->nullable()->default(0);
-        });
-    }
+			$table->string('key', 64);
+			$table->text('value')->nullable();
+			$table->integer('position')->nullable()->default(0);
+			$table->smallInteger('readonly')->nullable()->default(0);
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('commondata');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('commondata');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('commondata', function (Blueprint $table) {
+        Schema::create('commondata', function(Blueprint $table) {
             $table->bigIncrements('id');            
             $table->nestedSet();
             

src/CommonData/CommonDataSettings.php

Braces +3 added lines, -1 removed lines

@@ -112,7 +112,9 @@
 	
 	public function getControlButtonsHtml($row)
 	{
-		if ($row['readonly']) return '';
+		if ($row['readonly']) {
+			return '';
+		}
 		
 		$ret = '';
 		foreach ($this->buttons as $button) {

Spacing +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		ActionBar::addButton('back')->link(url('view/system'));
 		
-		$this->parentId = $this->stickyGet('parentId')?: null;
+		$this->parentId = $this->stickyGet('parentId') ?: null;
 		
 		$this->displayBreadCrumb();
 		
@@ -75,14 +75,14 @@ 
 
 		$this->grid->setModel($model = $this->getModel());
 		
-		if ($model->action('count')->getOne() ) {
+		if ($model->action('count')->getOne()) {
 			$this->grid->table->onRowClick(new jsExpression(
 					'document.location=\'?parentId=\'+[]',
 					[(new jQuery())->data('id')]
 			));
 		}
 		
-		$this->grid->addDragHandler()->onReorder(function ($order) {
+		$this->grid->addDragHandler()->onReorder(function($order) {
 			$result = true;
 			foreach ($this->nodes()->get() as $node) {
 				$node->position = array_search($node->id, $order);
@@ -90,14 +90,14 @@ 
 				$result &= $node->save();
 			}
 			
-			$notifier = $result? $this->notify(__('Items reordered!')): $this->notifyError(__('Error saving order!'));
+			$notifier = $result ? $this->notify(__('Items reordered!')) : $this->notifyError(__('Error saving order!'));
 			
 			return $this->grid->jsSave($notifier);
 		});
 		
 		$this->addContolButton('update', $this->getUpdateModal(), 'edit');
 			
-		$this->addContolButton('delete', function ($jschain, $id) {
+		$this->addContolButton('delete', function($jschain, $id) {
 			CommonData::find($id)->delete();
 				
 			return $jschain->closest('tr')->transition('fade left');
@@ -119,7 +119,7 @@ 
 			$ret .= $button->getHtml();
 		}
 		
-		return $ret;;
+		return $ret; ;
 	}
 	
 	public function getUpdateModal()
@@ -128,9 +128,9 @@ 
 		
 		$grid->pageUpdate = $grid->add($grid->pageUpdate ?: $grid->pageDefault, ['short_name'=>'edit']);
 		
-		$modal = new jsModal(__('Edit'), $grid->pageUpdate, [$grid->name => $grid->jsRow()->data('id'), $grid->name.'_sort' => $grid->getSortBy()]);
+		$modal = new jsModal(__('Edit'), $grid->pageUpdate, [$grid->name => $grid->jsRow()->data('id'), $grid->name . '_sort' => $grid->getSortBy()]);
 		
-		$grid->pageUpdate->set(function () {
+		$grid->pageUpdate->set(function() {
 			$grid = $this->grid;
 			
 			$grid->model->load($grid->app->stickyGet($grid->name));
@@ -149,7 +149,7 @@ 
 			// set save handler with reload trigger
 			// adds default submit hook if it is not already set for this form
 			if (!$grid->formUpdate->hookHasCallbacks('submit')) {
-				$grid->formUpdate->onSubmit(function ($form) {
+				$grid->formUpdate->onSubmit(function($form) {
 					$form->model->save();
 					
 					return $this->grid->jsSaveUpdate();
@@ -166,7 +166,7 @@ 
 		
 		$this->grid->on('click', ".$class", $callback, [$this->grid->table->jsRow()->data('id')]);
 		
-		$this->buttons[$name] = new \atk4\ui\Button($icon? compact('icon'): $name);
+		$this->buttons[$name] = new \atk4\ui\Button($icon ? compact('icon') : $name);
 		
 		$this->buttons[$name]->app = $this->app;
 		
@@ -193,7 +193,7 @@ 
 		
 		$rowsEmpty = [];
 		
-		$model = new \atk4\data\Model($rows? new \atk4\data\Persistence_Static($rows): new \atk4\data\Persistence_Array($rowsEmpty));
+		$model = new \atk4\data\Model($rows ? new \atk4\data\Persistence_Static($rows) : new \atk4\data\Persistence_Array($rowsEmpty));
 		
 		$captions = [
 				'position' => __('Position'),
@@ -203,7 +203,7 @@ 
 		];
 		
 		foreach ($captions as $key => $caption) {
-			$field = $rows? $model->hasField($key): $model->addField($key);
+			$field = $rows ? $model->hasField($key) : $model->addField($key);
 			
 			if ($key === 'readonly') {
 				$field->setDefaults(['ui' => ['visible' => false]]);
@@ -219,7 +219,7 @@ 
 	
 	public function getNodeForm()
 	{
-		if (! $this->form) {
+		if (!$this->form) {
 			$this->form = new Form(['buttonSave' => ['Button', __('Save'), 'primary']]);
 			
 			$this->form->addHook('submit', function($form) {
@@ -233,7 +233,7 @@ 
 				
 				CommonData::create(array_merge($values, [
 						'position' => $this->nodes()->max('position') + 1
-				]), $this->parentId? CommonData::find($this->parentId): null);
+				]), $this->parentId ? CommonData::find($this->parentId) : null);
 				
 				return $this->grid->jsSaveCreate();
 			});

tests/CommonDataTest.php

Indentation +50 added lines, -50 removed lines

@@ -25,81 +25,81 @@
 		$this->loadMigrationsFrom(__DIR__ . '../../src/CommonData/Database/Migrations');
 	}
 	
-    public function testStoreRetrieve()
-    {
-    	// creating -  retrieving array
-    	$arrayExpected = ['c' => 'cc', 'b' => 'bb', 'a' => 'aa', ];
+	public function testStoreRetrieve()
+	{
+		// creating -  retrieving array
+		$arrayExpected = ['c' => 'cc', 'b' => 'bb', 'a' => 'aa', ];
     	
-    	CommonData::newArray('abc/def', $arrayExpected);
+		CommonData::newArray('abc/def', $arrayExpected);
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayExpected, $arrayActual, 'Problem retrieving commondata sorted by position!');
+		$this->assertEquals($arrayExpected, $arrayActual, 'Problem retrieving commondata sorted by position!');
         
-        // retrieving sorted array by key
-        $arraySortKey = $arrayExpected;
-        ksort($arraySortKey);
+		// retrieving sorted array by key
+		$arraySortKey = $arrayExpected;
+		ksort($arraySortKey);
         
-        $this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'key'), 'Problem retrieving commondata sorted by key!');
+		$this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'key'), 'Problem retrieving commondata sorted by key!');
         
-        // retrieving sorted array by value
-        $arraySortValue = $arrayExpected;
-        sort($arraySortValue);
+		// retrieving sorted array by value
+		$arraySortValue = $arrayExpected;
+		sort($arraySortValue);
         
-        $this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'value'), 'Problem retrieving commondata sorted by value!');
+		$this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'value'), 'Problem retrieving commondata sorted by value!');
         
-        // retrieving array value
-        $valueActual = CommonData::getValue('abc/def/a');
+		// retrieving array value
+		$valueActual = CommonData::getValue('abc/def/a');
         
-        $this->assertEquals($arrayExpected['a'], $valueActual, 'Problem retrieving commondata value!');
+		$this->assertEquals($arrayExpected['a'], $valueActual, 'Problem retrieving commondata value!');
         
-        // setting array values
-        $arrayChanged = ['a' => 'aaa', 'b' => 'bbb', 'c' => 'ccc'];
+		// setting array values
+		$arrayChanged = ['a' => 'aaa', 'b' => 'bbb', 'c' => 'ccc'];
         
-        foreach ($arrayChanged as $key => $value) {
-        	CommonData::setValue('abc/def/' . $key, $value);
-        }
+		foreach ($arrayChanged as $key => $value) {
+			CommonData::setValue('abc/def/' . $key, $value);
+		}
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayChanged, $arrayActual, 'Problem setting commondata value!');
+		$this->assertEquals($arrayChanged, $arrayActual, 'Problem setting commondata value!');
         
-        // deleting array node
-        unset($arrayChanged['a']);
+		// deleting array node
+		unset($arrayChanged['a']);
         
-        CommonData::deleteArray('abc/def/a');
+		CommonData::deleteArray('abc/def/a');
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayChanged, $arrayActual, 'Problem deleting commondata node!');
+		$this->assertEquals($arrayChanged, $arrayActual, 'Problem deleting commondata node!');
         
-        // extending array
-        $arrayExtension = ['a' => 'aaa'];
+		// extending array
+		$arrayExtension = ['a' => 'aaa'];
         
-        $arrayChanged = array_merge($arrayChanged, $arrayExtension);
+		$arrayChanged = array_merge($arrayChanged, $arrayExtension);
         
-        CommonData::extendArray('abc/def', $arrayExtension);
+		CommonData::extendArray('abc/def', $arrayExtension);
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayChanged, $arrayActual, 'Problem extending commondata array!');
-    }
+		$this->assertEquals($arrayChanged, $arrayActual, 'Problem extending commondata array!');
+	}
     
-    public function testNonExistingArrayException()
-    {
-    	$this->expectException(CommonDataNotFound::class);
+	public function testNonExistingArrayException()
+	{
+		$this->expectException(CommonDataNotFound::class);
     	
-    	CommonData::getArray('abc/d/ef');
-    }
+		CommonData::getArray('abc/d/ef');
+	}
     
-    public function testNonExistingArraySilent()
-    {
-    	$this->assertEquals([], CommonData::getArray('abc/d/ef', 'position', true), 'Problem retrieving non-existent commondata array silently!');
-    }
+	public function testNonExistingArraySilent()
+	{
+		$this->assertEquals([], CommonData::getArray('abc/d/ef', 'position', true), 'Problem retrieving non-existent commondata array silently!');
+	}
     
-    public function testNonExistingValue()
-    {
-    	$this->assertFalse(CommonData::getValue('abc/d/ef'), 'Problem retrieving non-existent commondata value!');
-    }
+	public function testNonExistingValue()
+	{
+		$this->assertFalse(CommonData::getValue('abc/d/ef'), 'Problem retrieving non-existent commondata value!');
+	}
     
 }

src/CommonData/Database/Models/CommonData.php

Indentation +156 added lines, -156 removed lines

@@ -9,204 +9,204 @@
 class CommonDataNotFound extends \Exception {}
 
 class CommonData extends Model {
-    use NodeTrait;
+	use NodeTrait;
     
-    protected $table = 'commondata';
-    public $timestamps = false;
-    protected static $unguarded = true;
+	protected $table = 'commondata';
+	public $timestamps = false;
+	protected static $unguarded = true;
     
-    protected static $cache = [
-    		'id' => [],
-    		'value' => [],
-    		'array' => []
-    ];
+	protected static $cache = [
+			'id' => [],
+			'value' => [],
+			'array' => []
+	];
     
-    public static function getId($path, $clearCache = false)
-    {
-    	$parentId = null;
-    	foreach(explode('/', trim($path,'/')) as $nodeKey) {
-    		if ($nodeKey === '') continue; //ignore empty paths
+	public static function getId($path, $clearCache = false)
+	{
+		$parentId = null;
+		foreach(explode('/', trim($path,'/')) as $nodeKey) {
+			if ($nodeKey === '') continue; //ignore empty paths
     		
-    		if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
-    			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
-    				return false;
-    			}
+			if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
+				if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+					return false;
+				}
 
-    			self::$cache['id'][$parentId][$nodeKey] = $node->id;
-    		}
+				self::$cache['id'][$parentId][$nodeKey] = $node->id;
+			}
     		
-    		$parentId = $id = self::$cache['id'][$parentId][$nodeKey];
-    	}
+			$parentId = $id = self::$cache['id'][$parentId][$nodeKey];
+		}
     	
-    	return $id;
-    }
+		return $id;
+	}
    
-    public static function newId($path, $readonly = false)
-    {
-    	if (! $path = trim($path,'/')) return false;
+	public static function newId($path, $readonly = false)
+	{
+		if (! $path = trim($path,'/')) return false;
 
-    	$id = $parentId = null;
-    	foreach(explode('/', $path) as $nodeKey) {
-    		if ($nodeKey === '') continue;
+		$id = $parentId = null;
+		foreach(explode('/', $path) as $nodeKey) {
+			if ($nodeKey === '') continue;
 
-    		if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
-    			$node = self::create([
-    					'parent_id' => $parentId,
-    					'key' => $nodeKey,
-    					'readonly' => $readonly,
-    					'position' => self::where('parent_id', $parentId)->count()
-    			], $parentId? self::find($parentId): null);
-    		}
+			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+				$node = self::create([
+						'parent_id' => $parentId,
+						'key' => $nodeKey,
+						'readonly' => $readonly,
+						'position' => self::where('parent_id', $parentId)->count()
+				], $parentId? self::find($parentId): null);
+			}
     		
-    		$parentId = $id = $node->id;
-    	}
+			$parentId = $id = $node->id;
+		}
     	
-    	return $id;
-    }
+		return $id;
+	}
     
-    public static function setValue($path, $value, $overwrite = true, $readonly = false)
-    {
-    	if (! $id = self::getId($path)) {
-    		if (! $id = self::newId($path, $readonly)) return false;
-    	} else {
-    		if (! $overwrite) return false;
-    	}
+	public static function setValue($path, $value, $overwrite = true, $readonly = false)
+	{
+		if (! $id = self::getId($path)) {
+			if (! $id = self::newId($path, $readonly)) return false;
+		} else {
+			if (! $overwrite) return false;
+		}
 
-    	self::findOrFail($id)->update(compact('value', 'readonly'));
+		self::findOrFail($id)->update(compact('value', 'readonly'));
     	
-    	self::clearCache();
+		self::clearCache();
     	
-    	return true;
-    }
+		return true;
+	}
     
-    public static function clearCache()
-    {
-    	self::$cache = array_fill_keys(array_keys(self::$cache), []);
-    }
+	public static function clearCache()
+	{
+		self::$cache = array_fill_keys(array_keys(self::$cache), []);
+	}
     
-    public static function getValue($path, $translate = false)
-    {
-    	$key = md5(serialize($path));
+	public static function getValue($path, $translate = false)
+	{
+		$key = md5(serialize($path));
     	
-    	if (! isset(self::$cache['value'][$key])) {
-    		if(! $id = self::getId($path)) return false;
+		if (! isset(self::$cache['value'][$key])) {
+			if(! $id = self::getId($path)) return false;
 
-    		self::$cache['value'][$key] = self::find($id)->value;
-	    }
+			self::$cache['value'][$key] = self::find($id)->value;
+		}
 	    
-	    return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
-    }
+		return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
+	}
         
-    /**
-     * Creates new array for common use.
-     *
-     * @param $path string
-     * @param $array array initialization value
-     * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended
-     * @param $readonly bool do not allow user to change this array from GUI
-     */
-    public static function newArray($path, $array, $overwrite = false, $readonly = false)
-    {
-    	self::validateArrayKeys($array);
+	/**
+	 * Creates new array for common use.
+	 *
+	 * @param $path string
+	 * @param $array array initialization value
+	 * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended
+	 * @param $readonly bool do not allow user to change this array from GUI
+	 */
+	public static function newArray($path, $array, $overwrite = false, $readonly = false)
+	{
+		self::validateArrayKeys($array);
     		
-    	$path = trim($path, '/');
+		$path = trim($path, '/');
     	
 		if ($id = self::getId($path)) {
-    		if (! $overwrite) {
-    			self::extendArray($path, $array);
-    			return true;
-    		}
+			if (! $overwrite) {
+				self::extendArray($path, $array);
+				return true;
+			}
     				
-    		self::find($id)->delete();
-    	}
+			self::find($id)->delete();
+		}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+		if(! $id = self::newId($path, $readonly)) return false;
     			
-    	if ($overwrite) {
-    		self::find($id)->update(compact('readonly'));
-    	}
+		if ($overwrite) {
+			self::find($id)->update(compact('readonly'));
+		}
     			
-    	foreach ($array as $key => $value) {
-    		self::setValue($path . '/' . $key, $value, true, $readonly);
-    	}
+		foreach ($array as $key => $value) {
+			self::setValue($path . '/' . $key, $value, true, $readonly);
+		}
     			
-    	return true;
-    }
+		return true;
+	}
 
-    /**
-     * Extends common data array.
-     *
-     * @param $path string
-     * @param $array array values to insert
-     * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved
-     */
-    public static function extendArray($path, $array, $overwrite=false, $readonly=false)
-    {
-    	self::validateArrayKeys($array);
+	/**
+	 * Extends common data array.
+	 *
+	 * @param $path string
+	 * @param $array array values to insert
+	 * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved
+	 */
+	public static function extendArray($path, $array, $overwrite=false, $readonly=false)
+	{
+		self::validateArrayKeys($array);
     	
-    	$path = trim($path, '/');
+		$path = trim($path, '/');
     			
-    	if (! self::getId($path)){
-    		return self::newArray($path, $array, $overwrite, $readonly);
-    	}
+		if (! self::getId($path)){
+			return self::newArray($path, $array, $overwrite, $readonly);
+		}
 
-    	foreach ($array as $key => $value) {
-    		self::setValue($path . '/' . $key, $value, $overwrite, $readonly);
-    	}
-    }
+		foreach ($array as $key => $value) {
+			self::setValue($path . '/' . $key, $value, $overwrite, $readonly);
+		}
+	}
         
-    /**
-     * Returns common data array.
-     *
-     * @param string array name
-     * @return mixed returns an array if such array exists, false otherwise
-     */
-    public static function getArray($path, $sortColumn = 'position', $silent = false)
-    {
-    	return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all();
-    }
+	/**
+	 * Returns common data array.
+	 *
+	 * @param string array name
+	 * @return mixed returns an array if such array exists, false otherwise
+	 */
+	public static function getArray($path, $sortColumn = 'position', $silent = false)
+	{
+		return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all();
+	}
 
-    /**
-     * Removes common data array or entry.
-     *
-     * @param $path string
-     * @return true on success, false otherwise
-     */
-    public static function deleteArray($path){
-    	if (! $id = self::getId($path, true)) return false;
+	/**
+	 * Removes common data array or entry.
+	 *
+	 * @param $path string
+	 * @return true on success, false otherwise
+	 */
+	public static function deleteArray($path){
+		if (! $id = self::getId($path, true)) return false;
     	
-    	self::find($id)->delete();
+		self::find($id)->delete();
     	
-    	self::clearCache();
-    }
+		self::clearCache();
+	}
 
-    /**
-     * Returns common data collection.
-     *
-     * @param $path string
-     * @return Collection
-     */
-    public static function getCollection($path, $silent = false)
-    {
-    	if(isset(self::$cache['array'][$path])) {
-    		return self::$cache['array'][$path];
-    	}
+	/**
+	 * Returns common data collection.
+	 *
+	 * @param $path string
+	 * @return Collection
+	 */
+	public static function getCollection($path, $silent = false)
+	{
+		if(isset(self::$cache['array'][$path])) {
+			return self::$cache['array'][$path];
+		}
     	
-    	if (! $id = self::getId($path)) {
-    		if ($silent) return collect();
+		if (! $id = self::getId($path)) {
+			if ($silent) return collect();
     		
-    		throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
-    	}
+			throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
+		}
     	
-    	return self::$cache['array'][$path] = self::where('parent_id', $id)->get();
-    }
+		return self::$cache['array'][$path] = self::where('parent_id', $id)->get();
+	}
     
-    protected static function validateArrayKeys($array)
-    {
-    	foreach($array as $key => $value) {
-    		if (strpos($key, '/') === false) continue;
+	protected static function validateArrayKeys($array)
+	{
+		foreach($array as $key => $value) {
+			if (strpos($key, '/') === false) continue;
     		
-    		\Exception('Invalid common data key: '. $key);
-    	}
-    }
+			\Exception('Invalid common data key: '. $key);
+		}
+	}
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -24,11 +24,11 @@ 
     public static function getId($path, $clearCache = false)
     {
     	$parentId = null;
-    	foreach(explode('/', trim($path,'/')) as $nodeKey) {
+    	foreach (explode('/', trim($path, '/')) as $nodeKey) {
     		if ($nodeKey === '') continue; //ignore empty paths
     		
     		if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
-    			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+    			if (!$node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
     				return false;
     			}
 
@@ -43,19 +43,19 @@ 
    
     public static function newId($path, $readonly = false)
     {
-    	if (! $path = trim($path,'/')) return false;
+    	if (!$path = trim($path, '/')) return false;
 
     	$id = $parentId = null;
-    	foreach(explode('/', $path) as $nodeKey) {
+    	foreach (explode('/', $path) as $nodeKey) {
     		if ($nodeKey === '') continue;
 
-    		if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+    		if (!$node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
     			$node = self::create([
     					'parent_id' => $parentId,
     					'key' => $nodeKey,
     					'readonly' => $readonly,
     					'position' => self::where('parent_id', $parentId)->count()
-    			], $parentId? self::find($parentId): null);
+    			], $parentId ? self::find($parentId) : null);
     		}
     		
     		$parentId = $id = $node->id;
@@ -66,10 +66,10 @@ 
     
     public static function setValue($path, $value, $overwrite = true, $readonly = false)
     {
-    	if (! $id = self::getId($path)) {
-    		if (! $id = self::newId($path, $readonly)) return false;
+    	if (!$id = self::getId($path)) {
+    		if (!$id = self::newId($path, $readonly)) return false;
     	} else {
-    		if (! $overwrite) return false;
+    		if (!$overwrite) return false;
     	}
 
     	self::findOrFail($id)->update(compact('value', 'readonly'));
@@ -88,13 +88,13 @@ 
     {
     	$key = md5(serialize($path));
     	
-    	if (! isset(self::$cache['value'][$key])) {
-    		if(! $id = self::getId($path)) return false;
+    	if (!isset(self::$cache['value'][$key])) {
+    		if (!$id = self::getId($path)) return false;
 
     		self::$cache['value'][$key] = self::find($id)->value;
 	    }
 	    
-	    return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
+	    return $translate ? __(self::$cache['value'][$key]) : self::$cache['value'][$key];
     }
         
     /**
@@ -112,7 +112,7 @@ 
     	$path = trim($path, '/');
     	
 		if ($id = self::getId($path)) {
-    		if (! $overwrite) {
+    		if (!$overwrite) {
     			self::extendArray($path, $array);
     			return true;
     		}
@@ -120,7 +120,7 @@ 
     		self::find($id)->delete();
     	}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+    	if (!$id = self::newId($path, $readonly)) return false;
     			
     	if ($overwrite) {
     		self::find($id)->update(compact('readonly'));
@@ -140,13 +140,13 @@ 
      * @param $array array values to insert
      * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved
      */
-    public static function extendArray($path, $array, $overwrite=false, $readonly=false)
+    public static function extendArray($path, $array, $overwrite = false, $readonly = false)
     {
     	self::validateArrayKeys($array);
     	
     	$path = trim($path, '/');
     			
-    	if (! self::getId($path)){
+    	if (!self::getId($path)) {
     		return self::newArray($path, $array, $overwrite, $readonly);
     	}
 
@@ -172,8 +172,8 @@ 
      * @param $path string
      * @return true on success, false otherwise
      */
-    public static function deleteArray($path){
-    	if (! $id = self::getId($path, true)) return false;
+    public static function deleteArray($path) {
+    	if (!$id = self::getId($path, true)) return false;
     	
     	self::find($id)->delete();
     	
@@ -188,11 +188,11 @@ 
      */
     public static function getCollection($path, $silent = false)
     {
-    	if(isset(self::$cache['array'][$path])) {
+    	if (isset(self::$cache['array'][$path])) {
     		return self::$cache['array'][$path];
     	}
     	
-    	if (! $id = self::getId($path)) {
+    	if (!$id = self::getId($path)) {
     		if ($silent) return collect();
     		
     		throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
@@ -203,10 +203,10 @@ 
     
     protected static function validateArrayKeys($array)
     {
-    	foreach($array as $key => $value) {
+    	foreach ($array as $key => $value) {
     		if (strpos($key, '/') === false) continue;
     		
-    		\Exception('Invalid common data key: '. $key);
+    		\Exception('Invalid common data key: ' . $key);
     	}
     }
 }
\ No newline at end of file

Braces +31 added lines, -10 removed lines

@@ -25,7 +25,10 @@ 
     {
     	$parentId = null;
     	foreach(explode('/', trim($path,'/')) as $nodeKey) {
-    		if ($nodeKey === '') continue; //ignore empty paths
+    		if ($nodeKey === '') {
+    			continue;
+    		}
+    		//ignore empty paths
     		
     		if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
     			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
@@ -43,11 +46,15 @@ 
    
     public static function newId($path, $readonly = false)
     {
-    	if (! $path = trim($path,'/')) return false;
+    	if (! $path = trim($path,'/')) {
+    		return false;
+    	}
 
     	$id = $parentId = null;
     	foreach(explode('/', $path) as $nodeKey) {
-    		if ($nodeKey === '') continue;
+    		if ($nodeKey === '') {
+    			continue;
+    		}
 
     		if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
     			$node = self::create([
@@ -67,9 +74,13 @@ 
     public static function setValue($path, $value, $overwrite = true, $readonly = false)
     {
     	if (! $id = self::getId($path)) {
-    		if (! $id = self::newId($path, $readonly)) return false;
+    		if (! $id = self::newId($path, $readonly)) {
+    			return false;
+    		}
     	} else {
-    		if (! $overwrite) return false;
+    		if (! $overwrite) {
+    			return false;
+    		}
     	}
 
     	self::findOrFail($id)->update(compact('value', 'readonly'));
@@ -89,7 +100,9 @@ 
     	$key = md5(serialize($path));
     	
     	if (! isset(self::$cache['value'][$key])) {
-    		if(! $id = self::getId($path)) return false;
+    		if(! $id = self::getId($path)) {
+    			return false;
+    		}
 
     		self::$cache['value'][$key] = self::find($id)->value;
 	    }
@@ -120,7 +133,9 @@ 
     		self::find($id)->delete();
     	}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+    	if(! $id = self::newId($path, $readonly)) {
+    		return false;
+    	}
     			
     	if ($overwrite) {
     		self::find($id)->update(compact('readonly'));
@@ -173,7 +188,9 @@ 
      * @return true on success, false otherwise
      */
     public static function deleteArray($path){
-    	if (! $id = self::getId($path, true)) return false;
+    	if (! $id = self::getId($path, true)) {
+    		return false;
+    	}
     	
     	self::find($id)->delete();
     	
@@ -193,7 +210,9 @@ 
     	}
     	
     	if (! $id = self::getId($path)) {
-    		if ($silent) return collect();
+    		if ($silent) {
+    			return collect();
+    		}
     		
     		throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
     	}
@@ -204,7 +223,9 @@ 
     protected static function validateArrayKeys($array)
     {
     	foreach($array as $key => $value) {
-    		if (strpos($key, '/') === false) continue;
+    		if (strpos($key, '/') === false) {
+    			continue;
+    		}
     		
     		\Exception('Invalid common data key: '. $key);
     	}