cadmium-org / cadmium-cms

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

Braces +21 added lines, -7 removed lines

@@ -12,7 +12,9 @@ 
 
 		protected function addHandler(string $name, callable $handler) {
 
-			if ((false !== $this->definition->param($name)) || isset($this->handlers[$name])) return;
+			if ((false !== $this->definition->param($name)) || isset($this->handlers[$name])) {
+				return;
+			}
 
 			$this->handlers[$name] = $handler;
 		}
@@ -32,15 +34,21 @@ 
 
 			# Reset params
 
-			foreach ($this->definition->params() as $name => $param) $this->data[$name] = $param->cast(null);
+			foreach ($this->definition->params() as $name => $param) {
+				$this->data[$name] = $param->cast(null);
+			}
 
 			# Reset extras
 
-			foreach ($this->handlers as $name => $handler) $this->data[$name] = $handler($this->data);
+			foreach ($this->handlers as $name => $handler) {
+				$this->data[$name] = $handler($this->data);
+			}
 
 			# Reset parent id
 
-			if (static::$nesting) $this->data['parent_id'] = 0;
+			if (static::$nesting) {
+				$this->data['parent_id'] = 0;
+			}
 
 			# ------------------------
 
@@ -55,14 +63,18 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (false === ($param = $this->definition->param($name))) continue;
+				if (false === ($param = $this->definition->param($name))) {
+					continue;
+				}
 
 				$this->data[$name] = $param->cast($value);
 			}
 
 			# Update extras
 
-			foreach ($this->handlers as $name => $handler) $this->data[$name] = $handler($this->data);
+			foreach ($this->handlers as $name => $handler) {
+				$this->data[$name] = $handler($this->data);
+			}
 
 			# Update parent id
 
@@ -84,7 +96,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (false === ($param = $this->definition->param($name))) continue;
+				if (false === ($param = $this->definition->param($name))) {
+					continue;
+				}
 
 				$cast[$name] = $param->cast($value);
 			}

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

Indentation +8 added lines, -8 removed lines

@@ -12,7 +12,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");
 		}
@@ -23,13 +23,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));
 		}
 
 		# Get count query
@@ -38,7 +38,7 @@ 
 
 			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
 
-			       $this->getQueryJoin($parent_id);
+				   $this->getQueryJoin($parent_id);
 		}
 
 		# Get depth query
@@ -47,7 +47,7 @@ 
 
 			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
 
-			         $this->getQueryJoin($parent_id);
+					 $this->getQueryJoin($parent_id);
 
 			# ------------------------
 
@@ -128,7 +128,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

@@ -10,33 +10,31 @@ 
 
 		protected function getQueryJoin(int $parent_id) {
 
-			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");
 		}
 
 		# Get select query
 
 		private function getSelectQuery(int $parent_id, array $config, array $order_by) {
 
-			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));
 		}
 
 		# Get count query
 
 		private function getCountQuery(int $parent_id) {
 
-			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);
 		}
@@ -45,7 +43,7 @@ 
 
 		private function getDepthQuery(int $parent_id) {
 
-			$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);
 
@@ -126,11 +124,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

@@ -58,13 +58,17 @@ 
 
 		public function subtree(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::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -88,13 +92,17 @@ 
 
 		public function subtreeCount(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::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -105,13 +113,17 @@ 
 
 		public function subtreeDepth(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::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -122,7 +134,9 @@ 
 
 		public function path(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Process query
 
@@ -134,13 +148,17 @@ 
 
 			# Select path
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
 			$path = [];
 
-			while (null !== ($data = DB::last()->row())) $path[] = Entitizer::dataset(static::$table, $data)->data();
+			while (null !== ($data = DB::last()->row())) {
+				$path[] = Entitizer::dataset(static::$table, $data)->data();
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		public function add(string $name, string $table, string $field, string $delete = null, string $update = null) {
 
-			if ((false === $this->definition->param($name)) || isset($this->list[$name])) return;
+			if ((false === $this->definition->param($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/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])) static::$cache[$table] = new static::$classes[$table];
+			if (!isset(static::$cache[$table])) {
+				static::$cache[$table] = new static::$classes[$table];
+			}
 
 			# ------------------------
 

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function init() {
 
-			$this->config->add('active', false, function (bool $active) {
+			$this->config->add('active', false, function(bool $active) {
 
 				return ($active ? "ent.active = 1" : '');
 			});

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

Spacing +16 added lines, -16 removed lines

@@ -12,44 +12,44 @@
 
 		protected function init() {
 
-			$this->config->add('active', false, function (bool $active) {
+			$this->config->add('active', false, function(bool $active) {
 
-				return ($active ? ("ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.locked = 0") : '');
+				return ($active ? ("ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.locked = 0") : '');
 			});
 
-			$this->config->add('rank', null, function (int $rank = null) {
+			$this->config->add('rank', null, function(int $rank = null) {
 
-				return ((null !== $rank) ? ("ent.access <= " . $rank) : '');
+				return ((null !== $rank) ? ("ent.access <= ".$rank) : '');
 			});
 
-			$this->config->add('slug', '', function (string $slug) {
+			$this->config->add('slug', '', function(string $slug) {
 
-				return (('' !== $slug) ? ("ent.slug = '" . addslashes($slug) . "'") : '');
+				return (('' !== $slug) ? ("ent.slug = '".addslashes($slug)."'") : '');
 			});
 
-			$this->config->add('name', '', function (string $name) {
+			$this->config->add('name', '', function(string $name) {
 
-				return (('' !== $name) ? ("ent.name = '" . addslashes($name) . "'") : '');
+				return (('' !== $name) ? ("ent.name = '".addslashes($name)."'") : '');
 			});
 
-			$this->config->add('time_created >=', 0, function (int $time) {
+			$this->config->add('time_created >=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_created >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_created >= ".$time) : '');
 			});
 
-			$this->config->add('time_created <=', 0, function (int $time) {
+			$this->config->add('time_created <=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_created <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_created <= ".$time) : '');
 			});
 
-			$this->config->add('time_modified >=', 0, function (int $time) {
+			$this->config->add('time_modified >=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_modified >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_modified >= ".$time) : '');
 			});
 
-			$this->config->add('time_modified <=', 0, function (int $time) {
+			$this->config->add('time_modified <=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_modified <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_modified <= ".$time) : '');
 			});
 		}
 	}

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function init() {
 
-			$this->config->add('active', false, function (bool $active) {
+			$this->config->add('active', false, function(bool $active) {
 
 				return ($active ? "ent.active = 1" : '');
 			});

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

Spacing +10 added lines, -10 removed lines

@@ -12,29 +12,29 @@
 
 		protected function init() {
 
-			$this->config->add('rank', null, function (int $rank = null) {
+			$this->config->add('rank', null, function(int $rank = null) {
 
-				return ((null !== $rank) ? ("ent.rank >= " . $rank) : '');
+				return ((null !== $rank) ? ("ent.rank >= ".$rank) : '');
 			});
 
-			$this->config->add('time_registered >=', 0, function (int $time) {
+			$this->config->add('time_registered >=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_registered >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_registered >= ".$time) : '');
 			});
 
-			$this->config->add('time_registered <=', 0, function (int $time) {
+			$this->config->add('time_registered <=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_registered <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_registered <= ".$time) : '');
 			});
 
-			$this->config->add('time_logged >=', 0, function (int $time) {
+			$this->config->add('time_logged >=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_logged >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_logged >= ".$time) : '');
 			});
 
-			$this->config->add('time_logged <=', 0, function (int $time) {
+			$this->config->add('time_logged <=', 0, function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_logged <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_logged <= ".$time) : '');
 			});
 		}
 	}

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

Braces +6 added lines, -2 removed lines

@@ -25,9 +25,13 @@
 
 		public static function get(string $table, int $id = 0) {
 
-			if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
+			if (!isset(self::$classes[$table])) {
+				throw new Exception\General(self::$error_message);
+			}
 
-			if (isset(self::$cache[$table][$id])) return self::$cache[$table][$id];
+			if (isset(self::$cache[$table][$id])) {
+				return self::$cache[$table][$id];
+			}
 
 			$entity = new self::$classes[$table]; $entity->init($id);