cadmium-org / cadmium-cms

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/Item/Index.php

Spacing +2 added lines, -2 removed lines

@@ -45,9 +45,9 @@
 
 		public function getStatement() : string {
 
-			return ((null !== $this->type) ? ($this->type . " ") : "") .
+			return ((null !== $this->type) ? ($this->type." ") : "").
 
-			       ("KEY `" . $this->name . "` (`" . $this->name . "`)");
+			       ("KEY `".$this->name."` (`".$this->name."`)");
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 
 			$this->name = $name;
 
-			if (null !== $type) $this->type = $this->validateType($type);
+			if (null !== $type) {
+				$this->type = $this->validateType($type);
+			}
 		}
 
 		/**

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/Definition.php

Spacing +10 added lines, -10 removed lines

@@ -41,9 +41,9 @@ 
 
 		private function createMainTable() : bool {
 
-			$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");
 
@@ -60,17 +60,17 @@ 
 
 		private function createRelationsTable() : bool {
 
-			$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");
 
@@ -87,7 +87,7 @@ 
 
 		private function removeMainTable() : bool {
 
-			$query = ("DROP TABLE IF EXISTS `" . static::$table  . "`");
+			$query = ("DROP TABLE IF EXISTS `".static::$table."`");
 
 			return (DB::send($query) && DB::getLast()->status);
 		}
@@ -100,7 +100,7 @@ 
 
 		private function removeRelationsTable() : bool {
 
-			$query = ("DROP TABLE IF EXISTS `" . static::$table_relations  . "`");
+			$query = ("DROP TABLE IF EXISTS `".static::$table_relations."`");
 
 			return (DB::send($query) && DB::getLast()->status);
 		}

Braces +3 added lines, -1 removed lines

@@ -25,7 +25,9 @@
 
 			foreach ([$this->params, $this->indexes, $this->foreigns] as $group) {
 
-				foreach ($group->getList() as $item) $statements[] = $item->getStatement();
+				foreach ($group->getList() as $item) {
+					$statements[] = $item->getStatement();
+				}
 			}
 
 			# ------------------------

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/Handler.php

Braces +37 added lines, -15 removed lines

@@ -56,7 +56,9 @@ 
 
 		private function processSelector(Template\Block $selector) {
 
-			if ($this->create) return $selector->disable();
+			if ($this->create) {
+				return $selector->disable();
+			}
 
 			$selector->parent_id = $this->entity->parent_id;
 
@@ -81,25 +83,33 @@ 
 
 			# Set path / title
 
-			if (static::$nesting) $contents->path = $this->path;
-
-			else $contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			} else {
+				$contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			}
 
 			# Process parent block
 
-			if (static::$nesting) $this->processParent($contents->getBlock('parent'));
+			if (static::$nesting) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Set link
 
 			$link = (INSTALL_PATH . static::$link . '/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
-
-			else $contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			if (static::$nesting) {
+				$contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
+			} else {
+				$contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			}
 
 			# Process selector block
 
-			if (static::$nesting) $this->processSelector($contents->getBlock('selector'));
+			if (static::$nesting) {
+				$this->processSelector($contents->getBlock('selector'));
+			}
 
 			# Implement form
 
@@ -134,11 +144,15 @@ 
 
 				$parent_id = Number::forceInt(Request::post('parent_id'));
 
-				if (!$this->entity->move($parent_id)) return $ajax->setError(Language::get(static::$message_error_move));
+				if (!$this->entity->move($parent_id)) {
+					return $ajax->setError(Language::get(static::$message_error_move));
+				}
 
 			} else if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->setError(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->setError(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -154,7 +168,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if (!$this->create && $ajax) return $this->handleAjax();
+			if (!$this->create && $ajax) {
+				return $this->handleAjax();
+			}
 
 			# Create entity
 
@@ -162,7 +178,9 @@ 
 
 			$this->entity = Entitizer::get(static::$table, (!$this->create ? $id : 0));
 
-			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH . static::$link);
+			if (!$this->create && (0 === $this->entity->id)) {
+				return Request::redirect(INSTALL_PATH . static::$link);
+			}
 
 			# Create parent entity
 
@@ -170,7 +188,9 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
 			# Create form
 
@@ -180,7 +200,9 @@ 
 
 			if ($this->form->handle(new static::$controller_class($this->entity), true)) {
 
-				if ($this->create && (0 !== $this->parent->id)) $this->entity->move($this->parent->id);
+				if ($this->create && (0 !== $this->parent->id)) {
+					$this->entity->move($this->parent->id);
+				}
 
 				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
 			}