x-systems / epesi-base

src/CommonData/Database/Models/CommonData.php

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

src/CommonData/CommonDataSettings.php

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->on('click', 'td', new jsExpression(
 					'document.location=\'?parentId=\'+[]',
 					[(new jQuery())->closest('tr')->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();
 			});