cadmium-org / cadmium-cms

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

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

@@ -9,7 +9,10 @@
 
 namespace Form {
 
-	use Dataset, Form, Request, Tag;
+	use Dataset;
+	use Form;
+	use Request;
+	use Tag;
 
 	abstract class Field {
 

Braces +12 added lines, -4 removed lines

@@ -57,11 +57,17 @@ 
 
 			# Set appearance
 
-			if ($this->disabled)    $data['disabled']           = 'disabled';
+			if ($this->disabled) {
+				$data['disabled']           = 'disabled';
+			}
 
-			if ($this->required)    $data['data-required']      = 'required';
+			if ($this->required) {
+				$data['data-required']      = 'required';
+			}
 
-			if ($this->error)       $data['data-error']         = 'error';
+			if ($this->error) {
+				$data['data-error']         = 'error';
+			}
 
 			# ------------------------
 
@@ -76,7 +82,9 @@ 
 
 		public function post() : bool {
 
-			if ($this->posted || $this->disabled || ('' === $this->key)) return false;
+			if ($this->posted || $this->disabled || ('' === $this->key)) {
+				return false;
+			}
 
 			$this->error = (!$this->setValue(Request::post($this->name)) && $this->required);
 

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

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

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

Braces +45 added lines, -23 removed lines

@@ -82,9 +82,13 @@ 
 
 			$tag = $this->getTag('textarea', [], $this->value);
 
-			if ($this->rows > 0) $tag->setAttribute('rows', $this->rows);
+			if ($this->rows > 0) {
+				$tag->setAttribute('rows', $this->rows);
+			}
 
-			if ($this->cols > 0) $tag->setAttribute('cols', $this->cols);
+			if ($this->cols > 0) {
+				$tag->setAttribute('cols', $this->cols);
+			}
 
 			# ------------------------
 
@@ -97,9 +101,11 @@ 
 
 		private function processSpaces() {
 
-			if ($this->spaces === 'strip') $this->value = Str::stripSpaces($this->value);
-
-			else if ($this->spaces === 'single') $this->value = Str::singleSpaces($this->value);
+			if ($this->spaces === 'strip') {
+				$this->value = Str::stripSpaces($this->value);
+			} else if ($this->spaces === 'single') {
+				$this->value = Str::singleSpaces($this->value);
+			}
 		}
 
 		/**
@@ -108,9 +114,11 @@ 
 
 		private function processConvert() {
 
-			if ($this->convert === 'url') $this->value = Str::toUrl($this->value, $this->maxlength);
-
-			else if ($this->convert === 'var') $this->value = Str::toVar($this->value, $this->maxlength);
+			if ($this->convert === 'url') {
+				$this->value = Str::toUrl($this->value, $this->maxlength);
+			} else if ($this->convert === 'var') {
+				$this->value = Str::toVar($this->value, $this->maxlength);
+			}
 		}
 
 		/**
@@ -119,9 +127,11 @@ 
 
 		private function processTransform() {
 
-			if ($this->transform === 'lower') $this->value = Str::toLower($this->value);
-
-			else if ($this->transform === 'upper') $this->value = Str::toUpper($this->value);
+			if ($this->transform === 'lower') {
+				$this->value = Str::toLower($this->value);
+			} else if ($this->transform === 'upper') {
+				$this->value = Str::toUpper($this->value);
+			}
 		}
 
 		/**
@@ -183,27 +193,39 @@ 
 
 			# Process hidden field
 
-			if ($this->type === FORM_FIELD_HIDDEN) return $this->getHidden()->getBlock();
+			if ($this->type === FORM_FIELD_HIDDEN) {
+				return $this->getHidden()->getBlock();
+			}
 
 			# Process visible field
 
-			else if ($this->type === FORM_FIELD_PASSWORD) $tag = $this->getPassword();
-
-			else if ($this->type === FORM_FIELD_CAPTCHA) $tag = $this->getCaptcha();
-
-			else if ($this->type === FORM_FIELD_TEXTAREA) $tag = $this->getTextarea();
-
-			else $tag = $this->getText();
+			else if ($this->type === FORM_FIELD_PASSWORD) {
+				$tag = $this->getPassword();
+			} else if ($this->type === FORM_FIELD_CAPTCHA) {
+				$tag = $this->getCaptcha();
+			} else if ($this->type === FORM_FIELD_TEXTAREA) {
+				$tag = $this->getTextarea();
+			} else {
+				$tag = $this->getText();
+			}
 
 			# Set appearance
 
-			if ($this->maxlength > 0) $tag->setAttribute('maxlength', $this->maxlength);
+			if ($this->maxlength > 0) {
+				$tag->setAttribute('maxlength', $this->maxlength);
+			}
 
-			if ('' !== $this->placeholder) $tag->setAttribute('placeholder', $this->placeholder);
+			if ('' !== $this->placeholder) {
+				$tag->setAttribute('placeholder', $this->placeholder);
+			}
 
-			if ($this->readonly) $tag->setAttribute('readonly', 'readonly');
+			if ($this->readonly) {
+				$tag->setAttribute('readonly', 'readonly');
+			}
 
-			if ($this->autofocus) $tag->setAttribute('autofocus', 'autofocus');
+			if ($this->autofocus) {
+				$tag->setAttribute('autofocus', 'autofocus');
+			}
 
 			# ------------------------
 

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

Doc Comments +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 		/**
 		 * Set a name
 		 *
-		 * @return the current tag object
+		 * @return Tag current tag object
 		 */
 
 		 public function setName(string $name) : Tag {
@@ -40,7 +40,7 @@ 
 		/**
 		 * Set an attribute
 		 *
-		 * @return the current tag object
+		 * @return Tag current tag object
 		 */
 
 		public function setAttribute(string $name, string $value) : Tag {
@@ -53,7 +53,7 @@ 
 		/**
 		 * Set multiple attributes
 		 *
-		 * @return the current tag object
+		 * @return Tag current tag object
 		 */
 
 		public function setAttributes(array $attributes) : Tag {
@@ -66,7 +66,7 @@ 
 		/**
 		 * Set contents. The method expects a block, a string, or null
 		 *
-		 * @return the current tag object
+		 * @return Tag current tag object
 		 */
 
 		public function setContents($contents) : Tag {
@@ -108,7 +108,7 @@ 
 		/**
 		 * Get the tag as a block
 		 *
-		 * @return the self-closing tag if no valid contents have been set, otherwise the regular tag
+		 * @return Template\Block self-closing tag if no valid contents have been set, otherwise the regular tag
 		 */
 
 		public function getBlock() : Template\Block {

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 			$block = clone (self::$block ?? (self::$block = Template::createBlock(
 
-				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>' .
+				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>'.
 
 				'{ block:contents / }$contents${ ! block:closing }</$name$>{ / block:closing }'
 			)));

Braces +6 added lines, -2 removed lines

@@ -58,7 +58,9 @@ 
 
 		public function setAttributes(array $attributes) : Tag {
 
-			foreach ($attributes as $name => $value) if (is_scalar($value)) $this->setAttribute($name, $value);
+			foreach ($attributes as $name => $value) {
+				if (is_scalar($value)) $this->setAttribute($name, $value);
+			}
 
 			return $this;
 		}
@@ -71,7 +73,9 @@ 
 
 		public function setContents($contents) : Tag {
 
-			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) $this->contents = $contents;
+			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) {
+				$this->contents = $contents;
+			}
 
 			return $this;
 		}

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

Braces +9 added lines, -3 removed lines

@@ -77,9 +77,13 @@ 
 
 			# Set appearance
 
-			if ($this->search) $tag->setAttribute('data-search', 'search');
+			if ($this->search) {
+				$tag->setAttribute('data-search', 'search');
+			}
 
-			if ($this->auto) $tag->setAttribute('data-auto', 'auto');
+			if ($this->auto) {
+				$tag->setAttribute('data-auto', 'auto');
+			}
 
 			# Set options
 
@@ -87,7 +91,9 @@ 
 
 				$option = (new Tag('option', [], $text))->setAttribute('value', $value);
 
-				if ($this->value === $value) $option->setAttribute('selected', '');
+				if ($this->value === $value) {
+					$option->setAttribute('selected', '');
+				}
 
 				$options->addItem($option->getBlock());
 			}