cadmium-org / cadmium-cms

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

Braces +9 added lines, -3 removed lines

@@ -56,7 +56,9 @@ 
 
 		public function getRow() {
 
-			if (!is_object($this->result)) return null;
+			if (!is_object($this->result)) {
+				return null;
+			}
 
 			return mysqli_fetch_assoc($this->result);
 		}
@@ -67,9 +69,13 @@ 
 
 		public function getRows() {
 
-			if (!is_object($this->result)) return [];
+			if (!is_object($this->result)) {
+				return [];
+			}
 
-			$rows = []; while (null !== ($row = $this->getRow())) $rows[] = $row;
+			$rows = []; while (null !== ($row = $this->getRow())) {
+				$rows[] = $row;
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 
 		public function addItems(array $items) {
 
-			foreach ($items as $item) if (is_array($item)) $this->addItem($item);
+			foreach ($items as $item) {
+				if (is_array($item)) $this->addItem($item);
+			}
 
 			return $this;
 		}

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 +44 added lines, -20 removed lines

@@ -31,15 +31,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->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->widgets[] = $name;
+				}
 			}
 		}
 
@@ -59,7 +63,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;
 				}
@@ -143,11 +149,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;
+			}
 		}
 
 		/**
@@ -158,11 +170,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);
+			}
 
 			# ------------------------
 
@@ -177,7 +191,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;
 		}
@@ -190,7 +206,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;
 		}
@@ -203,7 +221,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;
 		}
@@ -216,7 +236,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;
 		}
@@ -298,7 +320,9 @@ 
 
 		public function getContents() : string {
 
-			if (!$this->enabled) return '';
+			if (!$this->enabled) {
+				return '';
+			}
 
 			# Lock the block
 

www/engine/Framework/Classes/Session/Session.php

Braces +9 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
 
 		public static function start(string $name, int $lifetime) {
 
-			if (session_id()) return true;
+			if (session_id()) {
+				return true;
+			}
 
 			ini_set('session.gc_maxlifetime', $lifetime);
 
@@ -47,7 +49,9 @@ 
 
 		public static function set(string $name, $value) {
 
-			if (session_id()) $_SESSION[$name] = $value;
+			if (session_id()) {
+				$_SESSION[$name] = $value;
+			}
 		}
 
 		/**
@@ -76,7 +80,9 @@ 
 
 		public static function delete(string $name) {
 
-			if (isset($_SESSION[$name])) unset($_SESSION[$name]);
+			if (isset($_SESSION[$name])) {
+				unset($_SESSION[$name]);
+			}
 		}
 	}
 }

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];
+			}
 
 			# ------------------------
 

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/Ajax/Response.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 
 		public function set(string $name, $value) {
 
-			if (!in_array($name, ['error', 'status'], true)) $this->data[$name] = $value;
+			if (!in_array($name, ['error', 'status'], true)) {
+				$this->data[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -82,7 +84,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/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) {