x-systems / epesi-base

src/CommonData/CommonDataSettings.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 	    $parent = $this->stickyGet('parent');
 	    
 	    if (isset($parent)) {
-	        $this->memorize('parent', $parent?: null);
+	        $this->memorize('parent', $parent ?: null);
 	    }
 
 	    $this->ancestors = Models\CommonData::ancestorsAndSelf($this->recall('parent'));
@@ -82,13 +82,13 @@ 
 		        [$this->grid->jsRow()->data('id')]
 		));
 
-		$this->grid->addDragHandler()->onReorder(function ($order) {
+		$this->grid->addDragHandler()->onReorder(function($order) {
 			$result = true;
 			foreach ($this->nodes() as $node) {
 				$result &= $node->save(['position' => array_search($node->id, $order)]);
 			}
 			
-			$notifier = $result? $this->notifySuccess(__('Items reordered!')): $this->notifyError(__('Error saving order!'));
+			$notifier = $result ? $this->notifySuccess(__('Items reordered!')) : $this->notifyError(__('Error saving order!'));
 			
 			return $this->grid->jsSave($notifier);
 		});

src/CommonData/Models/CommonData.php

Spacing +25 added lines, -25 removed lines

@@ -47,7 +47,7 @@ 
     public static function getId($path, $clearCache = false)
     {
     	$id = null;
-    	foreach(explode('/', trim($path,'/')) as $nodeKey) {
+    	foreach (explode('/', trim($path, '/')) as $nodeKey) {
     	    $parentId = $id;
     	    
     		if ($nodeKey === '') continue; //ignore empty paths
@@ -55,7 +55,7 @@ 
     		if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
     		    $node = self::siblings($parentId)->addCondition('key', $nodeKey)->tryLoadAny();
     		    
-    			if (! $node->loaded()) return false;
+    			if (!$node->loaded()) return false;
 
     			self::$cache['id'][$parentId][$nodeKey] = $node->id;
     		}
@@ -68,10 +68,10 @@ 
    
     public static function newId($path, $readonly = false)
     {
-    	if (! $path = trim($path,'/')) return false;
+    	if (!$path = trim($path, '/')) return false;
 
     	$id = null;
-    	foreach(explode('/', $path) as $nodeKey) {
+    	foreach (explode('/', $path) as $nodeKey) {
     		if ($nodeKey === '') continue;
     		
     		$parentId = $id;
@@ -95,10 +95,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::create()->tryLoad($id)->save(compact('value', 'readonly'));
@@ -117,13 +117,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::create()->tryLoad($id)->get('value');
 	    }
 	    
-	    return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
+	    return $translate ? __(self::$cache['value'][$key]) : self::$cache['value'][$key];
     }
         
     /**
@@ -141,7 +141,7 @@ 
     	$path = trim($path, '/');
     	
 		if ($id = self::getId($path)) {
-    		if (! $overwrite) {
+    		if (!$overwrite) {
     			self::extendArray($path, $array);
     			return true;
     		}
@@ -149,7 +149,7 @@ 
     		self::create()->delete($id);
     	}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+    	if (!$id = self::newId($path, $readonly)) return false;
     			
     	if ($overwrite) {
     	    self::create()->tryLoad($id)->save(compact('readonly'));
@@ -169,13 +169,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);
     	}
 
@@ -201,8 +201,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::create()->delete($id);
     	
@@ -211,26 +211,26 @@ 
     
     public static function siblings($parent = null)
     {
-        $parentId = is_numeric($parent)? $parent: self::getId($parent);
+        $parentId = is_numeric($parent) ? $parent : self::getId($parent);
 
         $model = self::create();
         
         //@TODO: remove below when adding null condition fixed
-        return $parentId? $model->addCondition('parent', $parentId): $model->addCondition($model->expr('parent is NULL'));
+        return $parentId ? $model->addCondition('parent', $parentId) : $model->addCondition($model->expr('parent is NULL'));
     }
         
     public static function ancestors($node)
     {
-        $node = is_numeric($node)? self::create()->tryLoad($node): $node;
+        $node = is_numeric($node) ? self::create()->tryLoad($node) : $node;
 
-        if (! $node['parent']) return [];
+        if (!$node['parent']) return [];
         
         return array_filter(array_merge([$node['parent']], self::ancestors($node['parent'])));
     }
     
     public static function ancestorsAndSelf($node)
     {
-        $node = is_numeric($node)? self::create()->tryLoad($node): $node;
+        $node = is_numeric($node) ? self::create()->tryLoad($node) : $node;
         
         return array_filter(array_merge([$node['id']], self::ancestors($node)));
     }
@@ -243,11 +243,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);
@@ -258,10 +258,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/Fields/CommonData.php

Spacing +5 added lines, -5 removed lines

@@ -63,12 +63,12 @@ 
 	    
 	    $path = array_shift($fields);
 	    
-	    return $fields? compact('path', 'fields'): false;
+	    return $fields ? compact('path', 'fields') : false;
 	}
 	
 	public function getDependencyPath($data)
 	{
-	    if (! $dependency = $this->getDependency()) return false;
+	    if (!$dependency = $this->getDependency()) return false;
 	    
 	    return implode('/', array_merge([$dependency['path']], array_intersect_key($data, array_flip($dependency['fields']))));
 	}
@@ -82,12 +82,12 @@ 
 	
 	public static function serialize($field, $value, $persistence)
 	{
-	    return $field->multiple? implode(',', (array) $value): $value;
+	    return $field->multiple ? implode(',', (array) $value) : $value;
 	}
 	
 	public static function unserialize($field, $value, $persistence)
 	{
-	    return $field->multiple? explode(',', $value): $value;
+	    return $field->multiple ? explode(',', $value) : $value;
 	}
 
 	public function format($row, $field)
@@ -102,6 +102,6 @@ 
 	
 	public function normalize($value)
 	{
-	    return $this->multiple? parent::normalize($value): $value;
+	    return $this->multiple ? parent::normalize($value) : $value;
 	}
 }
\ No newline at end of file

src/Dashboard/DashboardView.php

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
 	
 	public function body()
 	{
-		if (! $this->isSingleDashboard()) {
+		if (!$this->isSingleDashboard()) {
 			$this->location($this->dashboard()['name']);
 		}
 		
@@ -45,7 +45,7 @@ 
 		
 		$applets = $dashboard->ref('applets')->setOrder(['column', 'row']);
 
-		$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) {
 		    $columnApplets = clone $applets;
@@ -71,7 +71,7 @@ 
 			}
 		}
 		
-		if (! $this->isLocked()) {
+		if (!$this->isLocked()) {
 			$columns->js(true)->find('.sortable')->sortable([
 					'cursor' => 'move',
 					'handle' => '.panel-sortable-handle',
@@ -89,7 +89,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;
@@ -136,7 +136,7 @@ 
 				]
 		]);
 
-		foreach ( AppletJoint::collect() as $applet ) {
+		foreach (AppletJoint::collect() as $applet) {
 			$col->add([
 					new Applet(),
 					'appletId' => 'new_' . str_ireplace('\\', '-', get_class($applet)),
@@ -260,17 +260,17 @@ 
 		
 		$name = $dashboard['name'];
 
-		return $dashboard->delete()? [
+		return $dashboard->delete() ? [
 		        $this->notifySuccess(__('Dashboard ":name" deleted, redirecting ...', compact('name'))),
 		        new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [$this->selfLink()])
-		]: $this->notifyError(__('Error deleting dashboard'));
+		] : $this->notifyError(__('Error deleting dashboard'));
 	}
 	
 	public function reorderDashboards($view)
 	{
 		$grid = $view->add(['Grid', 'paginator' => false, 'menu' => false, 'model' => $this->userDashboards()->setOrder('position')]);
 	
-		$grid->addDragHandler()->onReorder(function ($order) use ($grid) {
+		$grid->addDragHandler()->onReorder(function($order) use ($grid) {
 		    foreach ($this->userDashboards() as $dashboard) {
 				$dashboard->save(['position' => array_search($dashboard->id, $order)]);
 			}
@@ -352,7 +352,7 @@ 
 	
 	public function isLocked()
 	{
-		return $this->locked || ! Auth::user()->can('edit dashboard');
+		return $this->locked || !Auth::user()->can('edit dashboard');
 	}
 	
 	protected function isSingleDashboard()
@@ -368,18 +368,18 @@ 
 	 */
 	protected function dashboard()
 	{
-		if (! is_object($this->dashboard)) {
-			$this->dashboard = $this->dashboard? Dashboard::create()->tryLoad($this->dashboard): $this->defaultUserDashboard();
+		if (!is_object($this->dashboard)) {
+			$this->dashboard = $this->dashboard ? Dashboard::create()->tryLoad($this->dashboard) : $this->defaultUserDashboard();
 		}
 
-		return $this->dashboard?: abort(404);
+		return $this->dashboard ?: abort(404);
 	}
 	
 	protected function defaultUserDashboard()
 	{
 		$userDashboard = $this->userDashboards()->setOrder('position')->tryLoadAny();
 		
-		if (! $userDashboard->loaded()) {
+		if (!$userDashboard->loaded()) {
 			$this->lock();
 			
 			$userDashboard = $this->defaultSystemDashboard();
@@ -403,6 +403,6 @@ 
 	 */
 	protected function userId()
 	{
-		return $this->admin? 0: Auth::id();
+		return $this->admin ? 0 : Auth::id();
 	}
 }

src/Dashboard/DashboardCore.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	{
 		// create user default dashboard as copy of the system default
 		User::created(function(User $user) {
-		    if (! $defaultDashboard = Models\Dashboard::create()->addCondition('user_id', 0)->tryLoadAny()) return;
+		    if (!$defaultDashboard = Models\Dashboard::create()->addCondition('user_id', 0)->tryLoadAny()) return;
 			$userDefaultDashboard = (clone $defaultDashboard)->duplicate()->save([
 			        'name' => __('Default'),
 			        'user_id' => $user->id