newicon / neon

neon/core/form/fields/Wysiwyg.php

Braces +3 added lines, -2 removed lines

@@ -81,8 +81,9 @@
 		$fullConfig = array_merge_recursive($defaultConfigSets, $additionalConfigSets);
 		// convert the extraPlugins into a comma separated list as required by ckeditor
 		foreach ($fullConfig as $set=>$config) {
-			if (isset($config['extraPlugins']))
-				$fullConfig[$set]['extraPlugins'] = implode(',', $config['extraPlugins']);
+			if (isset($config['extraPlugins'])) {
+							$fullConfig[$set]['extraPlugins'] = implode(',', $config['extraPlugins']);
+			}
 		}
 		return json_encode($fullConfig);
 	}

neon/core/form/fields/filters/File.php

Braces +3 added lines, -2 removed lines

@@ -26,7 +26,8 @@
 	{
 		// do a query
 		$ids = neon()->db->query()->from('firefly_file_manager')->select('uuid')->where(['like', 'name', $searchData])->column();
-		if (!empty($ids))
-			$query->where($this->getDataKey(), '=', $ids);
+		if (!empty($ids)) {
+					$query->where($this->getDataKey(), '=', $ids);
+		}
 	}
 }
\ No newline at end of file

neon/core/form/fields/Date.php

Braces +3 added lines, -2 removed lines

@@ -129,8 +129,9 @@
 	public function getValueDisplay()
 	{
 		// the asDate function sets all empty values to 0 meaning it returns a formatted version of 1970-01-01
-		if (empty($this->getData()))
-			return neon()->formatter->nullDisplay;
+		if (empty($this->getData())) {
+					return neon()->formatter->nullDisplay;
+		}
 		return neon()->formatter->asDate($this->getData());
 	}
 }

neon/core/form/fields/Real.php

Braces +9 added lines, -6 removed lines

@@ -36,8 +36,9 @@ 
 	 */
 	public function setValue($value)
 	{
-		if (is_numeric($value))
-			return parent::setValue(round($value, $this->decimal));
+		if (is_numeric($value)) {
+					return parent::setValue(round($value, $this->decimal));
+		}
 		parent::setvalue(null);
 	}
 
@@ -47,8 +48,9 @@ 
 	public function getValue()
 	{
 		// prevent returning 0 when casting a null value to a (real) number
-		if (!is_numeric($this->_value))
-			return null;
+		if (!is_numeric($this->_value)) {
+					return null;
+		}
 		return (real) $this->_value;
 	}
 
@@ -58,8 +60,9 @@ 
 	public function getValueDisplay()
 	{
 		$value = $this->getValue();
-		if ($this->decimal === 0)
-			return neon()->formatter->asInteger($value);
+		if ($this->decimal === 0) {
+					return neon()->formatter->asInteger($value);
+		}
 		return neon()->formatter->asDecimal($value, $this->decimal);
 	}
 

neon/core/form/traits/BuilderTrait.php

Braces +6 added lines, -4 removed lines

@@ -352,8 +352,9 @@ 
 	 */
 	public function makeField($field, $defaults=[])
 	{
-		if (is_array($field))
-			$field = $this->createFieldObjectFromConfig($field, $defaults);
+		if (is_array($field)) {
+					$field = $this->createFieldObjectFromConfig($field, $defaults);
+		}
 
 		if (!($field instanceof IField || $field instanceof Form)) {
 			// add this form as the parent form reference
@@ -422,8 +423,9 @@ 
 	 */
 	public function getFieldClassByAlias($alias)
 	{
-		if (!$this->fieldAliasExists($alias))
-			throw new \InvalidArgumentException("There is no alias with the key '$alias' in the Forms fieldAliases array");
+		if (!$this->fieldAliasExists($alias)) {
+					throw new \InvalidArgumentException("There is no alias with the key '$alias' in the Forms fieldAliases array");
+		}
 		return $this->fieldAliases[strtolower($alias)];
 	}
 

neon/core/form/Deprecated.php

Braces +3 added lines, -2 removed lines

@@ -180,8 +180,9 @@
 		}
 
 		// ignore if this is a deleted field
-		if ($field->deleted == 1)
-			return;
+		if ($field->deleted == 1) {
+					return;
+		}
 
 		// check if member exists
 		$memberRef = $field->getDdsName();

neon/core/form/Form.php

Braces +47 added lines, -31 removed lines

@@ -200,11 +200,13 @@ 
 	{
 		$view = ($view === null) ? $this->getView() : $view;
 		FormAsset::register($view);
-		foreach ($this->getFields() as $field)
-			$field->registerScripts($view);
+		foreach ($this->getFields() as $field) {
+					$field->registerScripts($view);
+		}
 		if ($this->isRootForm()) {
-			if ($mount)
-				$view->registerJs('(new Vue()).$mount("#' . $this->id . '");', $view::POS_END, $this->id . 'vue');
+			if ($mount) {
+							$view->registerJs('(new Vue()).$mount("#' . $this->id . '");', $view::POS_END, $this->id . 'vue');
+			}
 		}
 	}
 
@@ -326,8 +328,9 @@ 
 	{
 		$errors = [];
 		foreach($this->getFields() as $name => $field) {
-			if ($field->hasError())
-				$errors[$name] = $field->getErrors();
+			if ($field->hasError()) {
+							$errors[$name] = $field->getErrors();
+			}
 		}
 		return array_merge($this->_errors, $errors);
 	}
@@ -356,10 +359,11 @@ 
 	 */
 	public function addError($fieldNameOrError='', $error=null)
 	{
-		if ($error === null)
-			$this->_errors[] = $fieldNameOrError;
-		else
-			$this->getField($fieldNameOrError)->addError($error);
+		if ($error === null) {
+					$this->_errors[] = $fieldNameOrError;
+		} else {
+					$this->getField($fieldNameOrError)->addError($error);
+		}
 	}
 
 // ============================================================================
@@ -451,8 +455,9 @@ 
 		// the root path bit can be the the name or the id of the form
 		// all children of the root will use the name property
 		$bits = explode('.', $path);
-		if (!($bits[0] === $this->name || ($this->isRootForm() && $bits[0] === $this->id)))
-			throw new \Exception("The first part of the path should be the form name or the id if this is a root form. Form name={$this->name}, id={$this->id}, path=$path.");
+		if (!($bits[0] === $this->name || ($this->isRootForm() && $bits[0] === $this->id))) {
+					throw new \Exception("The first part of the path should be the form name or the id if this is a root form. Form name={$this->name}, id={$this->id}, path=$path.");
+		}
 		// remove first item and reindex array : note unset does not update array indexes
 		array_splice($bits, 0, 1);
 		$field = $this->getField($bits[0]);
@@ -486,8 +491,9 @@ 
 	public function getFields($names=null)
 	{
 		$this->orderFields();
-		if ($names === null)
-			return $this->_fields;
+		if ($names === null) {
+					return $this->_fields;
+		}
 
 		return Arr::only($this->_fields, $names);
 	}
@@ -811,8 +817,9 @@ 
 		$data = [];
 		foreach ($this->getFields() as $field) {
 			if (!$field->deleted) {
-				if ($field->getIsInput())
-					$data[$field->getDataKey()] = $field->getData();
+				if ($field->getIsInput()) {
+									$data[$field->getDataKey()] = $field->getData();
+				}
 			}
 		}
 		return $data;
@@ -827,8 +834,9 @@ 
 	{
 		$data = [];
 		foreach ($this->getFields() as $field) {
-			if ($field->getIsInput())
-				$data[$field->getName()] = $field->getValueDisplay();
+			if ($field->getIsInput()) {
+							$data[$field->getName()] = $field->getValueDisplay();
+			}
 		}
 		return $data;
 	}
@@ -841,8 +849,9 @@ 
 	 */
 	public function getDataKey()
 	{
-		if ($this->_dataKey !== null)
-			return $this->_dataKey;
+		if ($this->_dataKey !== null) {
+					return $this->_dataKey;
+		}
 		return $this->getName();
 	}
 
@@ -873,8 +882,9 @@ 
 	 */
 	public function getId($autoGenerate=false)
 	{
-		if ($this->_id)
-			return $this->_id;
+		if ($this->_id) {
+					return $this->_id;
+		}
 		return $this->getName();
 	}
 
@@ -908,8 +918,9 @@ 
 		$value = [];
 		foreach ($this->getFields() as $field) {
 			if (!$field->deleted) {
-				if ($field->getIsInput())
-					$value[$field->getDataKey()] = $field->getValue();
+				if ($field->getIsInput()) {
+									$value[$field->getDataKey()] = $field->getValue();
+				}
 			}
 		}
 		return $value;
@@ -1136,8 +1147,9 @@ 
 		$fields = [];
 		foreach ($this->getFields() as $key => $field) {
 			$fieldDefinition = $field->exportDefinition();
-			if (!is_null($fieldDefinition))
-				$fields[$key] = $fieldDefinition;
+			if (!is_null($fieldDefinition)) {
+							$fields[$key] = $fieldDefinition;
+			}
 		}
 		$formDefinition['definition']['fields'] = $fields;
 		return $formDefinition;
@@ -1248,8 +1260,9 @@ 
 	 */
 	public function getRequest()
 	{
-		if ($this->_request === null)
-			$this->_request = neon()->request;
+		if ($this->_request === null) {
+					$this->_request = neon()->request;
+		}
 		return $this->_request;
 	}
 
@@ -1268,8 +1281,9 @@ 
 	 */
 	public function reset()
 	{
-		foreach($this->getFields() as $field)
-			$field->reset();
+		foreach($this->getFields() as $field) {
+					$field->reset();
+		}
 	}
 
 	/**
@@ -1289,7 +1303,9 @@ 
 		$fake = [];
 		foreach($this->getFields() as $key => $field) {
 			$val = $field->fake();
-			if (empty($val)) continue;
+			if (empty($val)) {
+				continue;
+			}
 			$fake[$key] = $val;
 		}
 		return $fake;

neon/core/form/FormField.php

Braces +12 added lines, -8 removed lines

@@ -279,8 +279,9 @@ 
 	 */
 	public function setValidators($validators, $overwrite=true)
 	{
-		if ($overwrite)
-			$this->_validators = [];
+		if ($overwrite) {
+					$this->_validators = [];
+		}
 		if (is_array($validators)) {
 			foreach ($validators as $key => $validator) {
 				if (is_numeric($key)) {
@@ -407,10 +408,12 @@ 
 	 */
 	protected function _getValidatorClass($class)
 	{
-		if (is_array($class) && isset($class['class']))
-			$class = $class['class'];
-		if (is_object($class))
-			$class = get_class($class);
+		if (is_array($class) && isset($class['class'])) {
+					$class = $class['class'];
+		}
+		if (is_object($class)) {
+					$class = get_class($class);
+		}
 
 		if (isset(Validator::$builtInValidators[$class])) {
 			$class = Validator::$builtInValidators[$class]['class'];
@@ -460,8 +463,9 @@ 
 	public function getIdPath($delimiter='.')
 	{
 		// set the form id if not already set to something else
-		if ($this->isRootForm())
-			return $this->getId() ?: $this->getName();
+		if ($this->isRootForm()) {
+					return $this->getId() ?: $this->getName();
+		}
 		return $this->hasForm()
 			? $this->getForm()->getIdPath($delimiter) . $delimiter . $this->getName()
 			: $this->getName();

neon/core/form/FormRepeater.php

Braces +15 added lines, -10 removed lines

@@ -60,8 +60,9 @@ 
 	public function loadFromDb($data)
 	{
 		foreach ($data as $name => $value) {
-			if (!$this->hasField($name))
-				$this->addInstance($name);
+			if (!$this->hasField($name)) {
+							$this->addInstance($name);
+			}
 			$this->getField($name)->setValueFromDb($value);
 		}
 	}
@@ -102,8 +103,9 @@ 
 	{
 		// throw an exception - should probably cope with this scenario but set
 		// a validation to fail rather than throwing toys out of the pram
-		if (!is_array($value))
-			throw new \InvalidArgumentException('The value should be an array');
+		if (!is_array($value)) {
+					throw new \InvalidArgumentException('The value should be an array');
+		}
 
 		foreach($value as $position => $values) {
 			if (!$this->hasField($position)) {
@@ -134,8 +136,9 @@ 
 	public function registerScripts($view=null, $mount=true)
 	{
 		$view = ($view === null) ? $this->getView() : $view;
-		foreach ($this->getTemplate()->getFields() as $field)
-			$field->registerScripts($view, $mount);
+		foreach ($this->getTemplate()->getFields() as $field) {
+					$field->registerScripts($view, $mount);
+		}
 	}
 
 	/**
@@ -240,16 +243,18 @@ 
 	{
 		// the root path bit can be the the name or the id.
 		$bits = explode('.', $path);
-		if (!($bits[0] === $this->name))
-			throw new \Exception("The first part of the path should be the current repeater name. Repeater form name=$this->name, id=$this->id, path=$path.");
+		if (!($bits[0] === $this->name)) {
+					throw new \Exception("The first part of the path should be the current repeater name. Repeater form name=$this->name, id=$this->id, path=$path.");
+		}
 
 		// if the repeater has an existing instance - then lets return that
 		if ($this->hasField($bits[1])) {
 			$field = $this->getField($bits[1]);
 			// fields within repeaters should always be forms - so this should never happen
 			// but just to ensure we trap the error - lets throw an exception
-			if (!$field->isForm())
-				throw new \InvalidArgumentException('FormRepeaters should only contain form instances.');
+			if (!$field->isForm()) {
+							throw new \InvalidArgumentException('FormRepeaters should only contain form instances.');
+			}
 			array_splice($bits, 0, 1);
 			return $field->getFieldByPath(implode('.', $bits));
 		}