cadmium-org / cadmium-cms

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

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/Template/Group.php

Braces +9 added lines, -3 removed lines

@@ -28,7 +28,9 @@ 
 
 		public function __clone() {
 
-			foreach ($this->items as $name => $item) $this->items[$name] = clone $item;
+			foreach ($this->items as $name => $item) {
+				$this->items[$name] = clone $item;
+			}
 		}
 
 		/**
@@ -52,7 +54,9 @@ 
 
 		public function addItems(array $items) : Group {
 
- 			foreach ($items as $item) if ($item instanceof Block) $this->addItem($item);
+ 			foreach ($items as $item) {
+ 				if ($item instanceof Block) $this->addItem($item);
+ 			}
 
  			return $this;
  		}
@@ -111,7 +115,9 @@ 
 
 			# Process items
 
-			foreach ($this->items as $block) $contents .= $block->getContents();
+			foreach ($this->items as $block) {
+				$contents .= $block->getContents();
+			}
 
 			# ------------------------