cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Entity.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
 			$name = $param->name(); $value = $param->cast($value);
 
-			$condition = ($name . " = '" . addslashes($value) . "' AND id != " . $this->id);
+			$condition = ($name." = '".addslashes($value)."' AND id != ".$this->id);
 
 			DB::select(static::$table, 'id', $condition, null, 1);
 

Braces +18 added lines, -6 removed lines

@@ -20,7 +20,9 @@ 
 
 				$entity = self::get(static::$type, $entity->data['parent_id']);
 
-				if (0 === $entity->id) return [];
+				if (0 === $entity->id) {
+					return [];
+				}
 
 				$path[] = array_merge(['id' => $entity->id], $entity->data);
 			}
@@ -44,7 +46,9 @@ 
 
 			# Preset path
 
-			if (static::$nesting) $this->data['path'] = [];
+			if (static::$nesting) {
+				$this->data['path'] = [];
+			}
 
 			# Implement entity
 
@@ -52,14 +56,18 @@ 
 
 			# Init entity
 
-			if ($id > 0) $this->init($id);
+			if ($id > 0) {
+				$this->init($id);
+			}
 		}
 
 		# Check if unique param value exists
 
 		public function check(string $name, $value) {
 
-			if ((false === ($param = $this->definition->get($name))) || !$param->unique()) return false;
+			if ((false === ($param = $this->definition->get($name))) || !$param->unique()) {
+				return false;
+			}
 
 			# Select entity from DB
 
@@ -80,7 +88,9 @@ 
 
 			DB::select(static::$table, 'COUNT(id) as count', ['parent_id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -112,7 +122,9 @@ 
 
 		public function __get(string $name) {
 
-			if ($name === 'id') return $this->id;
+			if ($name === 'id') {
+				return $this->id;
+			}
 
 			return (isset($this->data[$name]) ? $this->data[$name] : null);
 		}

www/engine/System/Classes/Modules/Entitizer/Utils/Definition.php

Spacing +2 added lines, -2 removed lines

@@ -85,9 +85,9 @@
 
 			$set = array_merge($this->getStatements('fieldStatement'), $this->getStatements('keyStatement'));
 
-			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table . "`") .
+			$query = ("CREATE TABLE IF NOT EXISTS `".static::$table."`").
 
-					 ("(" . implode(", ", $set) . ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+					 ("(".implode(", ", $set).") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 
 			# ------------------------
 

Braces +18 added lines, -6 removed lines

@@ -12,7 +12,9 @@ 
 
 		private function addParam(Param $param) {
 
-			if (('' === ($name = $param->name())) || isset($this->params[$name]) || isset($this->implementors[$name])) return;
+			if (('' === ($name = $param->name())) || isset($this->params[$name]) || isset($this->implementors[$name])) {
+				return;
+			}
 
 			$this->params[$name] = $param;
 		}
@@ -26,7 +28,9 @@ 
 
 			foreach ($this->params as $param) {
 
-				if (false !== ($statement = $param->$method())) $statements[] = $statement;
+				if (false !== ($statement = $param->$method())) {
+					$statements[] = $statement;
+				}
 			}
 
 			# ------------------------
@@ -63,7 +67,9 @@ 
 
 		protected function addOrderer(string $name, bool $descending = false) {
 
-			if (!isset($this->params[$name]) || isset($this->orderers[$name])) return;
+			if (!isset($this->params[$name]) || isset($this->orderers[$name])) {
+				return;
+			}
 
 			$this->orderers[$name] = $descending;
 		}
@@ -72,7 +78,9 @@ 
 
 		protected function addImplementor(string $name, callable $callback) {
 
-			if (('' === $name) || isset($this->params[$name]) || isset($this->implementors[$name])) return;
+			if (('' === $name) || isset($this->params[$name]) || isset($this->implementors[$name])) {
+				return;
+			}
 
 			$this->implementors[$name] = $callback;
 		}
@@ -141,14 +149,18 @@ 
 
 			if ($process_id) {
 
-				if (isset($data['id'])) $result['id'] = $this->id->cast($data['id']);
+				if (isset($data['id'])) {
+					$result['id'] = $this->id->cast($data['id']);
+				}
 			}
 
 			# Cast params
 
 			foreach ($this->params as $name => $param) {
 
-				if (isset($data[$name])) $result[$name] = $param->cast($data[$name]);
+				if (isset($data[$name])) {
+					$result[$name] = $param->cast($data[$name]);
+				}
 			}
 
 			# ------------------------

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Remove.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 			# Reset data
 
-			$this->id = 0; $this->data =  $this->definition->implement();
+			$this->id = 0; $this->data = $this->definition->implement();
 
 			# Reset path
 

Braces +21 added lines, -7 removed lines

@@ -12,13 +12,19 @@ 
 
 		public function remove() {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Check if entity is removable
 
-			if (static::$super && ($this->id === 1)) return false;
+			if (static::$super && ($this->id === 1)) {
+				return false;
+			}
 
-			if (static::$nesting && (0 !== $this->children())) return false;
+			if (static::$nesting && (0 !== $this->children())) {
+				return false;
+			}
 
 			# Remove extension entries
 
@@ -26,18 +32,24 @@ 
 
 				$entity = self::get($extension, $this->id);
 
-				if ($entity->error() || ((0 !== $entity->id) && !$entity->remove())) return false;
+				if ($entity->error() || ((0 !== $entity->id) && !$entity->remove())) {
+					return false;
+				}
 			}
 
 			# Remove entity
 
 			DB::delete(static::$table, ['id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Uncache entity
 
-			if (self::$cache[static::$type][$this->id] === $this) unset(self::$cache[static::$type][$this->id]);
+			if (self::$cache[static::$type][$this->id] === $this) {
+				unset(self::$cache[static::$type][$this->id]);
+			}
 
 			# Reset data
 
@@ -45,7 +57,9 @@ 
 
 			# Reset path
 
-			if (static::$nesting) $this->data['path'] = [];
+			if (static::$nesting) {
+				$this->data['path'] = [];
+			}
 
 			# Implement entity
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Fill.php

Braces +12 added lines, -4 removed lines

@@ -12,19 +12,27 @@
 
 		public function fill(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$set = $this->definition->implement($data, true);
 
-			if (!($set['id'] > 0)) return false;
+			if (!($set['id'] > 0)) {
+				return false;
+			}
 
 			# Re-init entity
 
 			$this->error = false; $this->id = $set['id'];
 
-			foreach ($set as $name => $value) if ($name !== 'id') $this->data[$name] = $value;
+			foreach ($set as $name => $value) {
+				if ($name !== 'id') $this->data[$name] = $value;
+			}
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Init.php

Braces +14 added lines, -6 removed lines

@@ -12,13 +12,17 @@ 
 
 		public function init($value, string $name = 'id') {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Check param name
 
-			if ($name === 'id') $param = $this->definition->id();
-
-			else if ((false === ($param = $this->definition->get($name))) || !$param->unique()) return false;
+			if ($name === 'id') {
+				$param = $this->definition->id();
+			} else if ((false === ($param = $this->definition->get($name))) || !$param->unique()) {
+				return false;
+			}
 
 			# Select entity from DB
 
@@ -28,7 +32,9 @@ 
 
 			DB::select(static::$table, $selection, [$name => $value], null, 1);
 
-			if (($this->error = !(DB::last() && DB::last()->status)) || (DB::last()->rows !== 1)) return false;
+			if (($this->error = !(DB::last() && DB::last()->status)) || (DB::last()->rows !== 1)) {
+				return false;
+			}
 
 			$data = DB::last()->row();
 
@@ -40,7 +46,9 @@ 
 
 			# Init path
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity