cadmium-org / cadmium-cms

www/engine/Framework/Classes/Dataset/Dataset.php

Doc Comments +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 		 * If a validator was not given, a default validator will be used to convert a given variable type to a default's type.
 		 * In a case the conversion fails an existing value will not be changed
 		 *
-		 * @return the current dataset object
+		 * @return Dataset current dataset object
 		 */
 
 		public function addParam(string $name, $default, callable $validator = null) : Dataset {
@@ -48,7 +48,7 @@ 
 		/**
 		 * Add multiple params
 		 *
-		 * @return the current dataset object
+		 * @return Dataset current dataset object
 		 */
 
 		public function addParams(array $data) : Dataset {
@@ -61,7 +61,7 @@ 
 		/**
 		 * Update a value
 		 *
-		 * @return true on success, false on error, or null if the param does not exist
+		 * @return null|boolean on success, false on error, or null if the param does not exist
 		 */
 
 		public function set(string $name, $value) {

Braces +28 added lines, -18 removed lines

@@ -34,7 +34,9 @@ 
 
 		public function addParam(string $name, $default, callable $validator = null) : Dataset {
 
-			if ('' === $name) return $this;
+			if ('' === $name) {
+				return $this;
+			}
 
 			$this->data[$name] = $default; $this->defaults[$name] = $default;
 
@@ -53,7 +55,9 @@ 
 
 		public function addParams(array $data) : Dataset {
 
-			foreach ($data as $name => $value) if (is_scalar($name)) $this->addParam($name, $value);
+			foreach ($data as $name => $value) {
+				if (is_scalar($name)) $this->addParam($name, $value);
+			}
 
 			return $this;
 		}
@@ -66,16 +70,16 @@ 
 
 		public function set(string $name, $value) {
 
-			if (!isset($this->validators[$name])) return null;
+			if (!isset($this->validators[$name])) {
+				return null;
+			}
 
 			try {
 
-				if (null === ($value = $this->validators[$name]($value))) return false;
-
-				else { $this->data[$name] = $value; return true; }
-			}
-
-			catch (TypeError $e) { return false; }
+				if (null === ($value = $this->validators[$name]($value))) {
+					return false;
+				} else { $this->data[$name] = $value; return true; }
+			} catch (TypeError $e) { return false; }
 		}
 
 		/**
@@ -90,7 +94,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (null !== ($value = $this->set($name, $value))) $setted[$name] = $value;
+				if (null !== ($value = $this->set($name, $value))) {
+					$setted[$name] = $value;
+				}
 			}
 
 			# ------------------------
@@ -106,16 +112,18 @@ 
 
 		public function cast(string $name, $value) {
 
-			if (!isset($this->validators[$name])) return null;
+			if (!isset($this->validators[$name])) {
+				return null;
+			}
 
 			try {
 
-				if (null !== ($value = $this->validators[$name]($value))) return $value;
-
-				else return $this->data[$name];
-			}
-
-			catch (TypeError $e) { return $this->data[$name]; }
+				if (null !== ($value = $this->validators[$name]($value))) {
+					return $value;
+				} else {
+					return $this->data[$name];
+				}
+			} catch (TypeError $e) { return $this->data[$name]; }
 		}
 
 		/**
@@ -130,7 +138,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (null !== ($value = $this->cast($name, $value))) $casted[$name] = $value;
+				if (null !== ($value = $this->cast($name, $value))) {
+					$casted[$name] = $value;
+				}
 			}
 
 			# ------------------------

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

Doc Comments +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 		/**
 		 * Create a directory
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function createDir(string $dir_name, int $mode = 0755) : bool {
@@ -75,7 +75,7 @@ 
 		/**
 		 * Create a file
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function createFile(string $file_name) : bool {
@@ -86,7 +86,7 @@ 
 		/**
 		 * Remove a directory
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function removeDir(string $dir_name, bool $recursive = false) : bool {
@@ -111,7 +111,7 @@ 
 		/**
 		 * Remove a file
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function removeFile(string $file_name) : bool {
@@ -191,7 +191,7 @@ 
 		/**
 		 * Get an extnesion of a file
 		 *
-		 * @return the string or false if check_exists is true and the file does not actually exists
+		 * @return string string or false if check_exists is true and the file does not actually exists
 		 */
 
 		public static function getExtension(string $file_name, bool $check_exists = true) {
@@ -213,7 +213,7 @@ 
 		/**
 		 * Get file contents
 		 *
-		 * @return the read data or false on failure
+		 * @return string read data or false on failure
 		 */
 
 		public static function getContents(string $file_name) {

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

Unused Use Statements +3 added lines, -1 removed lines

@@ -9,7 +9,9 @@
 
 namespace Form\Field {
 
-	use Form, Tag, Template;
+	use Form;
+	use Tag;
+	use Template;
 
 	class Select extends Form\Field {
 

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

Unused Use Statements +3 added lines, -1 removed lines

@@ -9,7 +9,9 @@
 
 namespace Form\Field {
 
-	use Form, Str, Template;
+	use Form;
+	use Str;
+	use Template;
 
 	class Text extends Form\Field {
 

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

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 {

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

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/Url/Url.php

Indentation +4 added lines, -4 removed lines

@@ -47,10 +47,10 @@
 		}
 
 		/**
-		* Get a query attribute
-		*
-		* @return the value or false if the attribute does not exist
-		*/
+		 * Get a query attribute
+		 *
+		 * @return the value or false if the attribute does not exist
+		 */
 
 		public function getAttribute(string $name) {