x-systems / epesi-base

src/CommonData/Database/Models/CommonData.php

Braces +31 added lines, -10 removed lines

@@ -19,7 +19,10 @@ 
 
     	$parentId = null;
     	foreach(explode('/', trim($path,'/')) as $nodeKey) {
-    		if ($nodeKey === '') continue; //ignore empty paths
+    		if ($nodeKey === '') {
+    			continue;
+    		}
+    		//ignore empty paths
     		
     		if (empty($cache[$parentId][$nodeKey])) {
     			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
@@ -37,11 +40,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([
@@ -61,9 +68,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::find($id)->update(compact('value', 'readonly'));
@@ -78,7 +89,9 @@ 
     	$key = md5(serialize([$path, $translate]));
     	
     	if (! isset($cache[$key])) {
-    		if(! $id = self::getId($path)) return false;
+    		if(! $id = self::getId($path)) {
+    			return false;
+    		}
 
     		$ret = self::find($id)->value;
 
@@ -112,7 +125,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'));
@@ -165,7 +180,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();
     }
@@ -185,7 +202,9 @@ 
     	}
     	
     	if (! $id = self::getId($path)) {
-    		if ($silent) return collection();
+    		if ($silent) {
+    			return collection();
+    		}
     		
     		new \Exception('Invalid CommonData::getArray() request: ' . $path);
     	}
@@ -196,7 +215,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/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) {