newicon / neon

neon/core/form/fields/Color.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function processAsFilter(IQuery $query, $searchData=null)
+	public function processAsFilter(IQuery $query, $searchData = null)
 	{
 		$searchData = ($searchData === null) ? $this->getValue() : $searchData;
 		if (!empty($searchData)) {
@@ -59,7 +59,7 @@ 
 	public function getComponentDetails()
 	{
 		return [
-			'label' => 'Colour',  'icon' => 'fa fa-paint-brush', 'group' => 'Text', 'order' => 170,
+			'label' => 'Colour', 'icon' => 'fa fa-paint-brush', 'group' => 'Text', 'order' => 170,
 		];
 	}
 }
\ No newline at end of file

neon/core/helpers/Iterator.php

Spacing +2 added lines, -2 removed lines

@@ -99,9 +99,9 @@
 	 * or if you force it to return a total (this should be
 	 * avoided if possible as counts are very expensive operations)
 	 */
-	public function returnTotal(bool $force=false)
+	public function returnTotal(bool $force = false)
 	{
-		$this->_returnTotal=($force? true : ($this->_start == 0));
+		$this->_returnTotal = ($force ? true : ($this->_start == 0));
 	}
 
 	/**

neon/daedalus/services/ddsManager/DdsCore.php

Braces +94 added lines, -64 removed lines

@@ -100,8 +100,9 @@ 
 		$tableName = $this->getTableFromClassType($classType);
 		$upSql = $this->getDropTableSql($classType);
 		$downSql = $this->getCreateTableSql($tableName);
-		foreach ($upSql as $up)
-			neon()->db->createCommand($up)->execute();
+		foreach ($upSql as $up) {
+					neon()->db->createCommand($up)->execute();
+		}
 		$this->storeMigration($upSql, $downSql);
 	}
 
@@ -213,8 +214,9 @@ 
 			default: $type="UNKNOWN STORAGE TYPE $storageType"; break;
 		}
 		$collation = $this->getCollation($storageType);
-		if ($collation)
-			return "$type $collation DEFAULT NULL ";
+		if ($collation) {
+					return "$type $collation DEFAULT NULL ";
+		}
 		return "$type DEFAULT NULL ";
 	}
 
@@ -292,8 +294,9 @@ 
 			self::$_classCache[$ct] = DdsClass::findOne(['class_type' => $ct]);
 		}
 		$class = self::$_classCache[$ct];
-		if (!$class && $throwException)
-			throw new InvalidArgumentException('Unknown class type "'.$ct.'"');
+		if (!$class && $throwException) {
+					throw new InvalidArgumentException('Unknown class type "'.$ct.'"');
+		}
 		return ($class !== null);
 	}
 
@@ -336,32 +339,38 @@ 
 	 */
 	protected function listMembersForClass($classType, $includeDeleted=false, $keyBy='member_ref')
 	{
-		if (!is_string($classType))
-			throw new InvalidArgumentException('The class type $classType parameter should be a string');
+		if (!is_string($classType)) {
+					throw new InvalidArgumentException('The class type $classType parameter should be a string');
+		}
 		$select = ['member_ref', 'label', 'data_type_ref', 'description', 'choices', 'map_field', 'link_class'];
-		if (!empty($keyBy) && !in_array($keyBy, $select))
-			throw new InvalidArgumentException('Parameter keyBy must be empty or one of ' .print_r($select, true));
+		if (!empty($keyBy) && !in_array($keyBy, $select)) {
+					throw new InvalidArgumentException('Parameter keyBy must be empty or one of ' .print_r($select, true));
+		}
 
 		// see if we have a cached version or getting from the database
 		if (empty(static::$_classMembersCache[$classType][$includeDeleted])) {
 			$query = DdsMember::find()->where(['class_type' => $classType]);
-			if ($includeDeleted)
-				$select[] = 'deleted';
-			else
-				$query->andWhere(['deleted' => 0]);
+			if ($includeDeleted) {
+							$select[] = 'deleted';
+			} else {
+							$query->andWhere(['deleted' => 0]);
+			}
 			$rows = $query->select($select)->orderBy('created')->asArray()->all();
-			foreach ($rows as $k=>$r)
-				$rows[$k]['choices'] = json_decode($r['choices'], true);
+			foreach ($rows as $k=>$r) {
+							$rows[$k]['choices'] = json_decode($r['choices'], true);
+			}
 			static::$_classMembersCache[$classType][$includeDeleted] = $rows;
 		}
 
-		if (empty($keyBy))
-			return static::$_classMembersCache[$classType][$includeDeleted];
+		if (empty($keyBy)) {
+					return static::$_classMembersCache[$classType][$includeDeleted];
+		}
 
 		// key by a particular ref
 		$results = [];
-		foreach (static::$_classMembersCache[$classType][$includeDeleted] as $r)
-			$results[$r[$keyBy]] = $r;
+		foreach (static::$_classMembersCache[$classType][$includeDeleted] as $r) {
+					$results[$r[$keyBy]] = $r;
+		}
 
 		return $results;
 	}
@@ -458,8 +467,9 @@ 
 	{
 		$parts = explode($separator, $ref);
 		$canons = [];
-		foreach ($parts as $p)
-			$canons[] = $this->canonicaliseRef($p);
+		foreach ($parts as $p) {
+					$canons[] = $this->canonicaliseRef($p);
+		}
 		return implode($separator, $canons);
 	}
 
@@ -483,8 +493,9 @@ 
 	 */
 	protected function canonicaliseFilters($filters)
 	{
-		if (!is_array($filters))
-			return [];
+		if (!is_array($filters)) {
+					return [];
+		}
 		try {
 			$this->canonicaliseFiltersRecursive($filters);
 		} catch (InvalidArgumentException $ex) {
@@ -503,20 +514,24 @@ 
 	protected function canonicaliseFiltersRecursive(&$filters)
 	{
 		// is this a filter clause or set of filter clauses??
-		if (!is_array($filters) || count($filters)==0)
-			return;
+		if (!is_array($filters) || count($filters)==0) {
+					return;
+		}
 
 		// recursively descend until one finds a filter clause
 		if (is_array($filters[0])) {
-			foreach ($filters as &$f)
-				$this->canonicaliseFiltersRecursive($f);
+			foreach ($filters as &$f) {
+							$this->canonicaliseFiltersRecursive($f);
+			}
 			return;
 		}
 		// so canonicalise a filter clause
-		if (array_key_exists(0, $filters))
-			$this->canonicaliseFilter($filters[0],0);
-		if (array_key_exists(1, $filters))
-			$this->canonicaliseFilter($filters[1],1);
+		if (array_key_exists(0, $filters)) {
+					$this->canonicaliseFilter($filters[0],0);
+		}
+		if (array_key_exists(1, $filters)) {
+					$this->canonicaliseFilter($filters[1],1);
+		}
 
 		// Handle nulls passed as values
 		// ['field', '=', null] and ['field', '!=', null]
@@ -593,8 +608,9 @@ 
 			['AND', 'and', 'NOT', 'not', 'OR', 'or', ' ', ')', '('],
 			'', $subLogic
 		);
-		if (strlen($subLogic)>0)
-			throw new InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true). ' for a logic statement of ' .print_r($logic, true). ' The remaining characters are ' .print_r($subLogic, true));
+		if (strlen($subLogic)>0) {
+					throw new InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true). ' for a logic statement of ' .print_r($logic, true). ' The remaining characters are ' .print_r($subLogic, true));
+		}
 		return $logic;
 	}
 
@@ -630,10 +646,11 @@ 
 				switch ($drn) {
 					case 'ASC': case 'DESC':
 						// allow -ve key starts for nulls last in MySql
-						if (strpos($k,'-') === 0)
-							$canon['-'.$this->quoteField($k)] = $drn;
-						else
-							$canon[$this->quoteField($k)] = $drn;
+						if (strpos($k,'-') === 0) {
+													$canon['-'.$this->quoteField($k)] = $drn;
+						} else {
+													$canon[$this->quoteField($k)] = $drn;
+						}
 					break;
 					case 'ASC_L':
 						$canon[$k] = 'ASC';
@@ -727,14 +744,16 @@ 
 				if (!empty($choices) && is_array($choices)) {
 					foreach ($choices as $choice) {
 						// silently ignore deleted old choice as no longer valid
-						if (isset($member['choices'][$choice]))
-							$value[] = ['key'=>$choice, 'value'=>$member['choices'][$choice]];
+						if (isset($member['choices'][$choice])) {
+													$value[] = ['key'=>$choice, 'value'=>$member['choices'][$choice]];
+						}
 					}
 				}
 			break;
 			case 'boolean':
-				if ($value === NULL)
-					return;
+				if ($value === NULL) {
+									return;
+				}
 				$value = !!$value;
 			break;
 			case 'json': $value = json_decode($value, true); break;
@@ -759,8 +778,9 @@ 
 			$itemLinks = null;
 			if (isset($members[$key])) {
 				$this->doConversionFromPHPToDB($members[$key], $value, $itemLinks);
-				if ($itemLinks !== null)
-					$links[$key] = $itemLinks;
+				if ($itemLinks !== null) {
+									$links[$key] = $itemLinks;
+				}
 			}
 		}
 	}
@@ -779,16 +799,18 @@ 
 			case 'choice':
 				// convert from the value array to the key if the array
 				// the array was returned
-				if (is_array($value) && isset($value['key']))
-					$value = $value['key'];
+				if (is_array($value) && isset($value['key'])) {
+									$value = $value['key'];
+				}
 			break;
 			case 'choice_multiple':
 				$value = json_encode($value);
 			break;
 			case 'boolean':
 				// check for null values
-				if ($value === null)
-					return;
+				if ($value === null) {
+									return;
+				}
 				// convert from truthy to database 1 or 0
 				$value = $value ? 1 : 0;
 			break;
@@ -820,19 +842,22 @@ 
 				// make sure model afterFind has been run
 				$members = DdsMember::find()->where(['class_type'=>$classType])->all();
 				$membersByRef = [];
-				foreach ($members as $member)
-					$membersByRef[$member['member_ref']] = $member->attributes;
+				foreach ($members as $member) {
+									$membersByRef[$member['member_ref']] = $member->attributes;
+				}
 				$_classMembers[$classType] = $membersByRef;
 			} catch (Exception $e) {
 				throw new InvalidArgumentException("Error attempting to get members for $classType.");
 			}
 		}
-		if (empty($dataTypes))
-			return $_classMembers[$classType];
+		if (empty($dataTypes)) {
+					return $_classMembers[$classType];
+		}
 		$dataMembers = [];
 		foreach ($_classMembers[$classType] as $k=>$m) {
-			if (in_array($m['data_type_ref'], $dataTypes))
-				$dataMembers[$k] = $m;
+			if (in_array($m['data_type_ref'], $dataTypes)) {
+							$dataMembers[$k] = $m;
+			}
 		}
 		return $dataMembers;
 	}
@@ -885,16 +910,18 @@ 
 	 */
 	protected function getTableRowReplaceSql($table, $row)
 	{
-		if (!is_array($row))
-			$row = $row->toArray();
+		if (!is_array($row)) {
+					$row = $row->toArray();
+		}
 		$fields = [];
 		$values = [];
 		foreach ($row as $f=>$v) {
 			$fields[]=$f;
 			$values[] = $this->pdoQuote($v);
 		}
-		if (count($fields))
-			return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(',', $values)). ');';
+		if (count($fields)) {
+					return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(',', $values)). ');';
+		}
 		return null;
 	}
 
@@ -905,10 +932,12 @@ 
 	 */
 	private function pdoQuote($value)
 	{
-		if (is_array($value))
-			$value = json_encode($value);
-		if (is_null($value))
-			return 'null';
+		if (is_array($value)) {
+					$value = json_encode($value);
+		}
+		if (is_null($value)) {
+					return 'null';
+		}
 		return neon()->db->pdo->quote($value);
 	}
 
@@ -943,8 +972,9 @@ 
 	protected function areUUIDs(array $candidates)
 	{
 		foreach ($candidates as $candidate) {
-			if (!$this->isUUID($candidate))
-				return false;
+			if (!$this->isUUID($candidate)) {
+							return false;
+			}
 		}
 		return true;
 	}

neon/cms/App.php

Spacing +6 added lines, -6 removed lines

@@ -232,7 +232,7 @@ 
 	 */
 	public function getThemeAlias()
 	{
-		return '@root/themes/' . $this->getThemeName();
+		return '@root/themes/'.$this->getThemeName();
 	}
 
 	/**
@@ -275,7 +275,7 @@ 
 	 * @inheritdoc
 	 * @unsupported - $filters is not currently supported
 	 */
-	public function getDataMap($key, $query='',  $filters=[], $fields=[], $start = 0, $limit = 100)
+	public function getDataMap($key, $query = '', $filters = [], $fields = [], $start = 0, $limit = 100)
 	{
 		if ($key === 'pages') {
 			return $this->getPagesMap($query, $filters, $fields, $start, $limit);
@@ -328,7 +328,7 @@ 
 	 */
 	public function formatPageMapResults($pages, $fields)
 	{
-		return collect($pages)->mapWithKeys(function ($item) use($fields) {
+		return collect($pages)->mapWithKeys(function($item) use($fields) {
 			if (empty($fields))
 				return [$item['id'] => "$item[title]  (nice=$item[nice_id])"];
 			return [$item['id'] => $item];
@@ -358,7 +358,7 @@ 
 	 * @param array $fields
 	 * @return array - @see $this->formatPageMapResults();
 	 */
-	public function getPagesMap($query=null, $filters=[], $fields=[], $start=0, $limit=100)
+	public function getPagesMap($query = null, $filters = [], $fields = [], $start = 0, $limit = 100)
 	{
 		$pages = CmsPage::find()
 			->select(array_merge(['id', 'nice_id', 'title'], $fields))
@@ -392,10 +392,10 @@ 
 	 */
 	private function checkThemeName($name)
 	{
-		if ( preg_match('/[^A-Za-z0-9_-]/', $name, $matches) ) {
+		if (preg_match('/[^A-Za-z0-9_-]/', $name, $matches)) {
 			throw new \InvalidArgumentException("Error trying to set the theme name to '$name'"
 				."\n"."The theme name must consist of only 'a-z', '0-9', '_' and '-' characters."
-				."\n".'The following character is not allowed in theme names: ' . \yii\helpers\VarDumper::dumpAsString($matches[0]) );
+				."\n".'The following character is not allowed in theme names: '.\yii\helpers\VarDumper::dumpAsString($matches[0]));
 		}
 	}
 

Braces +15 added lines, -9 removed lines

@@ -171,11 +171,13 @@ 
 	public function getThemeHierarchy()
 	{
 		// if we have a theme hierarchy use that
-		if (count($this->_themeHierarchy))
-			return $this->_themeHierarchy;
+		if (count($this->_themeHierarchy)) {
+					return $this->_themeHierarchy;
+		}
 		// otherwise drop back to the themeName
-		if (!empty($this->_themeName))
-			return [$this->_themeName];
+		if (!empty($this->_themeName)) {
+					return [$this->_themeName];
+		}
 		// otherwise return nothing
 		return [];
 	}
@@ -248,7 +250,9 @@ 
 	public function themeAssetUrl($path)
 	{
 		// loading external resource so just return
-		if (Str::startsWith($path, 'http')) return $path;
+		if (Str::startsWith($path, 'http')) {
+			return $path;
+		}
 		list($assetPath, $assetUrl) = $this->publishThemeAssets();
 		$path = ltrim($path, '/');
 		$assetUrl = ltrim($assetUrl, '/');
@@ -316,8 +320,9 @@ 
 	 */
 	public function getMapResults($requestKey)
 	{
-		if (!isset($this->_mapRequestKey[$requestKey]))
-			throw new \InvalidArgumentException('The provided request key "'.$requestKey.'" does not exist');
+		if (!isset($this->_mapRequestKey[$requestKey])) {
+					throw new \InvalidArgumentException('The provided request key "'.$requestKey.'" does not exist');
+		}
 		list($key, $ids, $fields) = $this->_mapRequestKey[$requestKey];
 		if ($key === 'pages') {
 			$pages = CmsPage::find()->select(array_merge(['id', 'nice_id', 'title'], $fields))
@@ -353,8 +358,9 @@ 
 	public function formatPageMapResults($pages, $fields)
 	{
 		return collect($pages)->mapWithKeys(function ($item) use($fields) {
-			if (empty($fields))
-				return [$item['id'] => "$item[title]  (nice=$item[nice_id])"];
+			if (empty($fields)) {
+							return [$item['id'] => "$item[title]  (nice=$item[nice_id])"];
+			}
 			return [$item['id'] => $item];
 		})->all();
 	}

neon/cms/components/Editor.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 	 */
 	public static function editor($params, $content, \Smarty_Internal_Template $template, &$repeat)
 	{
-		if ($repeat) return;
+		if ($repeat) {
+			return;
+		}
 		$id = Arr::get($params, 'id', neon()->cms->getPage()->getId());
 		
 

neon/cms/grid/PageGrid.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 		$this->addColumn('og_image')->setTitle('Social')->setWidth('100px')->setMember(new \neon\core\form\fields\Image('og_image'));
 
 		$this->addButtonColumn('edit')
-			->addButton('edit', ['/cms/editor/index' , 'id' => '{{nice_id}}'], '', '', '', ['data-toggle' => 'tooltip', 'title'=>'Edit']);
+			->addButton('edit', ['/cms/editor/index', 'id' => '{{nice_id}}'], '', '', '', ['data-toggle' => 'tooltip', 'title'=>'Edit']);
 
 		$this->addScope('published', 'Published');
 		$this->addScope('draft', 'Draft');
@@ -78,7 +78,7 @@ 
 
 	public function renderTitle($model)
 	{
-		return '<div style="font-weight:600;">' . $model['title'] . '</div><div stlye="margin-top:4px;">' . $model['description'] . '</div>';
+		return '<div style="font-weight:600;">'.$model['title'].'</div><div stlye="margin-top:4px;">'.$model['description'].'</div>';
 	}
 
 	public function renderUrl($model, $key, $index, $column)

neon/core/helpers.php

Spacing +46 added lines, -46 removed lines

@@ -17,7 +17,7 @@ 
 use \Carbon\Carbon;
 use neon\core\helpers\Url;
 
-if (! function_exists('dp')) {
+if (!function_exists('dp')) {
 	/**
 	 * Debug function. Prints all passed in arguments to the screen.
 	 * arguments containing objects or arrays are output using print_r
@@ -39,7 +39,7 @@ 
 	}
 }
 
-if (! function_exists('backtrace_line_by_function')) {
+if (!function_exists('backtrace_line_by_function')) {
 	/**
 	 * Tries to get the line and file that called the specified functions
 	 * - will return the earliest match in execution order that it found.
@@ -51,9 +51,9 @@ 
 	{
 		$bt = debug_backtrace();
 		$lineInfo = '';
-		foreach($bt as $trace) {
+		foreach ($bt as $trace) {
 			if (isset($trace['function']) && $trace['function'] === $functionToShow) {
-				$lineInfo = '==> [' . (isset($trace['file']) ? $trace['file'] : ' unknown file '). ':' . (isset($trace['line']) ? $trace['line'] : ' unknown line ' ) . ']';
+				$lineInfo = '==> ['.(isset($trace['file']) ? $trace['file'] : ' unknown file ').':'.(isset($trace['line']) ? $trace['line'] : ' unknown line ').']';
 				break;
 			}
 		}
@@ -61,7 +61,7 @@ 
 	}
 }
 
-if (! function_exists('dp_string')) {
+if (!function_exists('dp_string')) {
 	/**
 	 * This generates a nice debug string and returns it. It will only
 	 * print to the screen if you are in debug mode. Otherwise it prints
@@ -93,7 +93,7 @@ 
 	}
 }
 
-if (! function_exists('dd')) {
+if (!function_exists('dd')) {
 	/**
 	 * This is the same as the dp (debug print) function but exits after
 	 * **Note:** If not in debug will print to log error and not exit
@@ -113,7 +113,7 @@ 
 	}
 }
 
-if (! function_exists('debug_message')) {
+if (!function_exists('debug_message')) {
 	/**
 	 * This is the same as the dp_string (debug print) function however it returns the string
 	 * The main difference is that it will only output a message if neon is in debug mode
@@ -132,7 +132,7 @@ 
 }
 
 
-if (! function_exists('neon')) {
+if (!function_exists('neon')) {
 	/**
 	 * Shortcut method to ```\Neon::$app```
 	 * @param string $name
@@ -144,7 +144,7 @@ 
 	}
 }
 
-if (! function_exists('setting')) {
+if (!function_exists('setting')) {
 	/**
 	 * Get a setting value
 	 *
@@ -155,13 +155,13 @@ 
 	 * the setting has been set in the current session
 	 * @return string
 	 */
-	function setting($app, $name, $default=null, $refresh=false)
+	function setting($app, $name, $default = null, $refresh = false)
 	{
 		return neon()->getSettingsManager()->get($app, $name, $default, $refresh);
 	}
 }
 
-if (! function_exists('set_setting')) {
+if (!function_exists('set_setting')) {
 	/**
 	 * @param string $app the app responsible for this setting
 	 * @param string $name the setting name
@@ -174,7 +174,7 @@ 
 	}
 }
 
-if (! function_exists('url')) {
+if (!function_exists('url')) {
 	/**
 	 * Alias of \neon\core\helpers\Url::to
 	 * @see \neon\core\helpers\Url::to()
@@ -197,7 +197,7 @@ 
 	}
 }
 
-if (! function_exists('url_base')) {
+if (!function_exists('url_base')) {
 	/**
 	 * Returns the base URL of the current request.
 	 * @param boolean|string $scheme the URI scheme to use in the returned base URL:
@@ -213,7 +213,7 @@ 
 	}
 }
 
-if (! function_exists('to_bytes')) {
+if (!function_exists('to_bytes')) {
 	/**
 	 * Returns the number of bytes as integer from a strings like `128K` | `128M` | `2G` | `1T` | `1P`
 	 *
@@ -225,7 +225,7 @@ 
 	}
 }
 
-if (! function_exists('format_bytes')) {
+if (!function_exists('format_bytes')) {
 	/**
 	 * Output a formatted size like '128M' from bytes.
 	 *
@@ -238,7 +238,7 @@ 
 	}
 }
 
-if (! function_exists('truthy')) {
+if (!function_exists('truthy')) {
 	/**
 	 * Php if statement handles truthy and falsey string conversions by default e.g. evaluating a '0' string to false
 	 * however a string of 'false' is evaluated as true. This function resolves that difference. This should be used
@@ -254,7 +254,7 @@ 
 	}
 }
 
-if (! function_exists('env')) {
+if (!function_exists('env')) {
 	/**
 	 * Gets the value of an environment variable.
 	 * Interprets 'true', 'false', 'empty' and 'null' strings appropriately
@@ -289,7 +289,7 @@ 
 	}
 }
 
-if (! function_exists('neon_secret')) {
+if (!function_exists('neon_secret')) {
 	/**
 	 * Gets the value of NEON_SECRET creating it if missing
 	 * @return string
@@ -299,7 +299,7 @@ 
 	}
 }
 
-if (! function_exists('neon_encryption_key')) {
+if (!function_exists('neon_encryption_key')) {
 	/**
 	 * Gets the value of NEON_SECRET creating it if missing
 	 * @return string
@@ -309,7 +309,7 @@ 
 	}
 }
 
-if (! function_exists('value')) {
+if (!function_exists('value')) {
 	/**
 	 * Return the value of the given value.
 	 * If the $value is a Closure, it will first be executed then its result returned
@@ -323,7 +323,7 @@ 
 	}
 }
 
-if (! function_exists('collect')) {
+if (!function_exists('collect')) {
 	/**
 	 * Create a collection from the given value.
 	 *
@@ -336,7 +336,7 @@ 
 	}
 }
 
-if (! function_exists('now')) {
+if (!function_exists('now')) {
 	/**
 	 * Create a new Carbon instance for the current time.
 	 *
@@ -349,27 +349,27 @@ 
 	}
 }
 
-if (! function_exists('profile_begin')) {
+if (!function_exists('profile_begin')) {
 	/**
 	 * @param string $name
 	 */
-	function profile_begin($name, $category='neon')
+	function profile_begin($name, $category = 'neon')
 	{
 		\Neon::beginProfile($name, $category);
 	}
 }
 
-if (! function_exists('profile_end')) {
+if (!function_exists('profile_end')) {
 	/**
 	 * @param string $name
 	 */
-	function profile_end($name=null, $category='neon')
+	function profile_end($name = null, $category = 'neon')
 	{
 		\Neon::endProfile($name, $category);
 	}
 }
 
-if (! function_exists('encrypt')) {
+if (!function_exists('encrypt')) {
 	/**
 	 * @param string $data
 	 * @return string - encrypted data
@@ -380,7 +380,7 @@ 
 	}
 }
 
-if (! function_exists('decrypt')) {
+if (!function_exists('decrypt')) {
 	/**
 	 * @param string $data
 	 * @return string - encrypted data
@@ -391,7 +391,7 @@ 
 	}
 }
 
-if (! function_exists('get_alias')) {
+if (!function_exists('get_alias')) {
 	/**
 	 * @param string $path
 	 * @return string - resolved path
@@ -402,7 +402,7 @@ 
 	}
 }
 
-if (! function_exists('on_url')) {
+if (!function_exists('on_url')) {
 	/**
 	 * This function is useful for checking if links should be active,
 	 *
@@ -422,7 +422,7 @@ 
 		return \neon\core\helpers\Url::isUrl(...$urls);
 	}
 }
-if (! function_exists('_t')) {
+if (!function_exists('_t')) {
 	/**
 	 * Translates a message to the target language
 	 * This function is a wrapper to the \Neon::t method
@@ -442,12 +442,12 @@ 
 	 * @param string $category  if provided will save the text to that category. Defaults to 'neon'
 	 * @return string the translated message.
 	 */
-	function _t($text, $params=[], $category='neon')
+	function _t($text, $params = [], $category = 'neon')
 	{
 		return \Neon::t($category, $text, $params);
 	}
 }
-if (! function_exists('faker')) {
+if (!function_exists('faker')) {
 	/**
 	 * Generate a faker object
 	 * @return \Faker\Generator;
@@ -460,7 +460,7 @@ 
 		return $faker;
 	}
 }
-if (! function_exists('user_is')) {
+if (!function_exists('user_is')) {
 	/**
 	 * @return boolean whether the user is/has a particular role
 	 */
@@ -470,7 +470,7 @@ 
 	}
 }
 
-if (! function_exists('user_can')) {
+if (!function_exists('user_can')) {
 	/**
 	 * Whether the user can perform a permission
 	 * @param $permission
@@ -481,18 +481,18 @@ 
 		return neon()->user->can($permission);
 	}
 }
-if (! function_exists('uuid')) {
+if (!function_exists('uuid')) {
 	/**
 	 * Generate a universally unique id
 	 * @param string $separator - default '-'
 	 * @return bool
 	 */
-	function uuid($separator='-')
+	function uuid($separator = '-')
 	{
 		return \neon\core\helpers\Hash::uuid($separator);
 	}
 }
-if (! function_exists('uuid64')) {
+if (!function_exists('uuid64')) {
 	/**
 	 * Generate a universally unique id in base64
 	 * @return bool
@@ -502,7 +502,7 @@ 
 		return \neon\core\helpers\Hash::uuid64();
 	}
 }
-if (! function_exists('id')) {
+if (!function_exists('id')) {
 	/**
 	 * Generate a html friendly UUID64
 	 * @return string
@@ -512,7 +512,7 @@ 
 		return \neon\core\helpers\Hash::id();
 	}
 }
-if (! function_exists('is_route')) {
+if (!function_exists('is_route')) {
 	/**
 	 * Test whether the current application is on a particular route
 	 * This is url rewrite safe! However you must reference the module/controller/action and not the url directly
@@ -523,12 +523,12 @@ 
 	 * @param array $params
 	 * @return boolean - whether on the route
 	 */
-	function is_route($pattern, $params=[])
+	function is_route($pattern, $params = [])
 	{
 		return neon()->request->isRoute($pattern, $params);
 	}
 }
-if (! function_exists('abort')) {
+if (!function_exists('abort')) {
 	/**
 	 * Throw a HttpException with the given data.
 	 *
@@ -544,7 +544,7 @@ 
 	}
 }
 
-if (! function_exists('abort_if')) {
+if (!function_exists('abort_if')) {
 	/**
 	 * Throw a HttpException with the given data if the given condition is true.
 	 *
@@ -562,7 +562,7 @@ 
 		}
 	}
 }
-if (! function_exists('request')) {
+if (!function_exists('request')) {
 	/**
 	 * Get an instance of the current request or an input item from the request.
 	 *
@@ -581,7 +581,7 @@ 
 		return is_null($value) ? value($default) : $value;
 	}
 }
-if (! function_exists('object_get')) {
+if (!function_exists('object_get')) {
 	/**
 	 * Get an item from an object using "dot" notation.
 	 *
@@ -597,7 +597,7 @@ 
 		}
 
 		foreach (explode('.', $key) as $segment) {
-			if (! is_object($object) || ! isset($object->{$segment})) {
+			if (!is_object($object) || !isset($object->{$segment})) {
 				return value($default);
 			}