newicon / neon

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

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function processAsFilter(IQuery $query, $searchData=null)
+	public function processAsFilter(IQuery $query, $searchData = null)
 	{
 		// do a query
 		$ids = neon()->db->query()->from('firefly_file_manager')->select('uuid')->where(['like', 'name', $searchData])->column();

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());
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function processAsFilter(IQuery $query, $searchData=null)
+	public function processAsFilter(IQuery $query, $searchData = null)
 	{
 		$searchData = ($searchData === null) ? $this->getValue() : $searchData;
 		if ($searchData !== '') {

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

Spacing +23 added lines, -23 removed lines

@@ -84,7 +84,7 @@ 
 	 * @param boolean $overwrite (optional) - whether to overwrite an existing field of the same name defaults to false
 	 * @return fields\Field|Form|FormRepeater
 	 */
-	abstract public function add($field, $defaults=[], $overwrite=false);
+	abstract public function add($field, $defaults = [], $overwrite = false);
 
 	/**
 	 * Adds a sub form box to the form
@@ -93,7 +93,7 @@ 
 	 * @param array $options
 	 * @return IField|Form
 	 */
-	public function addSubForm($name, $options=[])
+	public function addSubForm($name, $options = [])
 	{
 		if (is_object($name)) {
 			return $this->add($name);
@@ -109,7 +109,7 @@ 
 	 * @param array $options
 	 * @return IField|fields\Text
 	 */
-	public function addFieldText($name, $options=[])
+	public function addFieldText($name, $options = [])
 	{
 		return $this->add($options, ['name' => $name, 'class' => 'text']);
 	}
@@ -121,7 +121,7 @@ 
 	 * @param array $options
 	 * @return IField|fields\Password
 	 */
-	public function addFieldPassword($name, $options=[])
+	public function addFieldPassword($name, $options = [])
 	{
 		return $this->add($options, ['name' => $name, 'class' => 'password']);
 	}
@@ -132,7 +132,7 @@ 
 	 * @param string $name
 	 * @return IField|fields\Text
 	 */
-	public function addFieldFile($name, $options=[])
+	public function addFieldFile($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'file', 'name' => $name]);
 	}
@@ -145,7 +145,7 @@ 
 	 * @param string $name
 	 * @return IField|fields\Text
 	 */
-	public function addFieldImage($name, $options=[])
+	public function addFieldImage($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'image', 'name' => $name]);
 	}
@@ -156,7 +156,7 @@ 
 	 * @param string $name
 	 * @return IField|fields\Email
 	 */
-	public function addFieldEmail($name, $options=[])
+	public function addFieldEmail($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'email', 'name' => $name]);
 	}
@@ -168,7 +168,7 @@ 
 	 * @param array $options
 	 * @return IField|fields\Submit
 	 */
-	public function addFieldSubmit($name, $options=[])
+	public function addFieldSubmit($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'submit', 'name' => $name]);
 	}
@@ -180,7 +180,7 @@ 
 	 * @param array $options
 	 * @return IField|fields\Text
 	 */
-	public function addFieldHidden($name, $options=[])
+	public function addFieldHidden($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'hidden', 'name' => $name]);
 	}
@@ -192,7 +192,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Checkbox
 	 */
-	public function addFieldCheckbox($name, $options=[])
+	public function addFieldCheckbox($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'checkbox', 'name' => $name]);
 	}
@@ -204,7 +204,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Checkbox
 	 */
-	public function addFieldCheckList($name, $options=[])
+	public function addFieldCheckList($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'checklist', 'name' => $name]);
 	}
@@ -216,7 +216,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Date
 	 */
-	public function addFieldDate($name, $options=[])
+	public function addFieldDate($name, $options = [])
 	{
 		return $this->add($options, ['name' => $name, 'class' => 'date']);
 	}
@@ -228,7 +228,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\DateTime
 	 */
-	public function addFieldDateTime($name, $options=[])
+	public function addFieldDateTime($name, $options = [])
 	{
 		return $this->add($options, ['name' => $name, 'class' => 'datetime']);
 	}
@@ -240,7 +240,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Integer
 	 */
-	public function addFieldInteger($name, $options=[])
+	public function addFieldInteger($name, $options = [])
 	{
 		return $this->add($options, ['name' => $name, 'class' => 'integer']);
 	}
@@ -252,7 +252,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Select
 	 */
-	public function addFieldSelect($name, $options=[])
+	public function addFieldSelect($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'select', 'name' => $name]);
 	}
@@ -264,7 +264,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Section
 	 */
-	public function addFieldSection($name, $options=[])
+	public function addFieldSection($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'section', 'name' => $name]);
 	}
@@ -276,7 +276,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\SwitchButton
 	 */
-	public function addFieldSwitch($name, $options=[])
+	public function addFieldSwitch($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'switch', 'name' => $name]);
 	}
@@ -288,7 +288,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Textarea
 	 */
-	public function addFieldTextArea($name, $options=[])
+	public function addFieldTextArea($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'textarea', 'name' => $name]);
 	}
@@ -300,7 +300,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Time
 	 */
-	public function addFieldTime($name, $options=[])
+	public function addFieldTime($name, $options = [])
 	{
 		return $this->add($options, ['name' => $name, 'class' => 'time']);
 	}
@@ -312,7 +312,7 @@ 
 	 * @param array  $options
 	 * @return IField|fields\Wysiwyg
 	 */
-	public function addFieldWysiwyg($name, $options=[])
+	public function addFieldWysiwyg($name, $options = [])
 	{
 		return $this->add($options, ['class' => 'wysiwyg', 'name' => $name]);
 	}
@@ -350,14 +350,14 @@ 
 	 * @throws UnknownFieldClass if the class is not found
 	 * @return IField
 	 */
-	public function makeField($field, $defaults=[])
+	public function makeField($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
-			throw new \InvalidArgumentException('The $field parameter was not a valid \neon\core\form\fields\Field or \neon\core\form\Form object "' . print_r($field, true) . '" given');
+			throw new \InvalidArgumentException('The $field parameter was not a valid \neon\core\form\fields\Field or \neon\core\form\Form object "'.print_r($field, true).'" given');
 		}
 		return $field;
 	}
@@ -381,7 +381,7 @@ 
 	 * @throws UnknownFieldClass
 	 * @return IField
 	 */
-	public function createFieldObjectFromConfig($config, $defaults=[])
+	public function createFieldObjectFromConfig($config, $defaults = [])
 	{
 		$config = Arr::merge($defaults, $config);
 		// allows class config property to be specified by an alias "switch"

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

Spacing +8 added lines, -8 removed lines

@@ -36,7 +36,7 @@ 
 	 * @return \neon\core\form\Form
 	 * @deprecated should be using phoebe this should be replaced with using the loadFromDefinition via phoebe
 	 */
-	public static function ddsLoadFrom($form, $classType, $includeDeleted=false)
+	public static function ddsLoadFrom($form, $classType, $includeDeleted = false)
 	{
 		\Neon::warning('neon\core\form\Form::ddsLoadFrom is a deprecated function - phoebe is responsible for loading form definitions');
 		$class = neon()->getDds()->getIDdsClassManagement()->getClass($classType);
@@ -58,11 +58,11 @@ 
 		$formDefinition = Arr::merge($formDefinition, $immutable);
 		// remove the class option
 		Arr::remove($formDefinition, 'class');
-		foreach($formDefinition as $key => $value) {
+		foreach ($formDefinition as $key => $value) {
 			$form->$key = $value;
 		}
 		// Add fields to the form from the individual members
-		if (! empty($members) ) {
+		if (!empty($members)) {
 			foreach ($members as $member) {
 				$form->ddsAddField($member);
 			}
@@ -78,7 +78,7 @@ 
 	 * @return void
 	 * @deprecated
 	 */
-	public static function ddsSaveDefinition($form, $classType=null, $ddsMembers=null)
+	public static function ddsSaveDefinition($form, $classType = null, $ddsMembers = null)
 	{
 		\Neon::warning('neon\core\form\Form::ddsSaveDefinition is a deprecated function - phoebe is now responsible for saving form definitions');
 		// \neon\phoebe\builders\database\builder\Dds::saveDefinition($form);
@@ -97,7 +97,7 @@ 
 			]);
 		}
 		$members = $ddsClassManager->listMembers($classType, true);
-		foreach($form->getFields() as $key => $field) {
+		foreach ($form->getFields() as $key => $field) {
 			// set the order value to be the same as how we received them
 			$field->ddsSaveDefinition($classType, $members, $key);
 		}
@@ -143,7 +143,7 @@ 
 		]);
 		// the definition might supply more information
 		$widgetDefinition = [];
-		if (!empty($member['definition'])){
+		if (!empty($member['definition'])) {
 			// if the definition is already array then assume it is decoded - if it is not then assume it is a json string
 			$widgetDefinition = is_array($member['definition'])
 				? $member['definition']
@@ -151,7 +151,7 @@ 
 		}
 		// remove the value from the widget definition as this should be populated by the actual data
 		Arr::remove($widgetDefinition, 'value');
-		$config = Arr::merge($defaults, $widgetDefinition , $immutable);
+		$config = Arr::merge($defaults, $widgetDefinition, $immutable);
 
 		$form->add($config);
 	}
@@ -166,7 +166,7 @@ 
 	 * @param array|null $ddsMembers if not specified it will look up the members of the classType
 	 * @deprecated
 	 */
-	public static function ddsSaveDefinitionField($field, $classType=null, $ddsMembers=null)
+	public static function ddsSaveDefinitionField($field, $classType = null, $ddsMembers = null)
 	{
 		\Neon::warning('neon\core\form\field::ddsSaveDefinition is a deprecated function - you should be using phoebe');
 		$iDdsClassManagement = neon()->getDds()->getIDdsClassManagement();

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/interfaces/IField.php

Spacing +2 added lines, -2 removed lines

@@ -233,7 +233,7 @@ 
 	 * @param mixed $searchData - The request data if null should populate from the form fields internal $this->getValue()
 	 * @return void
 	 */
-	public function processAsFilter(IQuery $query, $searchData=null);
+	public function processAsFilter(IQuery $query, $searchData = null);
 
 // endregion
 
@@ -243,7 +243,7 @@ 
 	 * @param string $delimiter - the string delimiter to separate concatenated field names by
 	 * @return mixed
 	 */
-	public function getIdPath($delimiter='.');
+	public function getIdPath($delimiter = '.');
 
 	/**
 	 * Generate fake data for the field

neon/core/form/interfaces/IValidate.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	 * @param bool $required
 	 * @return $this method can be chained
 	 */
-	public function setRequired($required=true);
+	public function setRequired($required = true);
 
 	/**
 	 * Add a validator to a form field
@@ -52,7 +52,7 @@ 
 	 *
 	 * @return $this Is a chainable function
 	 */
-	public function addValidator($validator, $options=[]);
+	public function addValidator($validator, $options = []);
 
 	/**
 	 * @param array $validators

neon/core/form/Form.php

Indentation +1 added lines, -1 removed lines

@@ -661,7 +661,7 @@
 	/**
 	 * render the form header html
 	 * @return string
-    */
+	 */
 	public function renderHeader()
 	{
 		// TODO: 27/06/2018 - toArray does a fair bit of work if form has multiple fields set, we want to serialize all properties EXCEPT for fields

Spacing +31 added lines, -31 removed lines

@@ -95,13 +95,13 @@ 
 	 * @param bool $replace - will replace any existing attributes
 	 * @return $this - chainable interface
 	 */
-	public function setAttributes($attrs, $replace=false)
+	public function setAttributes($attrs, $replace = false)
 	{
 		if ($replace) {
 			$this->_attributes = $attrs;
 		} else {
 			if (isset($attrs['class'])) {
-				$this->_attributes['class'] = ' ' . $attrs['class'];
+				$this->_attributes['class'] = ' '.$attrs['class'];
 				unset($attrs['class']);
 			}
 			$this->_attributes = array_merge($this->_attributes, $attrs);
@@ -145,7 +145,7 @@ 
 	 * if a string is provided then it is used as the name property
 	 * @param array $config additional configuration
 	 */
-	public function __construct($name=[], array $config=[])
+	public function __construct($name = [], array $config = [])
 	{
 		// The $name field can also be a configuration array
 		if (is_array($name)) {
@@ -196,7 +196,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function registerScripts($view=null, $mount=true)
+	public function registerScripts($view = null, $mount = true)
 	{
 		$view = ($view === null) ? $this->getView() : $view;
 		FormAsset::register($view);
@@ -204,7 +204,7 @@ 
 			$field->registerScripts($view);
 		if ($this->isRootForm()) {
 			if ($mount)
-				$view->registerJs('(new Vue()).$mount("#' . $this->id . '");', $view::POS_END, $this->id . 'vue');
+				$view->registerJs('(new Vue()).$mount("#'.$this->id.'");', $view::POS_END, $this->id.'vue');
 		}
 	}
 
@@ -254,7 +254,7 @@ 
 	public function validate($names = null, $clearErrors = true)
 	{
 		$valid = true;
-		foreach($this->getFields($names) as $key => $field) {
+		foreach ($this->getFields($names) as $key => $field) {
 			$valid = $field->validate() && $valid;
 		}
 		return $valid;
@@ -300,7 +300,7 @@ 
 	 * @param array $errors
 	 * @return array
 	 */
-	protected function _getFormErrors($form, &$errors=[])
+	protected function _getFormErrors($form, &$errors = [])
 	{
 		foreach ($form->getFields() as $field) {
 			if ($field->isForm()) {
@@ -325,7 +325,7 @@ 
 	public function getErrors()
 	{
 		$errors = [];
-		foreach($this->getFields() as $name => $field) {
+		foreach ($this->getFields() as $name => $field) {
 			if ($field->hasError())
 				$errors[$name] = $field->getErrors();
 		}
@@ -354,7 +354,7 @@ 
 	 * @param string $error  if this is not null then it is the error
 	 * @return void
 	 */
-	public function addError($fieldNameOrError='', $error=null)
+	public function addError($fieldNameOrError = '', $error = null)
 	{
 		if ($error === null)
 			$this->_errors[] = $fieldNameOrError;
@@ -394,7 +394,7 @@ 
 	 */
 	public function getViewPath()
 	{
-		return __DIR__ . DIRECTORY_SEPARATOR . 'views';
+		return __DIR__.DIRECTORY_SEPARATOR.'views';
 	}
 
 	/**
@@ -410,9 +410,9 @@ 
 		$i = 1;
 		while ($this->hasField($name)) {
 			if (preg_match('/.*(_[0-9]+)/', $name, $matches)) {
-				$name = str_replace($matches[1], '_' . $i++, $name);
+				$name = str_replace($matches[1], '_'.$i++, $name);
 			} else {
-				$name .= '_' . $i++;
+				$name .= '_'.$i++;
 			}
 		}
 		return $name;
@@ -483,7 +483,7 @@ 
 	 * @throws InvalidCallException if a name key specified in the $names array does not exist as a field
 	 * @return \neon\core\form\fields\Field[] [name => field object]
 	 */
-	public function getFields($names=null)
+	public function getFields($names = null)
 	{
 		$this->orderFields();
 		if ($names === null)
@@ -516,7 +516,7 @@ 
 	 */
 	public function getSubForm($name)
 	{
-		if (! $this->hasField($name)) {
+		if (!$this->hasField($name)) {
 			throw new \Exception("No sub form exists with the name '$name'");
 		}
 		return $this->getField($name);
@@ -619,7 +619,7 @@ 
 	 * @throws exceptions\UnknownFieldClass - if the field class can not be created
 	 * @return fields\Field
 	 */
-	public function add($field, $defaults=[], $overwrite=false)
+	public function add($field, $defaults = [], $overwrite = false)
 	{
 		$object = $this->makeField($field, $defaults);
 		return $this->_addField($object, $overwrite);
@@ -632,12 +632,12 @@ 
 	 *
 	 * @return \neon\core\form\fields\Field
 	 */
-	protected function _addField(IField $object, $overwrite=false)
+	protected function _addField(IField $object, $overwrite = false)
 	{
 		// pass the field a reference to its parent form
 		$object->setForm($this);
 		if ($object->getName() == '') {
-			throw new \InvalidArgumentException('A field object must have a name set before adding it to the form. You tried to add ' . print_r($object->toArray(), true));
+			throw new \InvalidArgumentException('A field object must have a name set before adding it to the form. You tried to add '.print_r($object->toArray(), true));
 		}
 		if ($object instanceof Field || $object instanceof Form) {
 			// the field object seems to be valid so before we add it we just check this is not a conflict with an existing field
@@ -648,7 +648,7 @@ 
 			// add this form as the parent form reference
 			$this->_fields[$object->getName()] = $object;
 		} else {
-			throw new \InvalidArgumentException('The $object parameter was not a valid \neon\core\form\Field or \neon\core\form\Form object "' . print_r($object, true) . '" given');
+			throw new \InvalidArgumentException('The $object parameter was not a valid \neon\core\form\Field or \neon\core\form\Form object "'.print_r($object, true).'" given');
 		}
 		return $object;
 	}
@@ -676,7 +676,7 @@ 
 	 */
 	public function renderCsrfField()
 	{
-		return '<input type="hidden" name="'.$this->getRequest()->csrfParam.'" value="' . $this->getRequest()->getCsrfToken() . '" />';
+		return '<input type="hidden" name="'.$this->getRequest()->csrfParam.'" value="'.$this->getRequest()->getCsrfToken().'" />';
 	}
 
 	/**
@@ -748,7 +748,7 @@ 
 	 * @throws \yii\base\InvalidConfigException getBodyParams may throw this error if a registered parser does not implement the [[RequestParserInterface]].
 	 * @return array  the request data
 	 */
-	public function getRawRequestData($key=null)
+	public function getRawRequestData($key = null)
 	{
 		$params = $this->getRequest()->getBodyParams();
 		$data = isset($params[$this->getName()]) ? $params[$this->getName()] : [];
@@ -779,7 +779,7 @@ 
 	 * @throws \Exception - if request object is configured incorrectly
 	 * @return $this
 	 */
-	public function load($data=[])
+	public function load($data = [])
 	{
 		if (empty($data) && $this->hasRequestData()) {
 			$data = $this->getRawRequestData();
@@ -871,7 +871,7 @@ 
 	 * Root forms always require an id
 	 * @return String
 	 */
-	public function getId($autoGenerate=false)
+	public function getId($autoGenerate = false)
 	{
 		if ($this->_id)
 			return $this->_id;
@@ -992,7 +992,7 @@ 
 	 * @inheritdoc - IField implementation,
 	 * Possibly applicable to the form - perhaps if set the form will complain unless all its children are set??
 	 */
-	public function setRequired($required=true)
+	public function setRequired($required = true)
 	{}
 // endregion
 
@@ -1065,7 +1065,7 @@ 
 	public function getProperties()
 	{
 		$props = [
-			'class', 'id', 'name', 'enableAjaxValidation','enableAjaxSubmission',
+			'class', 'id', 'name', 'enableAjaxValidation', 'enableAjaxSubmission',
 			'label', 'hint', 'inline', 'visible', 'order', 'action', 'readOnly', 'printOnly', 'validationUrl',
 			'attributes', 'fields', 'objectToken'
 		];
@@ -1201,10 +1201,10 @@ 
 	 *
 	 * @return Form
 	 */
-	public function getFilterForm($config=[])
+	public function getFilterForm($config = [])
 	{
 		$searchForm = new Form($config);
-		foreach($this->getFields() as $field) {
+		foreach ($this->getFields() as $field) {
 			$filterField = $field->getFilterField();
 
 			if ($filterField !== false) {
@@ -1228,7 +1228,7 @@ 
 	public function processAsFilter(IQuery $query, $searchData = null)
 	{
 		$searchData = ($searchData === null) ? $this->getValue() : $searchData;
-		foreach($this->getFields() as $key => $field) {
+		foreach ($this->getFields() as $key => $field) {
 			if (isset($searchData[$key])) {
 				$field->processAsFilter($query, $searchData[$key]);
 			}
@@ -1268,7 +1268,7 @@ 
 	 */
 	public function reset()
 	{
-		foreach($this->getFields() as $field)
+		foreach ($this->getFields() as $field)
 			$field->reset();
 	}
 
@@ -1287,7 +1287,7 @@ 
 	public function fake()
 	{
 		$fake = [];
-		foreach($this->getFields() as $key => $field) {
+		foreach ($this->getFields() as $key => $field) {
 			$val = $field->fake();
 			if (empty($val)) continue;
 			$fake[$key] = $val;
@@ -1299,7 +1299,7 @@ 
 	 * @deprecated should be using phoebe this should be replaced with using the loadFromDefinition via phoebe
 	 * @see Deprecated::ddsLoadFrom
 	 */
-	public function ddsLoadFrom($classType, $includeDeleted=false)
+	public function ddsLoadFrom($classType, $includeDeleted = false)
 	{
 		return Deprecated::ddsLoadFrom($this, $classType, $includeDeleted);
 	}
@@ -1308,7 +1308,7 @@ 
 	 * @deprecated - should be using phoebe
 	 * @see Deprecated::ddsSaveDefinition
 	 */
-	public function ddsSaveDefinition($classType=null, $ddsMembers=null)
+	public function ddsSaveDefinition($classType = null, $ddsMembers = null)
 	{
 		Deprecated::ddsSaveDefinition($this, $classType, $ddsMembers);
 	}

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/assets/CkeditorAsset.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
 	public function init()
 	{
-		$this->sourcePath = __DIR__ . '/vendor/ckeditor';
+		$this->sourcePath = __DIR__.'/vendor/ckeditor';
 		parent::init();
 	}
 }