cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Param/Id.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 		public function statement() {
 
-			return ("`" . $this->name . "` int(10) UNSIGNED NOT NULL" . ($this->auto_increment ? " AUTO_INCREMENT" : ""));
+			return ("`".$this->name."` int(10) UNSIGNED NOT NULL".($this->auto_increment ? " AUTO_INCREMENT" : ""));
 		}
 
 		# Cast value

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Param/Type/Integer.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 			return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
 
-			       (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+				   (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
 		}
 
 		# Cast value

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 
 		public function statement() {
 
-			return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
+			return ("`".$this->name."` ".($this->short ? "tiny" : "")."int(".$this->length.")").
 
-			       (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+			       (($this->unsigned ? " UNSIGNED" : "")." NOT NULL DEFAULT '".$this->default."'");
 		}
 
 		# Cast value

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Param/Type/Textual.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 			return ("`" . $this->name . "` " . ($this->short ? ("varchar(" . $this->length . ")") : "text")) .
 
-			       (($this->binary ? " BINARY" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+				   (($this->binary ? " BINARY" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
 		}
 
 		# Cast value

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 
 		public function statement() {
 
-			return ("`" . $this->name . "` " . ($this->short ? ("varchar(" . $this->length . ")") : "text")) .
+			return ("`".$this->name."` ".($this->short ? ("varchar(".$this->length.")") : "text")).
 
-			       (($this->binary ? " BINARY" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+			       (($this->binary ? " BINARY" : "")." NOT NULL DEFAULT '".$this->default."'");
 		}
 
 		# Cast value

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Param/Type/Boolean.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function statement() {
 
-			return ("`" . $this->name . "` tinyint(1) UNSIGNED NOT NULL DEFAULT '" . intval($this->default) . "'");
+			return ("`".$this->name."` tinyint(1) UNSIGNED NOT NULL DEFAULT '".intval($this->default)."'");
 		}
 
 		# Cast value

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

Braces +15 added lines, -5 removed lines

@@ -12,19 +12,27 @@ 
 
 		public function remove() {
 
-			if (!$this->modifiable || (0 === $this->id)) return false;
+			if (!$this->modifiable || (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->subtreeCount())) return false;
+			if (static::$nesting && (0 !== $this->subtreeCount())) {
+				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
 
@@ -37,7 +45,9 @@ 
 
 			$this->data = $this->definition->cast([], true);
 
-			if (static::$nesting) $this->data['parent_id'] = 0;
+			if (static::$nesting) {
+				$this->data['parent_id'] = 0;
+			}
 
 			# Implement entity
 

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

Indentation +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
 			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+					 ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
 
 					 ("LEFT JOIN " . static::$table_relations . " rlx ") .
 
@@ -52,7 +52,7 @@ 
 
 			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+					 ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
 
 					 ("FROM " . static::$table_relations . " sup ") .
 

Spacing +10 added lines, -10 removed lines

@@ -25,15 +25,15 @@ 
 
 		private function disconnectSubtree() {
 
-			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
+			$query = ("DELETE rla FROM ".static::$table_relations." rla ").
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+			         ("JOIN ".static::$table_relations." rlb ON rlb.descendant = rla.descendant ").
 
-					 ("LEFT JOIN " . static::$table_relations . " rlx ") .
+					 ("LEFT JOIN ".static::$table_relations." rlx ").
 
-					 ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+					 ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ").
 
-					 ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+					 ("WHERE rlb.ancestor = ".$this->id." AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -50,15 +50,15 @@ 
 
 		private function connectSubtree(int $parent_id) {
 
-			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
+			$query = ("INSERT INTO ".static::$table_relations." (ancestor, descendant, depth) ").
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ").
 
-					 ("FROM " . static::$table_relations . " sup ") .
+					 ("FROM ".static::$table_relations." sup ").
 
-					 ("JOIN " . static::$table_relations . " sub ") .
+					 ("JOIN ".static::$table_relations." sub ").
 
-					 ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+					 ("WHERE sub.ancestor = ".$this->id." AND sup.descendant = ".$parent_id);
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Braces +60 added lines, -20 removed lines

@@ -35,7 +35,9 @@ 
 
 					 ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Set path
 
@@ -60,7 +62,9 @@ 
 
 					 ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Set path
 
@@ -75,25 +79,35 @@ 
 
 		public function create(array $data) {
 
-			if (!$this->modifiable || (0 !== $this->id)) return false;
+			if (!$this->modifiable || (0 !== $this->id)) {
+				return false;
+			}
 
 			$data = $this->definition->cast($data);
 
-			if (static::$auto_increment && isset($data['id'])) unset($data['id']);
+			if (static::$auto_increment && isset($data['id'])) {
+				unset($data['id']);
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $data);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Set data
 
 			$this->error = false;
 
-			if (static::$auto_increment) $this->data['id'] = DB::last()->id;
+			if (static::$auto_increment) {
+				$this->data['id'] = DB::last()->id;
+			}
 
-			foreach ($data as $name => $value) $this->data[$name] = $value;
+			foreach ($data as $name => $value) {
+				$this->data[$name] = $value;
+			}
 
 			# Implement entity
 
@@ -101,7 +115,9 @@ 
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# Cache entity
 
@@ -116,21 +132,29 @@ 
 
 		public function edit(array $data) {
 
-			if (!$this->modifiable || (0 === $this->id)) return false;
+			if (!$this->modifiable || (0 === $this->id)) {
+				return false;
+			}
 
 			$data = $this->definition->cast($data);
 
-			if (isset($data['id'])) unset($data['id']);
+			if (isset($data['id'])) {
+				unset($data['id']);
+			}
 
 			# Update entity
 
 			DB::update(static::$table, $data, ['id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Set data
 
-			foreach ($data as $name => $value) $this->data[$name] = $value;
+			foreach ($data as $name => $value) {
+				$this->data[$name] = $value;
+			}
 
 			# Implement entity
 
@@ -138,7 +162,9 @@ 
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# ------------------------
 
@@ -149,30 +175,44 @@ 
 
 		public function move(int $parent_id) {
 
-			if (!$this->modifiable || (0 === $this->id)) return false;
+			if (!$this->modifiable || (0 === $this->id)) {
+				return false;
+			}
 
 			# Re-connect entity if not in tree
 
-			if (!$this->initSubtree()) return false;
+			if (!$this->initSubtree()) {
+				return false;
+			}
 
 			# Create parent entity
 
 			if (0 !== ($parent = Entitizer::get(static::$table, $parent_id))->id) {
 
-				if (false === ($path = $parent->path())) return false;
+				if (false === ($path = $parent->path())) {
+					return false;
+				}
 
-				if (false === ($depth = $this->subtreeDepth())) return false;
+				if (false === ($depth = $this->subtreeDepth())) {
+					return false;
+				}
 
-				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) return false;
+				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) {
+					return false;
+				}
 			}
 
 			# Disconnect subtree from current position
 
-			if (!$this->disconnectSubtree()) return false;
+			if (!$this->disconnectSubtree()) {
+				return false;
+			}
 
 			# Connect subtree under new position
 
-		 	if (0 !== $parent->id) $this->connectSubtree($parent->id);
+		 	if (0 !== $parent->id) {
+		 		$this->connectSubtree($parent->id);
+		 	}
 
 			# ------------------------
 

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

Indentation +2 added lines, -2 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -28,9 +28,9 @@ 
 
 		private function createMainTable() {
 
-			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table . "` (") .
+			$query = ("CREATE TABLE IF NOT EXISTS `".static::$table."` (").
 
-			         implode(", ", $this->getStatements()) .
+			         implode(", ", $this->getStatements()).
 
 			         (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 
@@ -43,17 +43,17 @@ 
 
 		private function createRelationsTable() {
 
-			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table_relations . "` (") .
+			$query = ("CREATE TABLE IF NOT EXISTS `".static::$table_relations."` (").
 
-					 ("`ancestor` int(10) UNSIGNED NOT NULL, `descendant` int(10) UNSIGNED NOT NULL, ") .
+					 ("`ancestor` int(10) UNSIGNED NOT NULL, `descendant` int(10) UNSIGNED NOT NULL, ").
 
-					 ("`depth` int(10) UNSIGNED NOT NULL, ") .
+					 ("`depth` int(10) UNSIGNED NOT NULL, ").
 
-					 ("PRIMARY KEY (`ancestor`, `descendant`), KEY (`ancestor`), KEY (`descendant`), KEY (`depth`), ") .
+					 ("PRIMARY KEY (`ancestor`, `descendant`), KEY (`ancestor`), KEY (`descendant`), KEY (`depth`), ").
 
-					 ("FOREIGN KEY (`ancestor`) REFERENCES `" . static::$table . "` (`id`) ON DELETE CASCADE, ") .
+					 ("FOREIGN KEY (`ancestor`) REFERENCES `".static::$table."` (`id`) ON DELETE CASCADE, ").
 
-					 ("FOREIGN KEY (`descendant`) REFERENCES `" . static::$table . "` (`id`) ON DELETE CASCADE ") .
+					 ("FOREIGN KEY (`descendant`) REFERENCES `".static::$table."` (`id`) ON DELETE CASCADE ").
 
 					 (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 

Braces +8 added lines, -4 removed lines

@@ -16,7 +16,9 @@ 
 
 			foreach ([$this->params, $this->indexes, $this->foreigns] as $group) {
 
-				foreach ($group->list() as $item) $statements[] = $item->statement();
+				foreach ($group->list() as $item) {
+					$statements[] = $item->statement();
+				}
 			}
 
 			# ------------------------
@@ -134,9 +136,11 @@ 
 
 			foreach ($this->params->list() as $name => $param) {
 
-				if ($process_all) $cast[$name] = $param->cast($data[$name] ?? null);
-
-				else if (isset($data[$name])) $cast[$name] = $param->cast($data[$name]);
+				if ($process_all) {
+					$cast[$name] = $param->cast($data[$name] ?? null);
+				} else if (isset($data[$name])) {
+					$cast[$name] = $param->cast($data[$name]);
+				}
 			}
 
 			# ------------------------

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

Indentation +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@
 
 			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
 
-			         ("FROM " . static::$table . " ent ") .
+					 ("FROM " . static::$table . " ent ") .
 
-			         ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+					 ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
 
-			         ("WHERE ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+					 ("WHERE ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
 
 			# ------------------------
 

Spacing +6 added lines, -6 removed lines

@@ -18,17 +18,17 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) $selection[$key] = ('ent.'.$field);
 
 			# Process query
 
-			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
+			$query = ("SELECT ".implode(', ', $selection).", rel.ancestor as parent_id ").
 
-			         ("FROM " . static::$table . " ent ") .
+			         ("FROM ".static::$table." ent ").
 
-			         ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+			         ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
 
-			         ("WHERE ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+			         ("WHERE ent.".$name." = '".addslashes($value)."' LIMIT 1");
 
 			# ------------------------
 
@@ -133,7 +133,7 @@ 
 
 			# Select entity from DB
 
-			$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 +36 added lines, -12 removed lines

@@ -18,7 +18,9 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) {
+				$selection[$key] = ('ent.' . $field);
+			}
 
 			# Process query
 
@@ -43,7 +45,9 @@ 
 
 			$this->data = $this->definition->cast($data, true);
 
-			if (static::$nesting) $this->data['parent_id'] = intval($data['parent_id'] ?? 0);
+			if (static::$nesting) {
+				$this->data['parent_id'] = intval($data['parent_id'] ?? 0);
+			}
 
 			# Implement entity
 
@@ -68,7 +72,9 @@ 
 
 			# Check data
 
-			if ([] === $data) $this->modifiable = true;
+			if ([] === $data) {
+				$this->modifiable = true;
+			}
 
 			# Preset data
 
@@ -76,7 +82,9 @@ 
 
 			# Preset parent id
 
-			if (static::$nesting) $this->data['parent_id'] = 0;
+			if (static::$nesting) {
+				$this->data['parent_id'] = 0;
+			}
 
 			# Implement entity
 
@@ -87,13 +95,19 @@ 
 
 		public function init($value, string $name = 'id') {
 
-			if (!$this->modifiable || (0 !== $this->id)) return false;
+			if (!$this->modifiable || (0 !== $this->id)) {
+				return false;
+			}
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->index($name))) return false;
+			if (false === ($index = $this->definition->index($name))) {
+				return false;
+			}
 
-			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) return false;
+			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) {
+				return false;
+			}
 
 			# Process name & value
 
@@ -101,14 +115,18 @@ 
 
 			# Select entity from DB
 
-			if (static::$nesting) $this->selectNesting($name, $value); else {
+			if (static::$nesting) {
+				$this->selectNesting($name, $value);
+			} else {
 
 				$selection = array_keys($this->definition->params());
 
 				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;
+			}
 
 			# ------------------------
 
@@ -119,13 +137,19 @@ 
 
 		public function check($value, string $name) {
 
-			if (!$this->modifiable) return false;
+			if (!$this->modifiable) {
+				return false;
+			}
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->index($name))) return false;
+			if (false === ($index = $this->definition->index($name))) {
+				return false;
+			}
 
-			if ($index->type !== 'UNIQUE') return false;
+			if ($index->type !== 'UNIQUE') {
+				return false;
+			}
 
 			# Process name & value
 

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

Braces +6 added lines, -2 removed lines

@@ -12,9 +12,13 @@
 
 		public static function get(string $table) {
 
-			if (!isset(static::$classes[$table])) throw new Exception\General(static::$error_message);
+			if (!isset(static::$classes[$table])) {
+				throw new Exception\General(static::$error_message);
+			}
 
-			if (isset(static::$cache[$table])) return static::$cache[$table];
+			if (isset(static::$cache[$table])) {
+				return static::$cache[$table];
+			}
 
 			# ------------------------