cadmium-org / cadmium-cms

www/engine/Framework/Classes/Range/Range.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		protected static function init(string $file_name) {
 
-			if (is_array($range = Explorer::include($file_name))) static::$range = $range;
+			if (is_array($range = Explorer::include($file_name))) {
+				static::$range = $range;
+			}
 		}
 
 		/**

www/engine/Framework/Classes/XML/XML.php

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 
 		public static function stringify(SimpleXMLElement $xml) {
 
-			if (false === ($xml = dom_import_simplexml($xml))) return false;
+			if (false === ($xml = dom_import_simplexml($xml))) {
+				return false;
+			}
 
 			$dom = $xml->ownerDocument; $dom->formatOutput = true;
 
@@ -47,7 +49,9 @@ 
 
 		public static function load(string $file_name) {
 
-			if (false === ($contents = Explorer::getContents($file_name))) return false;
+			if (false === ($contents = Explorer::getContents($file_name))) {
+				return false;
+			}
 
 			return self::parse($contents);
 		}
@@ -60,7 +64,9 @@ 
 
 		public static function save(string $file_name, SimpleXMLElement $xml) {
 
-			if (false === ($xml = self::stringify($xml))) return false;
+			if (false === ($xml = self::stringify($xml))) {
+				return false;
+			}
 
 			return Explorer::putContents($file_name, $xml);
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 			# Build query
 
-			$this->query = ('UPDATE ' . $table . ' SET ' . $set . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('UPDATE '.$table.' SET '.$set.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }

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

Braces +3 added lines, -1 removed lines

@@ -95,7 +95,9 @@
 
 		public static function output(Template\Block $block, int $status = STATUS_CODE_200) {
 
-			if (!Headers::isStatusCode($status)) $status = STATUS_CODE_200;
+			if (!Headers::isStatusCode($status)) {
+				$status = STATUS_CODE_200;
+			}
 
 			Headers::sendNoCache(); Headers::sendStatus($status); Headers::sendContent(MIME_TYPE_HTML);
 

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

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
 
 				if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) continue;
 
-				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
+				$this->contents = str_replace($match, ('{ '.$type.':'.$name.' / }'), $this->contents);
 
 				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
 
@@ -51,9 +51,9 @@ 
 
 		private function parseElementaries() {
 
-			$variables = ['pattern' => REGEX_TEMPLATE_VARIABLE, 'stack' => &$this->variables ];
+			$variables = ['pattern' => REGEX_TEMPLATE_VARIABLE, 'stack' => &$this->variables];
 
-			$phrases = ['pattern' => REGEX_TEMPLATE_PHRASE, 'stack' => &$this->phrases ];
+			$phrases = ['pattern' => REGEX_TEMPLATE_PHRASE, 'stack' => &$this->phrases];
 
 			foreach ([$variables, $phrases] as $elementaries) {
 
@@ -80,14 +80,14 @@ 
 
 			foreach ($this->blocks as $name => $block) {
 
-				$insertions['{ block:' . $name . ' / }'] = $block->getContents();
+				$insertions['{ block:'.$name.' / }'] = $block->getContents();
 			}
 
 			# Process loops
 
 			foreach ($this->loops as $name => $loop) {
 
-				$insertions['{ for:' . $name . ' / }'] = $loop->getContents();
+				$insertions['{ for:'.$name.' / }'] = $loop->getContents();
 			}
 
 			# Process widgets
@@ -98,7 +98,7 @@ 
 
 				$contents = ((false !== $widget) ? $widget->getContents() : '');
 
-				$insertions['{ widget:' . $name . ' / }'] = $contents;
+				$insertions['{ widget:'.$name.' / }'] = $contents;
 			}
 
 			# Process variables
@@ -107,7 +107,7 @@ 
 
 				$value = ((false === $value) ? Template::getGlobal($name) : $value);
 
-				$insertions['$' . $name . '$'] = Str::formatOutput($value);
+				$insertions['$'.$name.'$'] = Str::formatOutput($value);
 			}
 
 			# Process phrases
@@ -116,7 +116,7 @@ 
 
 				$value = Language::get($name);
 
-				$insertions['%' . $name . '%'] = Str::formatOutput($value);
+				$insertions['%'.$name.'%'] = Str::formatOutput($value);
 			}
 
 			# Process insertions

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, $component) : Block {
 
-			if ($component instanceof Block) $this->setBlock($name, $component);
-
-			else if (is_array($component)) $this->setLoop($name, $component);
-
-			else if (is_scalar($component)) $this->setVar($name, $component);
+			if ($component instanceof Block) {
+				$this->setBlock($name, $component);
+			} else if (is_array($component)) {
+				$this->setLoop($name, $component);
+			} else if (is_scalar($component)) {
+				$this->setVar($name, $component);
+			}
 
 			# ------------------------
 
@@ -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/Arr/Arr.php

Braces +20 added lines, -5 removed lines

@@ -22,7 +22,12 @@ 
 
 			$value = null;
 
-			foreach ($path as $item) if (isset($array[$item])) $value = ($array = $array[$item]); else return null;
+			foreach ($path as $item) {
+				if (isset($array[$item])) $value = ($array = $array[$item]);
+			}
+			else {
+				return null;
+			}
 
 			# ------------------------
 
@@ -38,7 +43,9 @@ 
 
 			$selected = array_intersect_key($array, array_flip($keys));
 
-			if (null !== $filter) $selected = array_filter($array, $filter);
+			if (null !== $filter) {
+				$selected = array_filter($array, $filter);
+			}
 
 			# ------------------------
 
@@ -54,7 +61,9 @@ 
 
 			$indexed = [];
 
-			foreach ($array as $key => $value) $indexed[] = [$key_name => $key, $value_name => $value];
+			foreach ($array as $key => $value) {
+				$indexed[] = [$key_name => $key, $value_name => $value];
+			}
 
 			# ------------------------
 
@@ -71,9 +80,15 @@ 
 
 			$sorted = []; $column = array_map($select_key, $array);
 
-			if (!$descending) asort($column); else arsort($column);
+			if (!$descending) {
+				asort($column);
+			} else {
+				arsort($column);
+			}
 
-			foreach (array_keys($column) as $key) $sorted[$key] = $array[$key];
+			foreach (array_keys($column) as $key) {
+				$sorted[$key] = $array[$key];
+			}
 
 			# ------------------------
 

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/Framework/Classes/Date/Date.php

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

Braces +9 added lines, -3 removed lines

@@ -19,18 +19,24 @@
 
 		public function __construct(string $url = '') {
 
-			if (false === ($url = parse_url($url))) return;
+			if (false === ($url = parse_url($url))) {
+				return;
+			}
 
 			# Parse path
 
-			if (isset($url['path'])) foreach (explode('/', $url['path']) as $part) {
+			if (isset($url['path'])) {
+				foreach (explode('/', $url['path']) as $part) {
 
 				if ('' !== $part) $this->path[] = urldecode($part);
 			}
+			}
 
 			# Parse query
 
-			if (isset($url['query'])) parse_str($url['query'], $this->query);
+			if (isset($url['query'])) {
+				parse_str($url['query'], $this->query);
+			}
 		}
 
 		/**

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 
 		public function getPath() : string {
 
-			return ('/' . implode('/', array_map('urlencode', $this->path)));
+			return ('/'.implode('/', array_map('urlencode', $this->path)));
 		}
 
 		/**
@@ -81,7 +81,7 @@ 
 
 		public function getQuery() : string {
 
-			return (($query = http_build_query($this->query)) ? ('?' . $query) : '');
+			return (($query = http_build_query($this->query)) ? ('?'.$query) : '');
 		}
 
 		/**
@@ -108,7 +108,7 @@ 
 
 		public function getString(bool $include_query = true) : string {
 
-			return ($this->getPath() . ($include_query ? $this->getQuery() : ''));
+			return ($this->getPath().($include_query ? $this->getQuery() : ''));
 		}
 	}
 }

Indentation +4 added lines, -4 removed lines

@@ -47,10 +47,10 @@
 		}
 
 		/**
-		* Get a query attribute
-		*
-		* @return string|false : the value or false if the attribute does not exist
-		*/
+		 * Get a query attribute
+		 *
+		 * @return string|false : the value or false if the attribute does not exist
+		 */
 
 		public function getAttribute(string $name) {
 

www/engine/Framework/Classes/Form/Form.php

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 
 			foreach ($this->fields as $field) {
 
-				$block->setBlock(('field_' . $field->getName()), $field->getBlock());
+				$block->setBlock(('field_'.$field->getName()), $field->getBlock());
 			}
 		}
 	}

Braces +20 added lines, -6 removed lines

@@ -23,7 +23,9 @@ 
 
 		private function addField(Form\Field $field) : bool {
 
-			if ($this->posted || ('' === ($key = $field->getKey()))) return false;
+			if ($this->posted || ('' === ($key = $field->getKey()))) {
+				return false;
+			}
 
 			$this->fields[$key] = $field;
 
@@ -38,7 +40,9 @@ 
 
 		public function __construct(string $name = '') {
 
-			if (preg_match(REGEX_FORM_NAME, $name)) $this->name = $name;
+			if (preg_match(REGEX_FORM_NAME, $name)) {
+				$this->name = $name;
+			}
 		}
 
 		/**
@@ -90,9 +94,15 @@ 
 
 			foreach ($this->fields as $field) {
 
-				if (($field instanceof Form\Field\Checkbox) || $field->disabled) continue;
+				if (($field instanceof Form\Field\Checkbox) || $field->disabled) {
+					continue;
+				}
 
-				if (false !== Request::post($field->getName())) $check = true; else return false;
+				if (false !== Request::post($field->getName())) {
+					$check = true;
+				} else {
+					return false;
+				}
 			}
 
 			# ------------------------
@@ -108,7 +118,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || !$this->check()) return false;
+			if ($this->posted || !$this->check()) {
+				return false;
+			}
 
 			$post = []; $errors = false;
 
@@ -116,7 +128,9 @@ 
 
 				$field->post(); $post[$field->getKey()] = $field->getValue();
 
-				if ($field->error) $errors = true;
+				if ($field->error) {
+					$errors = true;
+				}
 			}
 
 			$this->posted = true; $this->errors = $errors;