cadmium-org / cadmium-cms

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

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.'.$field);
 
 			# ------------------------
 
@@ -45,7 +45,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

@@ -16,7 +16,9 @@ 
 
 			foreach ($data as $field => $direction) {
 
-				if (false === ($param = $this->definition->param($field))) continue;
+				if (false === ($param = $this->definition->param($field))) {
+					continue;
+				}
 
 				$order_by[$param->name] = ((strtoupper($direction) !== 'DESC') ? 'ASC' : 'DESC');
 			}
@@ -32,7 +34,9 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) {
+				$selection[] = ('ent.' . $field);
+			}
 
 			# ------------------------
 
@@ -45,7 +49,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);
+			}
 
 			# ------------------------
 

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, Dataset as Config;
+	use Modules\Entitizer;
+	use Dataset as Config;
 
 	abstract class Collection {
 

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::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->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::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->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::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->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::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
 			$path = [];
 
-			while (null !== ($data = DB::getLast()->getRow())) $path[] = Entitizer::dataset(static::$table, $data)->data();
+			while (null !== ($data = DB::getLast()->getRow())) {
+				$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/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);
 

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Group/Indexes.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/Framework/Classes/Dataset/Dataset.php

Doc Comments +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 		 * If a validator was not given, a default validator will be used to convert a given variable type to a default's type.
 		 * In a case the conversion fails an existing value will not be changed
 		 *
-		 * @return the current dataset object
+		 * @return null|Dataset current dataset object
 		 */
 
 		public function addParam(string $name, $default, callable $validator = null) {
@@ -48,7 +48,7 @@ 
 		/**
 		 * Add multiple params
 		 *
-		 * @return the current dataset object
+		 * @return Dataset current dataset object
 		 */
 
 		public function addParams(array $data) {
@@ -61,7 +61,7 @@ 
 		/**
 		 * Update a value
 		 *
-		 * @return true on success, false on error, or null if the param does not exist
+		 * @return null|boolean on success, false on error, or null if the param does not exist
 		 */
 
 		public function set(string $name, $value) {

Braces +28 added lines, -18 removed lines

@@ -34,7 +34,9 @@ 
 
 		public function addParam(string $name, $default, callable $validator = null) {
 
-			if ('' === $name) return;
+			if ('' === $name) {
+				return;
+			}
 
 			$this->data[$name] = $default; $this->defaults[$name] = $default;
 
@@ -53,7 +55,9 @@ 
 
 		public function addParams(array $data) {
 
-			foreach ($data as $name => $value) if (is_scalar($name)) $this->addParam($name, $value);
+			foreach ($data as $name => $value) {
+				if (is_scalar($name)) $this->addParam($name, $value);
+			}
 
 			return $this;
 		}
@@ -66,16 +70,16 @@ 
 
 		public function set(string $name, $value) {
 
-			if (!isset($this->validators[$name])) return null;
+			if (!isset($this->validators[$name])) {
+				return null;
+			}
 
 			try {
 
-				if (null === ($value = $this->validators[$name]($value))) return false;
-
-				else { $this->data[$name] = $value; return true; }
-			}
-
-			catch (TypeError $e) { return false; }
+				if (null === ($value = $this->validators[$name]($value))) {
+					return false;
+				} else { $this->data[$name] = $value; return true; }
+			} catch (TypeError $e) { return false; }
 		}
 
 		/**
@@ -90,7 +94,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (null !== ($value = $this->set($name, $value))) $setted[$name] = $value;
+				if (null !== ($value = $this->set($name, $value))) {
+					$setted[$name] = $value;
+				}
 			}
 
 			# ------------------------
@@ -106,16 +112,18 @@ 
 
 		public function cast(string $name, $value) {
 
-			if (!isset($this->validators[$name])) return null;
+			if (!isset($this->validators[$name])) {
+				return null;
+			}
 
 			try {
 
-				if (null !== ($value = $this->validators[$name]($value))) return $value;
-
-				else return $this->data[$name];
-			}
-
-			catch (TypeError $e) { return $this->data[$name]; }
+				if (null !== ($value = $this->validators[$name]($value))) {
+					return $value;
+				} else {
+					return $this->data[$name];
+				}
+			} catch (TypeError $e) { return $this->data[$name]; }
 		}
 
 		/**
@@ -130,7 +138,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (null !== ($value = $this->cast($name, $value))) $casted[$name] = $value;
+				if (null !== ($value = $this->cast($name, $value))) {
+					$casted[$name] = $value;
+				}
 			}
 
 			# ------------------------

www/engine/Framework/Classes/Date/Date.php

Doc Comments +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 		/**
 		 * Validate a date using a given format
 		 *
-		 * @return the formatted date or false on failure
+		 * @return string|null formatted date or false on failure
 		 */
 
 		public static function validate(string $date, string $format) {
@@ -67,7 +67,7 @@ 
 		 * Get a date from a given timestamp and format it according to a given pattern.
 		 * If the timestamp is null, a current time will be used
 		 *
-		 * @return the formatted date or false if a non-numeric value is used for timestamp
+		 * @return string formatted date or false if a non-numeric value is used for timestamp
 		 */
 
 		public static function get(string $format = DATE_FORMAT_STANDART, int $time = null) {
@@ -78,7 +78,7 @@ 
 		/**
 		 * Get a day from a given timestamp. If the timestamp is null, a current time will be used
 		 *
-		 * @return the formatted day or false if a non-numeric value is used for timestamp
+		 * @return string formatted day or false if a non-numeric value is used for timestamp
 		 */
 
 		public static function getDay(int $time = null) {
@@ -89,7 +89,7 @@ 
 		/**
 		 * Get a month from a given timestamp. If the timestamp is null, a current time will be used
 		 *
-		 * @return the formatted month or false if a non-numeric value is used for timestamp
+		 * @return string formatted month or false if a non-numeric value is used for timestamp
 		 */
 
 		public static function getMonth(int $time = null) {
@@ -100,7 +100,7 @@ 
 		/**
 		 * Get a year from a given timestamp. If the timestamp is null, a current time will be used
 		 *
-		 * @return the formatted year or false if a non-numeric value is used for timestamp
+		 * @return string formatted year or false if a non-numeric value is used for timestamp
 		 */
 
 		public static function getYear(int $time = null) {

Braces +9 added lines, -3 removed lines

@@ -19,9 +19,13 @@ 
 
 		public static function validate(string $date, string $format) {
 
-			if (false === ($datetime = date_create_from_format($format, $date))) return false;
+			if (false === ($datetime = date_create_from_format($format, $date))) {
+				return false;
+			}
 
-			if (false === ($formatted = $datetime->format($format))) return false;
+			if (false === ($formatted = $datetime->format($format))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -58,7 +62,9 @@ 
 
 		public static function validateYear(int $year) {
 
-			if (false === ($year = self::validate($year, 'Y'))) return false;
+			if (false === ($year = self::validate($year, 'Y'))) {
+				return false;
+			}
 
 			return (($year > '1900') ? (($year > self::getYear()) ? self::getYear() : $year) : '1900');
 		}

www/engine/Framework/Classes/Explorer/Explorer.php

Doc Comments +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
 		/**
 		 * Get an extnesion of a file
 		 *
-		 * @return a string or false if check_exists is true and the file does not actually exists
+		 * @return string string or false if check_exists is true and the file does not actually exists
 		 */
 
 		public static function getExtension(string $file_name, bool $check_exists = true) {
@@ -211,7 +211,7 @@ 
 		/**
 		 * Get file contents
 		 *
-		 * @return the read data or false on failure
+		 * @return string read data or false on failure
 		 */
 
 		public static function getContents(string $file_name) {

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name.$name)) yield $name;
 				}
 
 				closedir($handler);
@@ -93,7 +93,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_dir($name)) self::removeDir($name, true);
 

Braces +23 added lines, -9 removed lines

@@ -21,9 +21,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name . $name)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -36,7 +40,9 @@ 
 
 		private static function getInfo(string $file_name, int $param, bool $check_exists = true) {
 
-			if ($check_exists && !self::isFile($file_name)) return false;
+			if ($check_exists && !self::isFile($file_name)) {
+				return false;
+			}
 
 			return pathinfo($file_name, $param);
 		}
@@ -95,9 +101,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_dir($name)) self::removeDir($name, true);
-
-					else if (@is_file($name)) self::removeFile($name);
+					if (@is_dir($name)) {
+						self::removeDir($name, true);
+					} else if (@is_file($name)) {
+						self::removeFile($name);
+					}
 				}
 			}
 
@@ -123,7 +131,9 @@ 
 
 		public static function iterateDirs(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_dir') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_dir') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -132,7 +142,9 @@ 
 
 		public static function iterateFiles(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_file') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_file') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -238,7 +250,9 @@ 
 
 		public static function include(string $file_name) {
 
-			if ((strtolower(self::getExtension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::getExtension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return @include $file_name;
 		}