cadmium-org / cadmium-cms

www/engine/Framework/Classes/Ajax/Response.php

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 
 		public function set(string $name, $value) : Response {
 
-			if (!in_array($name, ['error', 'status'], true)) $this->data[$name] = $value;
+			if (!in_array($name, ['error', 'status'], true)) {
+				$this->data[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -43,7 +45,9 @@ 
 
 		public function setArray(array $data) : Response {
 
-			foreach ($data as $name => $value) $this->set($name, $value);
+			foreach ($data as $name => $value) {
+				$this->set($name, $value);
+			}
 
 			return $this;
 		}
@@ -104,7 +108,9 @@ 
 
 			$data = ['status' => $this->status];
 
-			if (null !== $this->error) $data['error'] = $this->error;
+			if (null !== $this->error) {
+				$data['error'] = $this->error;
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Template/Block.php

Braces +47 added lines, -21 removed lines

@@ -23,7 +23,9 @@ 
 
 		private function registerWidget(string $name) {
 
-			if (false === Template::getWidget($name)) Template::setWidget($name, new Block);
+			if (false === Template::getWidget($name)) {
+				Template::setWidget($name, new Block);
+			}
 		}
 
 		/**
@@ -40,15 +42,19 @@ 
 
 				$type = $matches[2][$key]; $name = $matches[3][$key]; $contents = ($matches[4][$key] ?? '');
 
-				if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) continue;
+				if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) {
+					continue;
+				}
 
 				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
 
-				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
-
-				else if ($type === 'for') $this->loops[$name] = new Loop($contents);
-
-				else if ($type === 'widget') $this->registerWidget($this->widgets[] = $name);
+				if ($type === 'block') {
+					$this->blocks[$name] = (new Block($contents))->$toggle();
+				} else if ($type === 'for') {
+					$this->loops[$name] = new Loop($contents);
+				} else if ($type === 'widget') {
+					$this->registerWidget($this->widgets[] = $name);
+				}
 			}
 		}
 
@@ -68,7 +74,9 @@ 
 
 				foreach ($matches[1] as $index => $name) {
 
-					if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) continue;
+					if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) {
+						continue;
+					}
 
 					$elementaries['stack'][$name] = false;
 				}
@@ -152,11 +160,17 @@ 
 
 		public function __clone() {
 
-			foreach ($this->blocks as $name => $block) $this->blocks[$name] = clone $block;
+			foreach ($this->blocks as $name => $block) {
+				$this->blocks[$name] = clone $block;
+			}
 
-			foreach ($this->loops as $name => $loop) $this->loops[$name] = clone $loop;
+			foreach ($this->loops as $name => $loop) {
+				$this->loops[$name] = clone $loop;
+			}
 
-			foreach ($this->items as $name => $item) $this->items[$name] = clone $item;
+			foreach ($this->items as $name => $item) {
+				$this->items[$name] = clone $item;
+			}
 		}
 
 		/**
@@ -167,11 +181,13 @@ 
 
 		public function set(string $name, $value) : Block {
 
-			if ($value instanceof Block) $this->setBlock($name, $value);
-
-			else if (is_array($value)) $this->setLoop($name, $value);
-
-			else if (is_scalar($value)) $this->setVar($name, $value);
+			if ($value instanceof Block) {
+				$this->setBlock($name, $value);
+			} else if (is_array($value)) {
+				$this->setLoop($name, $value);
+			} else if (is_scalar($value)) {
+				$this->setVar($name, $value);
+			}
 
 			# ------------------------
 
@@ -186,7 +202,9 @@ 
 
 		public function setArray(array $components) : Block {
 
-			foreach ($components as $name => $component) $this->set($name, $component);
+			foreach ($components as $name => $component) {
+				$this->set($name, $component);
+			}
 
 			return $this;
 		}
@@ -199,7 +217,9 @@ 
 
 		public function setBlock(string $name, Block $block) : Block {
 
-			if (isset($this->blocks[$name])) $this->blocks[$name] = $block;
+			if (isset($this->blocks[$name])) {
+				$this->blocks[$name] = $block;
+			}
 
 			return $this;
 		}
@@ -212,7 +232,9 @@ 
 
 		public function setLoop(string $name, array $items) : Block {
 
-			if (isset($this->loops[$name])) $this->loops[$name]->setItems($items);
+			if (isset($this->loops[$name])) {
+				$this->loops[$name]->setItems($items);
+			}
 
 			return $this;
 		}
@@ -225,7 +247,9 @@ 
 
 		public function setVar(string $name, string $value) : Block {
 
-			if (isset($this->variables[$name])) $this->variables[$name] = $value;
+			if (isset($this->variables[$name])) {
+				$this->variables[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -307,7 +331,9 @@ 
 
 		public function getContents() : string {
 
-			if (!$this->enabled) return '';
+			if (!$this->enabled) {
+				return '';
+			}
 
 			# Lock the block
 

www/engine/Framework/Classes/DB/Query.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 
 		protected function getValue(string $value) : string {
 
-			return ('\'' . addslashes($value) . '\'');
+			return ('\''.addslashes($value).'\'');
 		}
 
 		/**
@@ -41,7 +41,7 @@ 
 
 			$parser = function($value) { if (is_scalar($value)) return $this->getValue($value); };
 
-			return ('(' . implode(', ', array_filter(array_map($parser, $value))) . ')');
+			return ('('.implode(', ', array_filter(array_map($parser, $value))).')');
 		}
 
 		/**

Braces +18 added lines, -6 removed lines

@@ -37,9 +37,14 @@ 
 
 		protected function getList($value) : string {
 
-			if (!is_array($value)) $value = [$value];
+			if (!is_array($value)) {
+				$value = [$value];
+			}
 
-			$parser = function($value) { if (is_scalar($value)) return $this->getValue($value); };
+			$parser = function($value) { if (is_scalar($value)) {
+				return $this->getValue($value);
+			}
+			};
 
 			return ('(' . implode(', ', array_filter(array_map($parser, $value))) . ')');
 		}
@@ -59,7 +64,9 @@ 
 
 		protected function getString($source = null, string $pattern = '', string $separator = '') : string {
 
-			if (!is_array($source)) return (is_scalar($source) ? strval($source) : '');
+			if (!is_array($source)) {
+				return (is_scalar($source) ? strval($source) : '');
+			}
 
 			$regexs = ['key' => '/\^([a-z]+)/', 'value' => '/\$([a-z]+)/']; $matches = ['key' => [], 'value' => []];
 
@@ -69,7 +76,9 @@ 
 
 			# Parse pattern
 
-			foreach ($regexs as $name => $regex) preg_match($regex, $pattern, $matches[$name]);
+			foreach ($regexs as $name => $regex) {
+				preg_match($regex, $pattern, $matches[$name]);
+			}
 
 			# Process replacements
 
@@ -77,9 +86,12 @@ 
 
 				$output[$count] = $pattern; $item = &$output[$count++];
 
-				foreach ($matches as $name => $match) if (isset($match[1]) && isset($parsers[$match[1]])) {
+				foreach ($matches as $name => $match) {
+					if (isset($match[1]) && isset($parsers[$match[1]])) {
 
-					try { $replace = [$this, $parsers[$match[1]]]($$name); } catch (\TypeError $e) { $replace = ''; }
+					try { $replace = [$this, $parsers[$match[1]]]($$name);
+				}
+				} catch (\TypeError $e) { $replace = ''; }
 
 					$item = str_replace($match[0], $replace, $item);
 				}

www/engine/Framework/Classes/DB/Query/Count.php

Spacing +3 added lines, -3 removed lines

@@ -23,15 +23,15 @@
 
 			$table = $this->getName($table);
 
-			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '').$this->getName($column));
 
 			$condition = $this->getString($condition, '^name IN $list', ' AND ');
 
 			# Build query
 
-			$this->query = ('SELECT COUNT(' . $column . ') as count ' .
+			$this->query = ('SELECT COUNT('.$column.') as count '.
 
-				'FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+				'FROM '.$table.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 
 			$table = $this->getName($table);
 
-			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			if ($column !== '*') {
+				$column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			}
 
 			$condition = $this->getString($condition, '^name IN $list', ' AND ');
 

www/engine/Framework/Classes/Dataset/Validator.php

Spacing +9 added lines, -9 removed lines

@@ -19,32 +19,32 @@
 
 			# Check basic types
 
-			if (is_string   ($default)) return function (string     $value) { return $value; };
+			if (is_string($default)) return function(string     $value) { return $value; };
 
-			if (is_bool     ($default)) return function (bool       $value) { return $value; };
+			if (is_bool($default)) return function(bool       $value) { return $value; };
 
-			if (is_int      ($default)) return function (int        $value) { return $value; };
+			if (is_int($default)) return function(int        $value) { return $value; };
 
-			if (is_float    ($default)) return function (float      $value) { return $value; };
+			if (is_float($default)) return function(float      $value) { return $value; };
 
-			if (is_array    ($default)) return function (array      $value) { return $value; };
+			if (is_array($default)) return function(array      $value) { return $value; };
 
-			if (is_callable ($default)) return function (callable   $value) { return $value; };
+			if (is_callable($default)) return function(callable   $value) { return $value; };
 
 			# Check object type
 
-			if (is_object($default)) return function ($value) use ($default) {
+			if (is_object($default)) return function($value) use ($default) {
 
 				return (is_a($value, get_class($default)) ? $value : null);
 			};
 
 			# Check resource type
 
-			if (is_resource($default)) return function ($value) { return (is_resource($value) ? $value : null); };
+			if (is_resource($default)) return function($value) { return (is_resource($value) ? $value : null); };
 
 			# ------------------------
 
-			return function () { return null; };
+			return function() { return null; };
 		}
 	}
 }

Braces +31 added lines, -8 removed lines

@@ -19,28 +19,51 @@
 
 			# Check basic types
 
-			if (is_string   ($default)) return function (string     $value) { return $value; };
+			if (is_string   ($default)) {
+				return function (string     $value) { return $value;
+			}
+			};
 
-			if (is_bool     ($default)) return function (bool       $value) { return $value; };
+			if (is_bool     ($default)) {
+				return function (bool       $value) { return $value;
+			}
+			};
 
-			if (is_int      ($default)) return function (int        $value) { return $value; };
+			if (is_int      ($default)) {
+				return function (int        $value) { return $value;
+			}
+			};
 
-			if (is_float    ($default)) return function (float      $value) { return $value; };
+			if (is_float    ($default)) {
+				return function (float      $value) { return $value;
+			}
+			};
 
-			if (is_array    ($default)) return function (array      $value) { return $value; };
+			if (is_array    ($default)) {
+				return function (array      $value) { return $value;
+			}
+			};
 
-			if (is_callable ($default)) return function (callable   $value) { return $value; };
+			if (is_callable ($default)) {
+				return function (callable   $value) { return $value;
+			}
+			};
 
 			# Check object type
 
-			if (is_object($default)) return function ($value) use ($default) {
+			if (is_object($default)) {
+				return function ($value) use ($default) {
 
 				return (is_a($value, get_class($default)) ? $value : null);
+			}
 			};
 
 			# Check resource type
 
-			if (is_resource($default)) return function ($value) { return (is_resource($value) ? $value : null); };
+			if (is_resource($default)) {
+				return function ($value) { return (is_resource($value) ? $value : null);
+			}
+			};
 
 			# ------------------------
 

www/engine/Framework/Classes/Arr/Arr.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
 		public static function sortby(array $array, $sub_key, bool $descending = false) : array {
 
-			$select_key = function ($element) use ($sub_key) { return ($element[$sub_key] ?? false); };
+			$select_key = function($element) use ($sub_key) { return ($element[$sub_key] ?? false); };
 
 			$sorted = []; $column = array_map($select_key, $array);
 

www/engine/System/Classes/Modules/Extend/Common/Templates.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 		protected static $loader_class = 'Modules\Extend\Loader\Templates', $exception_class = 'Exception\Template';
 
-		protected static $root_dir = [SECTION_SITE => DIR_SYSTEM_TEMPLATES . 'Site/', SECTION_ADMIN => DIR_SYSTEM_TEMPLATES . 'Admin/'];
+		protected static $root_dir = [SECTION_SITE => DIR_SYSTEM_TEMPLATES.'Site/', SECTION_ADMIN => DIR_SYSTEM_TEMPLATES.'Admin/'];
 
 		protected static $schema_prototype = 'Prototype\Template', $regex_name = REGEX_TEMPLATE_NAME;
 

www/engine/System/Classes/Modules/Extend/Utils/Handler/Basic.php

Braces +9 added lines, -3 removed lines

@@ -32,9 +32,13 @@ 
 
 				$param = static::$param[$this->loader->section()]; $name = Request::post('name');
 
-				if (false === Settings::set($param, $name)) return $ajax->setError(Language::get(static::$error_activate));
+				if (false === Settings::set($param, $name)) {
+					return $ajax->setError(Language::get(static::$error_activate));
+				}
 
-				if (false === Settings::save()) return $ajax->setError(Language::get(static::$error_save));
+				if (false === Settings::save()) {
+					return $ajax->setError(Language::get(static::$error_save));
+				}
 
 			} else if (Request::post('action') === 'list') {
 
@@ -52,7 +56,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Extend/Utils/Handler/Addons.php

Braces +9 added lines, -3 removed lines

@@ -35,13 +35,17 @@ 
 
 				$name = Request::post('name');
 
-				if (!$this->loader->install($name, true)) return $ajax->setError(Language::get(static::$error_install));
+				if (!$this->loader->install($name, true)) {
+					return $ajax->setError(Language::get(static::$error_install));
+				}
 
 			} else if (Request::post('action') === 'uninstall') {
 
 				$name = Request::post('name');
 
-				if (!$this->loader->install($name, false)) return $ajax->setError(Language::get(static::$error_uninstall));
+				if (!$this->loader->install($name, false)) {
+					return $ajax->setError(Language::get(static::$error_uninstall));
+				}
 			}
 
 			# ------------------------
@@ -55,7 +59,9 @@ 
 
 			$this->loader = new static::$loader_class;
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------