x-systems / epesi-base

src/CommonData/CommonDataSettings.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 	    //@TODO: remove below when adding null condition fixed
 	    if ($parent = $this->parent()) {
 	        $nodes->addCondition('parent', $parent);
-	    }
-	    else {
+	    } else {
 	        $nodes->addCondition($nodes->expr('parent is NULL'));
 	    }
 

src/CommonData/Models/CommonData.php

Braces +38 added lines, -14 removed lines

@@ -50,12 +50,17 @@ 
     	foreach(explode('/', trim($path,'/')) as $nodeKey) {
     	    $parentId = $id;
     	    
-    		if ($nodeKey === '') continue; //ignore empty paths
+    		if ($nodeKey === '') {
+    			continue;
+    		}
+    		//ignore empty paths
     		
     		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,11 +73,15 @@ 
    
     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) {
-    		if ($nodeKey === '') continue;
+    		if ($nodeKey === '') {
+    			continue;
+    		}
     		
     		$parentId = $id;
     		
@@ -80,8 +89,7 @@ 
 
     		if ($node->loaded()) {
     		    $id = $node->id;
-    		}
-    		else {
+    		} else {
     		    $id = $node->insert([
     		            'parent' => $parentId,
     		            'key' => $nodeKey,
@@ -96,9 +104,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::create()->tryLoad($id)->save(compact('value', 'readonly'));
@@ -118,7 +130,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::create()->tryLoad($id)->get('value');
 	    }
@@ -149,7 +163,9 @@ 
     		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'));
@@ -202,7 +218,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::create()->delete($id);
     	
@@ -223,7 +241,9 @@ 
     {
         $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'])));
     }
@@ -248,7 +268,9 @@ 
     	}
     	
     	if (! $id = self::getId($path)) {
-    		if ($silent) return collect();
+    		if ($silent) {
+    			return collect();
+    		}
     		
     		throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
     	}
@@ -259,7 +281,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);
     	}

src/CommonData/Fields/CommonData.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
 	
 	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']))));
 	}

src/Dashboard/DashboardCore.php

Braces +3 added lines, -1 removed lines

@@ -51,7 +51,9 @@
 	{
 		// 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