cadmium-org / cadmium-cms

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

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
 		protected function getValue(string $value) {
 
-			return ('\'' . addslashes($value) . '\'');
+			return ('\''.addslashes($value).'\'');
 		}
 
 		# Get field sort

Braces +14 added lines, -5 removed lines

@@ -31,7 +31,9 @@ 
 
 		protected function getString($source = null, string $pattern = '', string $separator = '') {
 
-			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' => []];
 
@@ -39,18 +41,25 @@ 
 
 			# 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
 
-			foreach ($source as $key => $value) if (is_scalar($value)) {
+			foreach ($source as $key => $value) {
+				if (is_scalar($value)) {
 
-				$output[$count] = $pattern; $item = &$output[$count++];
+				$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]])) {
 
 					$item = str_replace($match[0], [$this, $parsers[$match[1]]]($$name), $item);
 				}
+				}
 			};
 
 			# ------------------------

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 +50 added lines, -22 removed lines

@@ -33,15 +33,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;
+				}
 			}
 		}
 
@@ -61,7 +65,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;
 				}
@@ -138,7 +144,9 @@ 
 
 			# Process items
 
-			foreach ($this->items as $block) $contents .= $block->getContents();
+			foreach ($this->items as $block) {
+				$contents .= $block->getContents();
+			}
 
 			# ------------------------
 
@@ -177,7 +185,9 @@ 
 
 		public function addItems(array $items) : Block {
 
-			foreach ($items as $item) if ($item instanceof Block) $this->addItem($item);
+			foreach ($items as $item) {
+				if ($item instanceof Block) $this->addItem($item);
+			}
 
 			return $this;
 		}
@@ -203,11 +213,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);
+			}
 
 			# ------------------------
 
@@ -222,7 +234,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;
 		}
@@ -235,7 +249,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;
 		}
@@ -248,7 +264,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;
 		}
@@ -261,7 +279,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;
 		}
@@ -374,7 +394,9 @@ 
 
 		public function getContents() : string {
 
-			if (!$this->enabled) return '';
+			if (!$this->enabled) {
+				return '';
+			}
 
 			# Lock the block
 
@@ -434,11 +456,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;
+			}
 		}
 
 		/**

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/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/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) {
 
-			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;

Doc Comments +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 		/**
 		 * Add a field to the form
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		private function addField(Form\Field $field) : bool {
@@ -44,7 +44,7 @@ 
 		/**
 		 * Add a text field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addText(string $key, string $value = '',
@@ -57,7 +57,7 @@ 
 		/**
 		 * Add a select field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addSelect(string $key, string $value = '',
@@ -70,7 +70,7 @@ 
 		/**
 		 * Add a checkbox field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addCheckbox(string $key, string $value = '') : bool {
@@ -81,7 +81,7 @@ 
 		/**
 		 * Check if valid POST data has been recieved
 		 *
-		 * @return true if the data has been recieved, otherwise false
+		 * @return boolean if the data has been recieved, otherwise false
 		 */
 
 		public function check() : bool {