cadmium-org / cadmium-cms

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

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,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 . "'");
 		}
 
 		/**

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 
 		public function getStatement() : string {
 
-			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."'");
 		}
 
 		/**

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		public function __construct(string $name, bool $short = true, int $length = 0, bool $binary = false, string $default = '') {
 
-			foreach (get_defined_vars() as $name => $value) $this->$name = $value;
+			foreach (get_defined_vars() as $name => $value) {
+				$this->$name = $value;
+			}
 		}
 
 		/**

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
 		public function getStatement() : string {
 
-			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" : ""));
 		}
 
 		/**

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

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		public function add(string $name, string $table, string $field, string $delete = null, string $update = null) {
 
-			if ((false === $this->definition->getParam($name)) || isset($this->list[$name])) return;
+			if ((false === $this->definition->getParam($name)) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new Definition\Item\Foreign($name, $table, $field, $delete, $update);
 		}

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

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 
 		public function add(string $name, string $type = null) {
 
-			if ((false === $this->definition->getParam($name)) || isset($this->list[$name])) return;
+			if ((false === $this->definition->getParam($name)) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new Definition\Item\Index($name, $type);
 		}

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

Braces +6 added lines, -2 removed lines

@@ -28,11 +28,15 @@
 
 		private function add(string $type, string $name, array $args) {
 
-			if (('' === $name) || isset($this->list[$name])) return;
+			if (('' === $name) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new $this->types[$type](...$args);
 
-			if (($type !== 'textual') || $this->list[$name]->short) $this->secure[] = $name;
+			if (($type !== 'textual') || $this->list[$name]->short) {
+				$this->secure[] = $name;
+			}
 		}
 
 		/**

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

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->getParamsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->getParamsSecure() as $field) $selection[] = ('ent.'.$field);
 
 			# ------------------------
 
@@ -60,7 +60,7 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.'.$field.' '.$direction);
 
 			# ------------------------
 

Braces +9 added lines, -3 removed lines

@@ -27,7 +27,9 @@ 
 
 			foreach ($data as $field => $direction) {
 
-				if (false === ($param = $this->definition->getParam($field))) continue;
+				if (false === ($param = $this->definition->getParam($field))) {
+					continue;
+				}
 
 				$order_by[$param->name] = ((strtoupper($direction) !== 'DESC') ? 'ASC' : 'DESC');
 			}
@@ -45,7 +47,9 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->getParamsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->getParamsSecure() as $field) {
+				$selection[] = ('ent.' . $field);
+			}
 
 			# ------------------------
 
@@ -60,7 +64,9 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) {
+				$order_by[] = ('ent.' . $field . ' ' . $direction);
+			}
 
 			# ------------------------
 

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

Indentation +3 added lines, -3 removed lines

@@ -48,11 +48,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

@@ -42,17 +42,17 @@ 
 
 			$selection = array_keys($this->definition->getParams());
 
-			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");
 
 			# ------------------------
 
@@ -154,7 +154,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 +23 added lines, -7 removed lines

@@ -42,7 +42,9 @@ 
 
 			$selection = array_keys($this->definition->getParams());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) {
+				$selection[$key] = ('ent.' . $field);
+			}
 
 			# Process query
 
@@ -112,13 +114,19 @@ 
 
 		public function init($value, string $name = 'id') : bool {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->getIndex($name))) return false;
+			if (false === ($index = $this->definition->getIndex($name))) {
+				return false;
+			}
 
-			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) return false;
+			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) {
+				return false;
+			}
 
 			# Process name & value
 
@@ -126,7 +134,11 @@ 
 
 			# Select entity from DB
 
-			if (!static::$nesting) $this->selectBasic($name, $value); else $this->selectNesting($name, $value);
+			if (!static::$nesting) {
+				$this->selectBasic($name, $value);
+			} else {
+				$this->selectNesting($name, $value);
+			}
 
 			# ------------------------
 
@@ -144,9 +156,13 @@ 
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->getIndex($name))) return false;
+			if (false === ($index = $this->definition->getIndex($name))) {
+				return false;
+			}
 
-			if ($index->type !== 'UNIQUE') return false;
+			if ($index->type !== 'UNIQUE') {
+				return false;
+			}
 
 			# Process name & value
 

Doc Comments +2 added lines, -1 removed lines

@@ -62,7 +62,7 @@ 
 		/**
 		 * Update the entity dataset with a selected data. Also updates every entity object having an identical id
 		 *
-		 * @return true : always true ;)
+		 * @return boolean : always true ;)
 		 */
 
 		protected function setData(array $data) : bool {
@@ -137,6 +137,7 @@ 
 		 * Check whether another entity with a given unique param value exists.
 		 * This method is useful to find out is it possible to change the entity's unique param value to the given one
 		 *
+		 * @param string $value
 		 * @return int|false : the number of entities found (0 or 1) or false on error
 		 */
 

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

Braces +21 added lines, -7 removed lines

@@ -21,7 +21,9 @@ 
 
 		protected function addVirtual(string $name, callable $virtual) {
 
-			if (isset($this->params[$name]) || isset($this->virtuals[$name])) return;
+			if (isset($this->params[$name]) || isset($this->virtuals[$name])) {
+				return;
+			}
 
 			$this->virtuals[$name] = $virtual;
 		}
@@ -34,7 +36,9 @@ 
 
 			$this->params = Entitizer::getDefinition(static::$table)->getParams();
 
-			if (static::$nesting) $this->params['parent_id'] = $this->params['id'];
+			if (static::$nesting) {
+				$this->params['parent_id'] = $this->params['id'];
+			}
 
 			$this->init(); $this->reset();
 		}
@@ -49,11 +53,15 @@ 
 
 			# Reset params
 
-			foreach ($this->params as $name => $param) $this->data[$name] = $param->cast(null);
+			foreach ($this->params as $name => $param) {
+				$this->data[$name] = $param->cast(null);
+			}
 
 			# Reset virtuals
 
-			foreach ($this->virtuals as $name => $virtual) $this->data[$name] = $virtual($this->data);
+			foreach ($this->virtuals as $name => $virtual) {
+				$this->data[$name] = $virtual($this->data);
+			}
 
 			# ------------------------
 
@@ -72,12 +80,16 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (isset($this->params[$name])) $this->data[$name] = $this->params[$name]->cast($value);
+				if (isset($this->params[$name])) {
+					$this->data[$name] = $this->params[$name]->cast($value);
+				}
 			}
 
 			# Update extras
 
-			foreach ($this->virtuals as $name => $virtual) $this->data[$name] = $virtual($this->data);
+			foreach ($this->virtuals as $name => $virtual) {
+				$this->data[$name] = $virtual($this->data);
+			}
 
 			# ------------------------
 
@@ -94,7 +106,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (isset($this->params[$name])) $cast[$name] = $this->params[$name]->cast($value);
+				if (isset($this->params[$name])) {
+					$cast[$name] = $this->params[$name]->cast($value);
+				}
 			}
 
 			# ------------------------

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

Indentation +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
 
 			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
+				   ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
 
 				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
 		}
@@ -34,13 +34,13 @@ 
 
 			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+				   ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
 
-			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
+				   ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
 		}
 
 		/**
@@ -51,7 +51,7 @@ 
 
 			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
 
-			       $this->getQueryJoin($parent_id);
+				   $this->getQueryJoin($parent_id);
 		}
 
 		/**
@@ -62,7 +62,7 @@ 
 
 			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
 
-			         $this->getQueryJoin($parent_id);
+					 $this->getQueryJoin($parent_id);
 
 			# ------------------------
 
@@ -169,7 +169,7 @@ 
 
 			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+					 ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
 
 					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
 

Spacing +12 added lines, -14 removed lines

@@ -19,11 +19,9 @@ 
 
 		protected function getQueryJoin(int $parent_id) : string {
 
-			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
+			return (0 !== $parent_id) ? (("JOIN ".static::$table_relations." rel ").
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
-
-				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
+			       ("ON rel.ancestor = ".$parent_id." AND rel.descendant = ent.id AND rel.depth >= 1")) : ("JOIN ".static::$table_relations." rel ON rel.descendant = ent.id");
 		}
 
 		/**
@@ -32,15 +30,15 @@ 
 
 		private function getSelectQuery(int $parent_id, array $config, array $order_by) : string {
 
-			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
+			return ("SELECT ".$this->getSelection().", COALESCE(par.ancestor, 0) as parent_id ").
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+			       ("FROM ".static::$table." ent ".$this->getQueryJoin($parent_id)." ").
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." par ON par.descendant = ent.id AND par.depth = 1 ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition." ") : "").
 
-			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
+			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, ".$this->getOrderBy($order_by));
 		}
 
 		/**
@@ -49,7 +47,7 @@ 
 
 		private function getCountQuery(int $parent_id) : string {
 
-			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(DISTINCT ent.id) as count FROM ".static::$table." ent ").
 
 			       $this->getQueryJoin($parent_id);
 		}
@@ -60,7 +58,7 @@ 
 
 		private function getDepthQuery(int $parent_id) : string {
 
-			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
+			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM ".static::$table." ent ").
 
 			         $this->getQueryJoin($parent_id);
 
@@ -167,11 +165,11 @@ 
 
 			# Process query
 
-			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
+			$query = ("SELECT ".$this->getSelection()." FROM ".static::$table." ent ").
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+			         ("JOIN ".static::$table_relations." rel ON rel.ancestor = ent.id ").
 
-					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
+					 ("WHERE rel.descendant = ".$parent_id." ORDER BY rel.depth DESC");
 
 			# Select path
 

Braces +27 added lines, -9 removed lines

@@ -81,13 +81,17 @@ 
 
 		public function getSubtree(int $parent_id = 0, array $config = [], array $order_by = []) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Select entities
 
 			$query = $this->getSelectQuery($parent_id, $config, $order_by);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -117,13 +121,17 @@ 
 
 		public function getSubtreeCount(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get count
 
 			$query = $this->getCountQuery($parent_id);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -140,13 +148,17 @@ 
 
 		public function getSubtreeDepth(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get depth
 
 			$query = $this->getDepthQuery($parent_id);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -163,7 +175,9 @@ 
 
 		public function getPath(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Process query
 
@@ -175,13 +189,17 @@ 
 
 			# Select path
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
 			$path = [];
 
-			while (null !== ($data = DB::getLast()->getRow())) $path[] = Entitizer::getDataset(static::$table, $data)->getData();
+			while (null !== ($data = DB::getLast()->getRow())) {
+				$path[] = Entitizer::getDataset(static::$table, $data)->getData();
+			}
 
 			# ------------------------