cadmium-org / cadmium-cms

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

Braces +66 added lines, -22 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()->rows > 0))) return false;
+			if (!(DB::send($query) && (DB::last()->rows > 0))) {
+				return false;
+			}
 
 			# Set path
 
@@ -75,27 +79,37 @@ 
 
 		public function create(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (static::$auto_increment && isset($data['id'])) $data['id'] = 0;
+			if (static::$auto_increment && isset($data['id'])) {
+				$data['id'] = 0;
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $data);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Update data
 
-			if (static::$auto_increment) $data['id'] = DB::last()->id;
+			if (static::$auto_increment) {
+				$data['id'] = DB::last()->id;
+			}
 
 			$this->dataset->update($data);
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# Cache entity
 
@@ -110,17 +124,23 @@ 
 
 		public function edit(array $data) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->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;
+			}
 
 			# Update data
 
@@ -128,7 +148,9 @@ 
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# ------------------------
 
@@ -139,30 +161,44 @@ 
 
 		public function move(int $parent_id) {
 
-			if (0 === $this->id) return false;
+			if (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);
+		 	}
 
 			# ------------------------
 
@@ -173,19 +209,27 @@ 
 
 		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->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
 

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

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		public function add(string $name, string $type = 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\Index($name, $type);
 		}

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

Braces +23 added lines, -7 removed lines

@@ -27,7 +27,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
 
@@ -87,13 +89,19 @@ 
 
 		public function init($value, string $name = 'id') {
 
-			if (0 !== $this->id) return false;
+			if (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,7 +109,11 @@ 
 
 			# Select entity from DB
 
-			if (!static::$nesting) $this->selectDefault($name, $value); else $this->selectNesting($name, $value);
+			if (!static::$nesting) {
+				$this->selectDefault($name, $value);
+			} else {
+				$this->selectNesting($name, $value);
+			}
 
 			# ------------------------
 
@@ -114,9 +126,13 @@ 
 
 			# 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])) 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/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);