newicon / neon

neon/core/form/FormField.php

Spacing +10 added lines, -10 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setter = 'set' . $name;
+		$setter = 'set'.$name;
 		if (method_exists($this, $setter)) {
 			$this->$setter($value);
 		}
@@ -165,7 +165,7 @@ 
 	public function getInputName()
 	{
 		if ($this->hasForm()) {
-			return $this->getForm()->getInputName() . '[' . $this->getName() . ']';
+			return $this->getForm()->getInputName().'['.$this->getName().']';
 		}
 		return $this->getName();
 	}
@@ -209,7 +209,7 @@ 
 		return Arr::get($this->_errors, 0, '');
 	}
 
-	public function setErrors($errors=[])
+	public function setErrors($errors = [])
 	{
 		$this->_errors = $errors;
 	}
@@ -277,7 +277,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function setValidators($validators, $overwrite=true)
+	public function setValidators($validators, $overwrite = true)
 	{
 		if ($overwrite)
 			$this->_validators = [];
@@ -334,7 +334,7 @@ 
 		else if (is_string($validator)) {
 			$ret = ['class' => $validator];
 		} else {
-			throw new \Exception("Invalid validator information. Probably missing neon class. ".print_r($validator,true));
+			throw new \Exception("Invalid validator information. Probably missing neon class. ".print_r($validator, true));
 		}
 
 		// finally normalise the validator class
@@ -359,7 +359,7 @@ 
 	 * @param string $key - a key to identify this validator - an md5 hash of the validator and its options
 	 * @return \yii\validators\Validator
 	 */
-	public function createValidator($validator, $options=[], &$key='')
+	public function createValidator($validator, $options = [], &$key = '')
 	{
 		if (is_object($validator)) {
 			$validatorObject = $validator;
@@ -379,7 +379,7 @@ 
 	public function removeValidator($validator)
 	{
 		$class = $this->_getValidatorClass($validator);
-		foreach($this->_validators as $key => $validatorObject) {
+		foreach ($this->_validators as $key => $validatorObject) {
 			if ($validatorObject instanceof $class) {
 				unset($this->_validators[$key]);
 			}
@@ -427,7 +427,7 @@ 
 		// for example 'required' gives ['class'=>'\yii\validators\Required']
 		// otherwise assume a validator class string has been passed in
 		$class = $this->_getValidatorClass($class);
-		$value = collect($this->getValidators())->first(function ($validatorObject) use ($class) {
+		$value = collect($this->getValidators())->first(function($validatorObject) use ($class) {
 			return $validatorObject instanceof $class;
 		}, false);
 
@@ -457,13 +457,13 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getIdPath($delimiter='.')
+	public function getIdPath($delimiter = '.')
 	{
 		// set the form id if not already set to something else
 		if ($this->isRootForm())
 			return $this->getId() ?: $this->getName();
 		return $this->hasForm()
-			? $this->getForm()->getIdPath($delimiter) . $delimiter . $this->getName()
+			? $this->getForm()->getIdPath($delimiter).$delimiter.$this->getName()
 			: $this->getName();
 	}
 

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

Spacing +5 added lines, -5 removed lines

@@ -105,7 +105,7 @@ 
 		if (!is_array($value))
 			throw new \InvalidArgumentException('The value should be an array');
 
-		foreach($value as $position => $values) {
+		foreach ($value as $position => $values) {
 			if (!$this->hasField($position)) {
 				$this->addInstance($position);
 			}
@@ -120,7 +120,7 @@ 
 	{
 		$subFormCount = count(parent::getSubForms());
 		if ($subFormCount < $this->count) {
-			for ($i = $subFormCount; $i <= $this->count-1; $i++) {
+			for ($i = $subFormCount; $i <= $this->count - 1; $i++) {
 				$this->addInstance($i);
 			}
 		}
@@ -131,7 +131,7 @@ 
 	 * The fields in the template must register their scripts
 	 * @param null $view
 	 */
-	public function registerScripts($view=null, $mount=true)
+	public function registerScripts($view = null, $mount = true)
 	{
 		$view = ($view === null) ? $this->getView() : $view;
 		foreach ($this->getTemplate()->getFields() as $field)
@@ -209,11 +209,11 @@ 
 	 * Get fields - also add additional instances as appropriate
 	 * @inheritdoc
 	 */
-	public function getFields($names=null)
+	public function getFields($names = null)
 	{
 		$subFormCount = count(parent::getSubForms());
 		if ($subFormCount < $this->count) {
-			for ($i = $subFormCount; $i <= $this->count-1; $i++) {
+			for ($i = $subFormCount; $i <= $this->count - 1; $i++) {
 				$this->addInstance(Hash::uuid64());
 			}
 		}

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

neon/core/view/MarkdownNeon.php

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 		$block = ['neonPlugin'];
 
 		$block['plugin']  = $this->_getPluginNameFromLines($lines, $current);
-		$block['attributes']  = $this->_getPluginAttributesFromLines($lines, $current);
+		$block['attributes'] = $this->_getPluginAttributesFromLines($lines, $current);
 		$block['content'] = $this->_getPluginContentFromLines($lines, $current, $endLine);
 
 		return [$block, $endLine];
@@ -81,11 +81,11 @@ 
 	protected function renderNeonPlugin($block)
 	{
 		$plugin = $block['plugin'];
-		$content = implode("\n",$block['content']);
+		$content = implode("\n", $block['content']);
 		$attributes = $block['attributes'];
 		if (class_exists($plugin))
 			return $plugin::widget(array_merge($attributes, ['content' => $content]));
-		return '<div class="alert alert-danger">unknown plugin: &quot;' .  $plugin . '&quot;</div>';
+		return '<div class="alert alert-danger">unknown plugin: &quot;'.$plugin.'&quot;</div>';
 	}
 
 	protected function _getPluginAttributesFromLines($lines, $current)
@@ -105,7 +105,7 @@ 
 		}
 		// remove tag and open delimiter from first and last lines
 		$plugin = $this->_getPluginNameFromLines($lines, $current);
-		$lastLine = \count($content)-1;
+		$lastLine = \count($content) - 1;
 		$content[0] = Str::replaceFirst($openDelimiter, '', $content[0]);
 		$content[0] = Str::replaceFirst($plugin, '', $content[0]);
 		$content[$lastLine] = Str::replaceLast($closeDelimiter, '', $content[$lastLine]);
@@ -114,7 +114,7 @@ 
 		// xml part
 		$xml = simplexml_load_string("<attr $attrs></attr>");
 		$attributes = [];
-		foreach($xml[0]->attributes() as $a => $b) {
+		foreach ($xml[0]->attributes() as $a => $b) {
 			$attributes[$a] = (string) $b;
 		}
 		return $attributes;

Braces +6 added lines, -4 removed lines

@@ -83,8 +83,9 @@ 
 		$plugin = $block['plugin'];
 		$content = implode("\n",$block['content']);
 		$attributes = $block['attributes'];
-		if (class_exists($plugin))
-			return $plugin::widget(array_merge($attributes, ['content' => $content]));
+		if (class_exists($plugin)) {
+					return $plugin::widget(array_merge($attributes, ['content' => $content]));
+		}
 		return '<div class="alert alert-danger">unknown plugin: &quot;' .  $plugin . '&quot;</div>';
 	}
 
@@ -151,8 +152,9 @@ 
 		for ($i = $current + 1, $count = count($lines); $i < $count; $i++) {
 			$line = $lines[$i];
 			// stop consuming lines if we find the closing tag
-			if (strpos($line, $closingTag) !== false)
-				break;
+			if (strpos($line, $closingTag) !== false) {
+							break;
+			}
 			$content[] = $line;
 		}
 		return $content;

neon/core/view/SmartyExtension.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
 			trigger_error("path: missing 'route' parameter");
 		}
 
-		array_unshift($params, $params['route']) ;
+		array_unshift($params, $params['route']);
 		unset($params['route']);
 
 		return Url::to($params);
@@ -119,7 +119,7 @@ 
 		if ($type === 'block') {
 			// Register widget tag during compile time
 			$this->viewRenderer->widgets['blocks'][$alias] = $class;
-			$this->smarty->registerPlugin('block', $alias, [$this->viewRenderer, '_widget_block__' . $alias]);
+			$this->smarty->registerPlugin('block', $alias, [$this->viewRenderer, '_widget_block__'.$alias]);
 
 			// Inject code to re-register widget tag during run-time
 			return <<<PHP
@@ -137,7 +137,7 @@ 
 		} elseif ($type === 'function') {
 			// Register widget tag during compile time
 			$this->viewRenderer->widgets['functions'][$alias] = $class;
-			$this->smarty->registerPlugin('function', $alias, [$this->viewRenderer, '_widget_function__' . $alias]);
+			$this->smarty->registerPlugin('function', $alias, [$this->viewRenderer, '_widget_function__'.$alias]);
 
 			// Inject code to re-register widget tag during run-time
 			return <<<PHP
@@ -283,7 +283,7 @@ 
 	 */
 	protected function getViewConstVal($string, $default)
 	{
-		$val = @constant('yii\web\View::' . $string);
+		$val = @constant('yii\web\View::'.$string);
 		return isset($val) ? $val : $default;
 	}
 }

neon/core/view/SmartySharedPlugins.php

Spacing +31 added lines, -31 removed lines

@@ -147,7 +147,7 @@ 
 			$params['content'] = $content;
 			if (class_exists($class)) {
 				$widget = new $class();
-				foreach($params as $key => $val) {
+				foreach ($params as $key => $val) {
 					if ($widget->hasProperty($key))
 						$widget->$key = $val;
 				}
@@ -177,7 +177,7 @@ 
 		$type = Arr::getRequired($params, 'type');
 		$options = Arr::get($params, 'options', []);
 		if (!is_array($options))
-			throw new \InvalidArgumentException('"options" property must be an array "' . gettype($options) . '" given');
+			throw new \InvalidArgumentException('"options" property must be an array "'.gettype($options).'" given');
 		$default = Arr::get($params, 'default', '');
 
 		$value = neon()->view->styleManager->add($name, $default, $type, $options);
@@ -214,7 +214,7 @@ 
 		if (!isset($params['route'])) {
 			trigger_error("path: missing 'route' parameter");
 		}
-		array_unshift($params, $params['route']) ;
+		array_unshift($params, $params['route']);
 		unset($params['route']);
 		return Url::toRoute($params, true);
 	}
@@ -232,7 +232,7 @@ 
 	 */
 	public function csrf_element($params)
 	{
-		return '<input type="hidden" name="'.neon()->request->csrfParam.'" value="' . neon()->request->getCsrfToken() . '" />';
+		return '<input type="hidden" name="'.neon()->request->csrfParam.'" value="'.neon()->request->getCsrfToken().'" />';
 	}
 
 	/**
@@ -328,39 +328,39 @@ 
 			$params['widths'] = self::IMG_SRCSET_DEFAULT_WIDTHS;
 		}
 
-		$id = Arr::pull($params,'firefly_id');
-		$widths = array_map('trim',explode(',',Arr::pull($params,'widths')));
+		$id = Arr::pull($params, 'firefly_id');
+		$widths = array_map('trim', explode(',', Arr::pull($params, 'widths')));
 		$srcsetParts = [];
 		$srcSizeParts = [];
 		$useResolutions = [];
 		$minBreak = false;
 		if (isset($params['min-break'])) {
-			$minBreak = Arr::pull($params,'min-break');
-			if (!Str::validateNumericWithUnits($minBreak,['px','vw'])) {
+			$minBreak = Arr::pull($params, 'min-break');
+			if (!Str::validateNumericWithUnits($minBreak, ['px', 'vw'])) {
 				throw new \InvalidArgumentException("The min-break value '".$minBreak."' should be numeric and end with 'px' or 'vw'");
 			}
 		}
 		if (isset($params['breaks'])) {
 			// optionally validate & collate the breaks for the 'sizes' attribute
-			$breaks = array_map('trim',explode(',',Arr::pull($params,'breaks')));
+			$breaks = array_map('trim', explode(',', Arr::pull($params, 'breaks')));
 			foreach ($breaks as $idx=>$break) {
-				if (!Str::validateNumericWithUnits($break, ['px','vw'])) {
+				if (!Str::validateNumericWithUnits($break, ['px', 'vw'])) {
 					throw new \InvalidArgumentException("The break value '".$break."' should be numeric and end with 'px' or 'vw'");
 				}
-				if ($idx==0 && $minBreak) {
+				if ($idx == 0 && $minBreak) {
 					$break = "(min-width: ".$minBreak.") ".$break;
 				}
-				$srcSizeParts[]=$break;
+				$srcSizeParts[] = $break;
 			}
 		}
 		elseif (isset($params['resolutions'])) {
 			// optionally validate & collate any specified resolutions to use (if breaks haven't been specified)
-			$useResolutions = array_map('trim',explode(',',Arr::pull($params,'resolutions')));
-			if (count($useResolutions) != count($widths)-1) {
-				throw new \InvalidArgumentException("Since there are ".count($widths)." widths you should specify ".(count($widths)-1)." resolutions to apply");
+			$useResolutions = array_map('trim', explode(',', Arr::pull($params, 'resolutions')));
+			if (count($useResolutions) != count($widths) - 1) {
+				throw new \InvalidArgumentException("Since there are ".count($widths)." widths you should specify ".(count($widths) - 1)." resolutions to apply");
 			}
 			foreach ($useResolutions as $useResolution) {
-				if (!Str::validateNumericWithUnits($useResolution,['x'])) {
+				if (!Str::validateNumericWithUnits($useResolution, ['x'])) {
 					throw new \InvalidArgumentException("The resolution '".$useResolution."' is not a valid resolution, it should be numeric and then end with an 'x'");
 				}
 			}
@@ -368,7 +368,7 @@ 
 		else {
 			// if neither 'breaks' or 'resolutions' was specified then use the widths
 			foreach ($widths as $idx=>$width) {
-				if ($idx==0 && $minBreak) {
+				if ($idx == 0 && $minBreak) {
 					$width = "(min-width: ".$minBreak.") ".$width;
 				}
 				$srcSizeParts[] = $width."px";
@@ -387,31 +387,31 @@ 
 			if (!is_numeric($width)) {
 				throw new \InvalidArgumentException("One of the widths specified was not numeric '".$width."'");
 			}
-			$useParams = ['id'=>$id, 'w'=>(int)$width];
+			$useParams = ['id'=>$id, 'w'=>(int) $width];
 			if ($useQuality) {
 				$useParams['q'] = $useQuality;
 			}
 			$imageUrl = $this->firefly_image($useParams);
 			if ($useResolutions) {
-				$srcsetParts[] = $imageUrl.( ($idx>=1) ? ' '.$useResolutions[$idx-1] : '' );
+				$srcsetParts[] = $imageUrl.(($idx >= 1) ? ' '.$useResolutions[$idx - 1] : '');
 			}
 			else {
-				$srcsetParts[] = $imageUrl . ' ' . $width . 'w';
+				$srcsetParts[] = $imageUrl.' '.$width.'w';
 			}
-			if ($idx==0 && !isset($params['src-width']) && !isset($params['src'])) {
+			if ($idx == 0 && !isset($params['src-width']) && !isset($params['src'])) {
 				$params['src'] = $imageUrl;
 			}
 		}
 
 		// collate the tag attributes
 		if (isset($params['src-width'])) {
-			$srcWidth = Arr::pull($params,'src-width');
+			$srcWidth = Arr::pull($params, 'src-width');
 			if (!is_numeric($srcWidth)) {
 				throw new \InvalidArgumentException("src-width '".$srcWidth."' must be numeric");
 			}
-			$useParams = ['id'=>$id, 'w'=>(int)$srcWidth];
+			$useParams = ['id'=>$id, 'w'=>(int) $srcWidth];
 			if (isset($params['quality'])) {
-				$useParams = (int)$params['quality'];
+				$useParams = (int) $params['quality'];
 			}
 			if (!isset($params['src'])) {
 				$params['src'] = $this->firefly_image($useParams);
@@ -425,12 +425,12 @@ 
 		}
 
 		// finally generate the tag ... note that these can overwrite the previously generated params
-		$tagAttributes =  [];
+		$tagAttributes = [];
 		foreach ($params as $key=>$value) {
 			$tagAttributes[] = $key."='".htmlspecialchars($value)."'";
 		}
 
-		return "<img ".implode(' ',$tagAttributes).">";
+		return "<img ".implode(' ', $tagAttributes).">";
 	}
 
 	/**
@@ -461,7 +461,7 @@ 
 			else
 				return $value;
 		} else {
-			return "Usage: you must provide an 'app' and a 'name' parameter. You provided ".print_r($params,true);
+			return "Usage: you must provide an 'app' and a 'name' parameter. You provided ".print_r($params, true);
 		}
 	}
 
@@ -483,7 +483,7 @@ 
 	{
 		$format = 'Y-m-d H:i:s';
 		if (isset($params['stamp']))
-			return date($format, (integer)$params['stamp']);
+			return date($format, (integer) $params['stamp']);
 		return date($format);
 	}
 
@@ -495,7 +495,7 @@ 
 	 */
 	public function json($params)
 	{
-		return '<pre>' . json_encode($params, JSON_PRETTY_PRINT) . '</pre>';
+		return '<pre>'.json_encode($params, JSON_PRETTY_PRINT).'</pre>';
 	}
 
 	/**
@@ -510,7 +510,7 @@ 
 	 * @return int
 	 * @throws \Exception
 	 */
-	public function getAssetPosition($params, $default='end')
+	public function getAssetPosition($params, $default = 'end')
 	{
 		$position = Arr::get($params, 'pos', Arr::get($params, 'position', $default));
 		$positions = [
@@ -521,7 +521,7 @@ 
 			'load'  => View::POS_LOAD,
 		];
 		if (!array_key_exists($position, $positions)) {
-			throw new \Exception('The javascript position specified must be one of ' . print_r(array_keys($positions)) . ', you specified "'.$position.'"');
+			throw new \Exception('The javascript position specified must be one of '.print_r(array_keys($positions)).', you specified "'.$position.'"');
 		}
 		return $positions[$position];
 	}

Braces +35 added lines, -25 removed lines

@@ -148,8 +148,9 @@ 
 			if (class_exists($class)) {
 				$widget = new $class();
 				foreach($params as $key => $val) {
-					if ($widget->hasProperty($key))
-						$widget->$key = $val;
+					if ($widget->hasProperty($key)) {
+											$widget->$key = $val;
+					}
 				}
 				return $widget->run();
 			} else {
@@ -176,8 +177,9 @@ 
 		$name = Arr::getRequired($params, 'name');
 		$type = Arr::getRequired($params, 'type');
 		$options = Arr::get($params, 'options', []);
-		if (!is_array($options))
-			throw new \InvalidArgumentException('"options" property must be an array "' . gettype($options) . '" given');
+		if (!is_array($options)) {
+					throw new \InvalidArgumentException('"options" property must be an array "' . gettype($options) . '" given');
+		}
 		$default = Arr::get($params, 'default', '');
 
 		$value = neon()->view->styleManager->add($name, $default, $type, $options);
@@ -259,8 +261,9 @@ 
 	 */
 	public function firefly_url($params)
 	{
-		if (isset($params['id']))
-			return neon()->firefly->getUrl($params['id']);
+		if (isset($params['id'])) {
+					return neon()->firefly->getUrl($params['id']);
+		}
 	}
 
 	/**
@@ -285,8 +288,9 @@ 
 	 */
 	public function firefly_image($params)
 	{
-		if (isset($params['id']))
-			return neon()->firefly->getImage(Arr::pull($params, 'id'), $params);
+		if (isset($params['id'])) {
+					return neon()->firefly->getImage(Arr::pull($params, 'id'), $params);
+		}
 	}
 
 	/**
@@ -352,8 +356,7 @@ 
 				}
 				$srcSizeParts[]=$break;
 			}
-		}
-		elseif (isset($params['resolutions'])) {
+		} elseif (isset($params['resolutions'])) {
 			// optionally validate & collate any specified resolutions to use (if breaks haven't been specified)
 			$useResolutions = array_map('trim',explode(',',Arr::pull($params,'resolutions')));
 			if (count($useResolutions) != count($widths)-1) {
@@ -364,8 +367,7 @@ 
 					throw new \InvalidArgumentException("The resolution '".$useResolution."' is not a valid resolution, it should be numeric and then end with an 'x'");
 				}
 			}
-		}
-		else {
+		} else {
 			// if neither 'breaks' or 'resolutions' was specified then use the widths
 			foreach ($widths as $idx=>$width) {
 				if ($idx==0 && $minBreak) {
@@ -394,8 +396,7 @@ 
 			$imageUrl = $this->firefly_image($useParams);
 			if ($useResolutions) {
 				$srcsetParts[] = $imageUrl.( ($idx>=1) ? ' '.$useResolutions[$idx-1] : '' );
-			}
-			else {
+			} else {
 				$srcsetParts[] = $imageUrl . ' ' . $width . 'w';
 			}
 			if ($idx==0 && !isset($params['src-width']) && !isset($params['src'])) {
@@ -456,10 +457,11 @@ 
 		$assign = isset($params['assign']) ? $params['assign'] : null;
 		if ($app && $name) {
 			$value = neon('settings')->manager->get($app, $name, $default);
-			if ($assign)
-				$smarty->assign($assign, $value);
-			else
-				return $value;
+			if ($assign) {
+							$smarty->assign($assign, $value);
+			} else {
+							return $value;
+			}
 		} else {
 			return "Usage: you must provide an 'app' and a 'name' parameter. You provided ".print_r($params,true);
 		}
@@ -482,8 +484,9 @@ 
 	public function time($params)
 	{
 		$format = 'Y-m-d H:i:s';
-		if (isset($params['stamp']))
-			return date($format, (integer)$params['stamp']);
+		if (isset($params['stamp'])) {
+					return date($format, (integer)$params['stamp']);
+		}
 		return date($format);
 	}
 
@@ -555,7 +558,9 @@ 
 	 */
 	public function js($params, $content)
 	{
-		if ($content == null) return;
+		if ($content == null) {
+			return;
+		}
 		$key = Arr::get($params, 'key', null);
 		$content = str_replace(['<script>', '</script>'], '', $content);
 		neon()->view->registerJs($content, $this->getAssetPosition($params), $key);
@@ -578,7 +583,9 @@ 
 	 */
 	public function css($params, $content)
 	{
-		if ($content == null) return;
+		if ($content == null) {
+			return;
+		}
 		$key = Arr::get($params, 'key', null);
 		$content = str_replace(['<style>', '</style>'], '', $content);
 		neon()->view->registerCss($content, ['position'=>$this->getAssetPosition($params, 'head')], $key);
@@ -605,7 +612,9 @@ 
 	{
 		// get the bundle - will look for `name` or `bundle` or `path` keys
 		$class = Arr::get($params, 'name', Arr::get($params, 'path', null));
-		if ($class == null) return;
+		if ($class == null) {
+			return;
+		}
 
 		// get the position - will looks for `pos` or `position` keys - defaults View::POS_END
 		$position = Arr::get($params, 'pos', Arr::get($params, 'position', 'end'));
@@ -703,8 +712,9 @@ 
 	 */
 	public function hasPermission($params, $smarty)
 	{
-		if (empty($params['permission']))
-			trigger_error("permission: missing 'permission' parameter");
+		if (empty($params['permission'])) {
+					trigger_error("permission: missing 'permission' parameter");
+		}
 		$permission = $params['permission'];
 		$assign = empty($params['assign']) ? $permission : $params['assign'];
 		$canDo = neon()->user->can($permission, $params);

neon/core/assets/JQueryUiAsset.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  */
 class JQueryUiAsset extends AssetBundle
 {
-	public $sourcePath = __DIR__ . '/publish/vendor/jqueryui';
+	public $sourcePath = __DIR__.'/publish/vendor/jqueryui';
 
 	public $js = [
 		'jquery-ui.min.js'

neon/core/assets/CoreAsset.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  */
 class CoreAsset extends AssetBundle
 {
-	public $sourcePath = __DIR__ . '/publish';
+	public $sourcePath = __DIR__.'/publish';
 
 	public $js = [
 		(YII_DEBUG ? 'vendor/vue.js' : 'vendor/vue.min.js'),

neon/core/ApplicationTrait.php

Indentation +6 added lines, -6 removed lines

@@ -553,9 +553,9 @@ 
 	}
 
   	/**
-	 * The install specific to the core apps (admin, user, settings, etc)
-	 * @return void
-	 */
+  	 * The install specific to the core apps (admin, user, settings, etc)
+  	 * @return void
+  	 */
 	public function installCore()
 	{
 		foreach ($this->getCoreApps() as $appName => $config) {
@@ -565,9 +565,9 @@ 
 	}
 
 	/**
-  	 * Run the install function of each app
-  	 * @return void
-  	 */
+	 * Run the install function of each app
+	 * @return void
+	 */
   	public function installApps()
   	{
 		foreach ($this->getApps() as $appName => $config) {

Spacing +10 added lines, -10 removed lines

@@ -205,7 +205,7 @@ 
 	 */
 	public function getApps()
 	{
-		if ($this->_appsRequiredOrder==false) {
+		if ($this->_appsRequiredOrder == false) {
 			$this->orderAppsByRequired($this->_apps, $ordered);
 			$this->setApps($ordered);
 			$this->_appsRequiredOrder = true;
@@ -240,7 +240,7 @@ 
 	 */
 	public function getCoreApps()
 	{
-		if ($this->_coreAppsRequiredOrder==false) {
+		if ($this->_coreAppsRequiredOrder == false) {
 			$this->orderAppsByRequired($this->_coreApps, $ordered);
 			$this->setCoreApps($ordered);
 			$this->_coreAppsRequiredOrder = true;
@@ -277,7 +277,7 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getConfig($path, $required=true)
+	public static function getConfig($path, $required = true)
 	{
 		$file = Neon::getAlias($path);
 		$fileExists = file_exists($file);
@@ -288,7 +288,7 @@ 
 			throw new \Exception('The config file alias: "'.$path.'" can not be found. File path: "'.$file.'". This config file is required.');
 		}
 		// The file does NOT exist and it is NOT required
-		if (!$fileExists && !$required){
+		if (!$fileExists && !$required) {
 			// the config is not required so we can just return an empty array
 			return [];
 		}
@@ -350,7 +350,7 @@ 
 	 */
 	public function registerApps($apps)
 	{
-		foreach($apps as $name => $config) {
+		foreach ($apps as $name => $config) {
 			$this->registerApp($name, $config);
 		}
 	}
@@ -465,7 +465,7 @@ 
 	{
 		$apps = array_merge($this->getCoreApps(), $this->getApps());
 		$ret = [];
-		foreach($apps as $app => $config) {
+		foreach ($apps as $app => $config) {
 			$appObject = $this->getApp($app);
 			// apps that are disabled will return null
 			if ($appObject !== null)
@@ -526,7 +526,7 @@ 
 	 */
 	public function getClassAlias()
 	{
-		return '@' . str_replace(['\\', 'Application'], ['/', ''], get_called_class());
+		return '@'.str_replace(['\\', 'Application'], ['/', ''], get_called_class());
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 				$client = new \GuzzleHttp\Client();
 				$res = $client->request('GET', 'https://neon.newicon.net/api/versions/', ['connect_timeout' => 2]);
 				$versions = json_decode((string) $res->getBody());
-			} catch(\Exception $e) {
+			} catch (\Exception $e) {
 				$versions = [];
 			}
 			return $versions;
@@ -640,7 +640,7 @@ 
 		$versions = $this->getNeonVersions();
 		$newerVersion = [];
 		$neonVersion = neon()->getVersion();
-		foreach($versions as $v) {
+		foreach ($versions as $v) {
 			if (version_compare($v, $neonVersion, '>')) {
 				$newerVersion[] = $v;
 			}
@@ -677,7 +677,7 @@ 
 	 */
 	private function setModuleAliases($name, $aliases)
 	{
-		foreach($aliases as $alias)
+		foreach ($aliases as $alias)
 			static::$_moduleAliases[$alias] = $name;
 	}
 

Braces +18 added lines, -12 removed lines

@@ -413,8 +413,9 @@ 
 		$this->setModule($name, $config);
 
 		// set up any alternatives for this
-		if (isset($config['appAliases']))
-			$this->setModuleAliases($name, $config['appAliases']);
+		if (isset($config['appAliases'])) {
+					$this->setModuleAliases($name, $config['appAliases']);
+		}
 	}
 
 	/**
@@ -468,8 +469,9 @@ 
 		foreach($apps as $app => $config) {
 			$appObject = $this->getApp($app);
 			// apps that are disabled will return null
-			if ($appObject !== null)
-				$ret[$app] = $this->getApp($app);
+			if ($appObject !== null) {
+							$ret[$app] = $this->getApp($app);
+			}
 		}
 		return $ret;
 	}
@@ -485,8 +487,9 @@ 
 	public function orderAppsByRequired($apps, &$ordered = null, &$read = null)
 	{
 		static $initialApps = null;
-		if ($ordered == null)
-			$initialApps = $apps;
+		if ($ordered == null) {
+					$initialApps = $apps;
+		}
 		$ordered = $ordered == null ? [] : $ordered;
 		$read = $read == null ? [] : $read;
 		foreach ($apps as $key=>$app) {
@@ -497,15 +500,17 @@ 
 				foreach ($requires as $r) {
 					$r = trim($r);
 					// prevent circular references breaking the system
-					if (!array_key_exists($r, $read))
-						$required[$r] = $initialApps[$r];
+					if (!array_key_exists($r, $read)) {
+											$required[$r] = $initialApps[$r];
+					}
 				}
 				if (count($required)) {
 					$this->orderAppsByRequired($required, $ordered, $read);
 				}
 			}
-			if (!array_key_exists($key, $ordered))
-				$ordered[$key] = $app;
+			if (!array_key_exists($key, $ordered)) {
+							$ordered[$key] = $app;
+			}
 		}
 	}
 
@@ -677,8 +682,9 @@ 
 	 */
 	private function setModuleAliases($name, $aliases)
 	{
-		foreach($aliases as $alias)
-			static::$_moduleAliases[$alias] = $name;
+		foreach($aliases as $alias) {
+					static::$_moduleAliases[$alias] = $name;
+		}
 	}
 
 	/**

neon/core/web/AssetManager.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 */
 	protected function hash($path)
 	{
-		if (isset($this->publishOptions['path'])){
+		if (isset($this->publishOptions['path'])) {
 			// if a path is specified then use this instead of a hash
 			return $this->publishOptions['path'];
 		}