cadmium-org / cadmium-cms

www/engine/Framework/Classes/Explorer/Explorer.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if ((null === $type) || (@filetype($dir_name . $name) === $type)) yield $name;
+					if ((null === $type) || (@filetype($dir_name.$name) === $type)) yield $name;
 				}
 
 				closedir($handler);
@@ -115,7 +115,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_dir($name)) self::removeDir($name, true);
 

Braces +26 added lines, -10 removed lines

@@ -21,9 +21,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if ((null === $type) || (@filetype($dir_name . $name) === $type)) yield $name;
+					if ((null === $type) || (@filetype($dir_name . $name) === $type)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -38,7 +42,9 @@ 
 
 		private static function getInfo(string $file_name, int $param, bool $check_exists = true) {
 
-			if ($check_exists && !self::isFile($file_name)) return false;
+			if ($check_exists && !self::isFile($file_name)) {
+				return false;
+			}
 
 			return pathinfo($file_name, $param);
 		}
@@ -117,9 +123,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_dir($name)) self::removeDir($name, true);
-
-					else if (@is_file($name)) self::removeFile($name);
+					if (@is_dir($name)) {
+						self::removeDir($name, true);
+					} else if (@is_file($name)) {
+						self::removeFile($name);
+					}
 				}
 			}
 
@@ -145,7 +153,9 @@ 
 
 		public static function iterate(string $dir_name) : Generator {
 
- 			foreach (self::getList($dir_name) as $name) yield $name;
+ 			foreach (self::getList($dir_name) as $name) {
+ 				yield $name;
+ 			}
  		}
 
 		/**
@@ -154,7 +164,9 @@ 
 
 		public static function iterateDirs(string $dir_name) : Generator {
 
-			foreach (self::getList($dir_name, 'dir') as $name) yield $name;
+			foreach (self::getList($dir_name, 'dir') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -163,7 +175,9 @@ 
 
 		public static function iterateFiles(string $dir_name) : Generator {
 
-			foreach (self::getList($dir_name, 'file') as $name) yield $name;
+			foreach (self::getList($dir_name, 'file') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -334,7 +348,9 @@ 
 
 		public static function include(string $file_name) {
 
-			if ((strtolower(self::getExtension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::getExtension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return @include $file_name;
 		}

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, $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