cadmium-org / cadmium-cms

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

Braces +24 added lines, -8 removed lines

@@ -24,11 +24,17 @@ 
 
 			# Set config
 
-			if ($this->disabled) $tag->set('disabled', 'disabled');
+			if ($this->disabled) {
+				$tag->set('disabled', 'disabled');
+			}
 
-			if ($this->required) $tag->set('data-required', 'required');
+			if ($this->required) {
+				$tag->set('data-required', 'required');
+			}
 
-			if ($this->error) $tag->set('data-error', 'error');
+			if ($this->error) {
+				$tag->set('data-error', 'error');
+			}
 
 			# ------------------------
 
@@ -54,11 +60,15 @@ 
 
 			$params = array_merge(['disabled' => false, 'required' => false], $this->config);
 
-			foreach ($params as $name => $default) if (isset($config[$name])) {
+			foreach ($params as $name => $default) {
+				if (isset($config[$name])) {
 
 				$checker = ((0 === $default) ? 'is_numeric' : 'is_scalar');
+			}
 
-				if ($checker($config[$name])) $this->$name($config[$name]);
+				if ($checker($config[$name])) {
+					$this->$name($config[$name]);
+				}
 			}
 		}
 
@@ -66,7 +76,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || $this->disabled || ('' === $this->key)) return false;
+			if ($this->posted || $this->disabled || ('' === $this->key)) {
+				return false;
+			}
 
 			$this->error = (!$this->set(Request::post($this->name)) && $this->required);
 
@@ -100,7 +112,9 @@ 
 
 		public function disabled(bool $value = null) {
 
-			if (null === $value) return $this->disabled;
+			if (null === $value) {
+				return $this->disabled;
+			}
 
 			$this->disabled = $value;
 		}
@@ -109,7 +123,9 @@ 
 
 		public function required(bool $value = null) {
 
-			if (null === $value) return $this->required;
+			if (null === $value) {
+				return $this->required;
+			}
 
 			$this->required = $value;
 		}

www/engine/Framework/Classes/Tag/Tag.php

Braces +8 added lines, -4 removed lines

@@ -23,7 +23,9 @@ 
 
 			$this->name = $name;
 
-			foreach ($attributes as $name => $value) $this->set($name, $value);
+			foreach ($attributes as $name => $value) {
+				$this->set($name, $value);
+			}
 
 			$this->contents($contents);
 		}
@@ -41,9 +43,11 @@ 
 
 		public function contents($contents) {
 
-			if ((null === $contents) || Template::isBlock($contents)) $this->contents = $contents;
-
-			else if (is_scalar($contents)) $this->contents = Template::block('$contents$')->set('contents', $contents);
+			if ((null === $contents) || Template::isBlock($contents)) {
+				$this->contents = $contents;
+			} else if (is_scalar($contents)) {
+				$this->contents = Template::block('$contents$')->set('contents', $contents);
+			}
 
 			# ------------------------
 

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

Braces +9 added lines, -3 removed lines

@@ -8,9 +8,13 @@ 
 
 		public static function validate(string $date, string $format) {
 
-			if (false === ($date_object = date_create_from_format($format, $date))) return false;
+			if (false === ($date_object = date_create_from_format($format, $date))) {
+				return false;
+			}
 
-			if (false === ($date_formatted = $date_object->format($format))) return false;
+			if (false === ($date_formatted = $date_object->format($format))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -35,7 +39,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::year()) ? self::year() : $year) : '1900');
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 				$toggle = (($matches[1][$key] === '!') ? 'disable' : 'enable');
 
-				$type = $matches[2][$key]; $name = $matches[3][$key]; $contents = ($matches[4][$key] ?? '');
+				$type = $matches[2][$key]; $name = $matches[3][$key]; $contents = ($matches[4][$key] ? ? '');
 
 				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
 

Braces +44 added lines, -20 removed lines

@@ -22,15 +22,19 @@ 
 
 				$type = $matches[2][$key]; $name = $matches[3][$key]; $contents = ($matches[4][$key] ?? '');
 
-				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
+				if (!preg_match(REGEX_TEMPLATE_ITEM_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;
+				}
 			}
 		}
 
@@ -48,7 +52,9 @@ 
 
 				foreach ($matches[1] as $index => $name) {
 
-					if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
+					if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) {
+						continue;
+					}
 
 					$elementaries['stack'][$name] = false;
 				}
@@ -68,29 +74,39 @@ 
 
 		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;
+			}
 		}
 
 		# Setter
 
 		public function __set(string $name, $value) {
 
-			if ($value instanceof Block) $this->block($name, $value);
-
-			else if (is_array($value)) $this->loop($name, $value);
-
-			else if (is_scalar($value)) $this->set($name, $value);
+			if ($value instanceof Block) {
+				$this->block($name, $value);
+			} else if (is_array($value)) {
+				$this->loop($name, $value);
+			} else if (is_scalar($value)) {
+				$this->set($name, $value);
+			}
 		}
 
 		# Set block
 
 		public function block(string $name, Block $block = null) {
 
-			if (!isset($this->blocks[$name])) return ((null === $block) ? new Block() : $this);
+			if (!isset($this->blocks[$name])) {
+				return ((null === $block) ? new Block() : $this);
+			}
 
-			if (null === $block) return $this->blocks[$name];
+			if (null === $block) {
+				return $this->blocks[$name];
+			}
 
 			$this->blocks[$name] = $block;
 
@@ -103,9 +119,13 @@ 
 
 		public function loop(string $name, array $range = null) {
 
-			if (!isset($this->loops[$name])) return ((null === $range) ? new Loop() : $this);
+			if (!isset($this->loops[$name])) {
+				return ((null === $range) ? new Loop() : $this);
+			}
 
-			if (null === $range) return $this->loops[$name];
+			if (null === $range) {
+				return $this->loops[$name];
+			}
 
 			$this->loops[$name]->range($range);
 
@@ -118,7 +138,9 @@ 
 
 		public function set(string $name, string $value) {
 
-			if (isset($this->variables[$name])) $this->variables[$name] = $value;
+			if (isset($this->variables[$name])) {
+				$this->variables[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -127,7 +149,9 @@ 
 
 		public function contents() {
 
-			if (!$this->enabled) return '';
+			if (!$this->enabled) {
+				return '';
+			}
 
 			$this->enabled = false; $insertions = [];
 

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

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
 
 				$group->add($block = clone($this->block));
 
-				if (is_array($item)) foreach ($item as $name => $value) if (is_scalar($value)) $block->set($name, $value);
+				if (is_array($item)) {
+					foreach ($item as $name => $value) if (is_scalar($value)) $block->set($name, $value);
+				}
 			}
 
 			# ------------------------

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

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 
 			$contents = '';
 
-			foreach ($this->items as $block) $contents .= $block->contents();
+			foreach ($this->items as $block) {
+				$contents .= $block->contents();
+			}
 
 			# ------------------------
 

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

Braces +9 added lines, -3 removed lines

@@ -8,7 +8,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);
 
@@ -46,14 +48,18 @@ 
 
 		public static function set(string $name, $value) {
 
-			if (session_id()) $_SESSION[$name] = $value;
+			if (session_id()) {
+				$_SESSION[$name] = $value;
+			}
 		}
 
 		# Delete variable
 
 		public static function delete(string $name) {
 
-			if (session_id() && isset($_SESSION[$name])) unset($_SESSION[$name]);
+			if (session_id() && isset($_SESSION[$name])) {
+				unset($_SESSION[$name]);
+			}
 		}
 	}
 }

www/engine/Framework/Classes/Cookie/Cookie.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 
 		public static function delete(string $name) {
 
-			if (isset($_COOKIE[$name])) unset($_COOKIE[$name]);
+			if (isset($_COOKIE[$name])) {
+				unset($_COOKIE[$name]);
+			}
 		}
 	}
 }

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

Braces +20 added lines, -5 removed lines

@@ -10,7 +10,12 @@ 
 
 			$value = false;
 
-			foreach ($path as $item) if (isset($array[$item])) $value = ($array = $array[$item]); else return false;
+			foreach ($path as $item) {
+				if (isset($array[$item])) $value = ($array = $array[$item]);
+			}
+			else {
+				return false;
+			}
 
 			# ------------------------
 
@@ -23,7 +28,9 @@ 
 
 			$result = [];
 
-			foreach ($keys as $key) if (is_scalar($key)) $result[$key] = (isset($array[$key]) ? $array[$key] : false);
+			foreach ($keys as $key) {
+				if (is_scalar($key)) $result[$key] = (isset($array[$key]) ? $array[$key] : false);
+			}
 
 			# ------------------------
 
@@ -36,7 +43,9 @@ 
 
 			$result = [];
 
-			foreach ($array as $key => $value) $result[] = [$key_name => $key, $value_name => $value];
+			foreach ($array as $key => $value) {
+				$result[] = [$key_name => $key, $value_name => $value];
+			}
 
 			# ------------------------
 
@@ -54,9 +63,15 @@ 
 
 			$column = array_map($select_key, $array);
 
-			if (!$descending) asort($column); else arsort($column);
+			if (!$descending) {
+				asort($column);
+			} else {
+				arsort($column);
+			}
 
-			$result = []; foreach (array_keys($column) as $key) $result[$key] = $array[$key];
+			$result = []; foreach (array_keys($column) as $key) {
+				$result[$key] = $array[$key];
+			}
 
 			# ------------------------