newicon / neon

neon/core/grid/column/Button.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param array $options - additional html attribute options
 	 * @return $this
 	 */
-	public function setEdit($url, array $options=[])
+	public function setEdit($url, array $options = [])
 	{
 		$this->_buttons['edit'] = $options;
 		$this->_buttons['edit']['url'] = $url;
@@ -43,7 +43,7 @@ 
 	 * @param array|string $url
 	 * @param array $options - additional html attribute options
 	 */
-	public function setDelete($url, array $options=[])
+	public function setDelete($url, array $options = [])
 	{
 		$this->_buttons['delete'] = $options;
 		$this->_buttons['delete']['url'] = $url;
@@ -59,7 +59,7 @@ 
 	 *   will append text to the CSS class e.g. btn-$type
 	 * @param array $options - passed to Html::buttonCustom
 	 */
-	public function addButton($key, $url, $text, $icon='', $class='', $options=[])
+	public function addButton($key, $url, $text, $icon = '', $class = '', $options = [])
 	{
 		$this->_buttons[$key] = array_merge(compact('url', 'text', 'icon', 'class'), $options);
 	}
@@ -83,7 +83,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return 'calc(' . (count($this->_buttons)+count($this->_actions)) . ' * ' .$this->buttonWidth . ')';
+		return 'calc('.(count($this->_buttons) + count($this->_actions)).' * '.$this->buttonWidth.')';
 	}
 
 	/**
@@ -97,11 +97,11 @@ 
 				if (!isset($btnOps['data']))
 					$btnOps['data'] = [];
 				if ($this->getGrid()->hasIndexColumn())
-					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()]];
 				$func = 'buttonCustom';
 				if ($buttonKey === 'delete') {
 					$func = 'buttonDelete';
-					$btnOps['data'] = Arr::merge($btnOps['data'], ['data'=> ['delete-ajax' => true ]]);
+					$btnOps['data'] = Arr::merge($btnOps['data'], ['data'=> ['delete-ajax' => true]]);
 				}
 				if ($buttonKey === 'edit') {
 					$func = 'buttonEdit';
@@ -109,10 +109,10 @@ 
 				$text = Arr::remove($btnOps, 'text', '');
 				$url = Arr::remove($btnOps, 'url', '');
 				$url = $this->grid->replaceRowTagsWithValues($url, $model);
-				$btnOps['class'] = Arr::get($btnOps, 'class', '') . ' btn-grid';
+				$btnOps['class'] = Arr::get($btnOps, 'class', '').' btn-grid';
 				$buttons[] = Html::$func($url, $text, $btnOps);
 			}
-			return '<div class="btn-group btn-column">' . implode('', $buttons) . '</div>';
+			return '<div class="btn-group btn-column">'.implode('', $buttons).'</div>';
 		}
 	}
 

Braces +6 added lines, -4 removed lines

@@ -94,10 +94,12 @@
 		if (count($this->_buttons)) {
 			$buttons = [];
 			foreach ($this->_buttons as $buttonKey => $btnOps) {
-				if (!isset($btnOps['data']))
-					$btnOps['data'] = [];
-				if ($this->getGrid()->hasIndexColumn())
-					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+				if (!isset($btnOps['data'])) {
+									$btnOps['data'] = [];
+				}
+				if ($this->getGrid()->hasIndexColumn()) {
+									$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+				}
 				$func = 'buttonCustom';
 				if ($buttonKey === 'delete') {
 					$func = 'buttonDelete';

neon/user/migrations/develop/__m20200720_143700_user_make_id_the_uuid.php

Spacing +8 added lines, -8 removed lines

@@ -22,14 +22,14 @@ 
 
 		$apiTokens = UserApiToken::find()->all();
 		$tableApiToken = UserApiToken::tableName();
-		foreach($apiTokens as $apiToken) {
+		foreach ($apiTokens as $apiToken) {
 			$this->execute("UPDATE $tableApiToken SET user_id = :uuid where user_id = :id", [
 				':uuid' =>  $idToUuuid->get($apiToken->user_id),
 				':id' =>  $apiToken->user_id
 			]);
 		}
 		$tableUser = User::tableName();
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$this->execute("UPDATE $tableUser SET id = :uuid, old_id = :id where id = :id", [
 				':uuid' => $idToUuuid->get($user->id),
 				':id' => $user->id
@@ -38,7 +38,7 @@ 
 
 		$authTable = \neon\user\models\AuthAssignment::tableName();
 		$authAssignments = \neon\user\models\AuthAssignment::find()->all();
-		foreach($authAssignments as $auth) {
+		foreach ($authAssignments as $auth) {
 			$this->execute("UPDATE $authTable SET user_id = :uuid where user_id = :id", [
 				':uuid' => $idToUuuid->get($auth->user_id),
 				':id' => $auth->user_id
@@ -50,7 +50,7 @@ 
 		$tableFfs = \neon\firefly\services\fileManager\models\FileManager::tableName();
 		$this->alterColumn($tableFfs, 'created_by', $this->uuid64());
 		$this->alterColumn($tableFfs, 'updated_by', $this->uuid64());
-		foreach($ffs as $f) {
+		foreach ($ffs as $f) {
 			$this->execute("UPDATE $tableFfs SET created_by = :uuid where created_by = :id", [
 				':uuid' => $idToUuuid->get($f->created_by),
 				':id' => $f->created_by
@@ -73,14 +73,14 @@ 
 
 		$apiTokens = UserApiToken::find()->all();
 		$tableApiToken = UserApiToken::tableName();
-		foreach($apiTokens as $apiToken) {
+		foreach ($apiTokens as $apiToken) {
 			$this->execute("UPDATE $tableApiToken SET user_id = :id where user_id = :uuid", [
 				':id' =>  $uuidToId->get($apiToken->user_id),
 				':uuid' =>  $apiToken->user_id
 			]);
 		}
 
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$this->execute("UPDATE $tableUser SET id = :id where id = :uuid", [
 				':id' => $uuidToId->get($user->id),
 				':uuid' => $user->id
@@ -89,7 +89,7 @@ 
 
 		$authTable = \neon\user\models\AuthAssignment::tableName();
 		$authAssignments = \neon\user\models\AuthAssignment::find()->all();
-		foreach($authAssignments as $auth) {
+		foreach ($authAssignments as $auth) {
 			$this->execute("UPDATE $authTable SET user_id = :id where user_id = :uuid", [
 				':id' => $uuidToId->get($auth->user_id),
 				':uuid' => $auth->user_id
@@ -99,7 +99,7 @@ 
 		// update firefly created_by and updated_by
 		$ffs = \neon\firefly\services\fileManager\models\FileManager::find()->all();
 		$tableFfs = \neon\firefly\services\fileManager\models\FileManager::tableName();
-		foreach($ffs as $f) {
+		foreach ($ffs as $f) {
 			$this->execute("UPDATE $tableFfs SET created_by = :id where created_by = :uuid", [
 				':id' => $uuidToId->get($f->created_by),
 				':uuid' => $f->created_by

neon/core/web/FilterGlobalPassword.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 			$niceId = setting('core', 'global_password_holding_page', '');
 			$page = neon()->cms->getPage();
 			// check the page with the nice_id exists
-			if (! $page->setById($niceId)) throw new \yii\web\HttpException(404, 'No page found');
+			if (!$page->setById($niceId)) throw new \yii\web\HttpException(404, 'No page found');
 			neon()->response->content = $page->render();
 			//return false;
 			return true;
@@ -100,7 +100,7 @@ 
 		// No holding page niceId has been given so display a standard password screen
 		neon()->response->content = neon()->view->render('@neon/core/views/global-password.php', [
 			'passwordParam' => $this->passwordParam,
-			'incorrectPassword' => ($this->getSuppliedPassword()!==null)
+			'incorrectPassword' => ($this->getSuppliedPassword() !== null)
 		]);
 	}
 

Braces +12 added lines, -7 removed lines

@@ -34,16 +34,19 @@ 
 	public function beforeAction($action)
 	{
 		// If the global password option is not set then return - and continue as normal
-		if (setting('core', 'global_password_enabled', false) === 0)
-			return true;
+		if (setting('core', 'global_password_enabled', false) === 0) {
+					return true;
+		}
 		// If the global password is set - still allow the following app controller paths to work.
 		if (neon()->request->isRoute('/admin*') || neon()->request->isRoute('/user/*') || neon()->request->isRoute('/settings*')) {
 			return true;
 		}
-		if ($this->passwordIsValid())
-			return true;
-		if ($this->shouldDisplayHoldingPage())
-			return false;
+		if ($this->passwordIsValid()) {
+					return true;
+		}
+		if ($this->shouldDisplayHoldingPage()) {
+					return false;
+		}
 		$this->displayGlobalPasswordPage();
 		return false;
 	}
@@ -63,7 +66,9 @@ 
 			$niceId = setting('core', 'global_password_holding_page', '');
 			$page = neon()->cms->getPage();
 			// check the page with the nice_id exists
-			if (! $page->setById($niceId)) throw new \yii\web\HttpException(404, 'No page found');
+			if (! $page->setById($niceId)) {
+				throw new \yii\web\HttpException(404, 'No page found');
+			}
 			neon()->response->content = $page->render();
 			//return false;
 			return true;

neon/core/console/PublishController.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 * Useful git command:
 	 * Under some circumstances you may discover an error or a minor change after publishing.
 	 * In order to up issue the current version without changing the number you have to delete the tag:
-		 * `git push --delete origin v2.0.2 && git tag -d v2.0.2`
+	 * `git push --delete origin v2.0.2 && git tag -d v2.0.2`
 	 * Note that in most circumstances its easier and preferable just to increment the patch number.
 	 *
 	 * @return boolean successful publish

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 
 		// Check the version number conforms to semver format - 2.0.1 or 3.0.0[-beta][+build]
 		if (!preg_match('/^[0-9]+\.[0-9]+\.[0-9]+([-+].*)?$/', $version, $match)) {
-			$this->stderr("!! The version number is not a valid version it must be in the format '#.#.#' or '#.#.#[-description][+build]'.\n",  Console::FG_RED);
+			$this->stderr("!! The version number is not a valid version it must be in the format '#.#.#' or '#.#.#[-description][+build]'.\n", Console::FG_RED);
 			return ExitCode::UNSPECIFIED_ERROR;
 		}
 
@@ -75,7 +75,7 @@ 
 
 		// Check to see if the javascript has been built since changing
 		if (!$this->confirm("=> Have you run the neon build process?\n")) {
-			$this->stdout("-> Please run the build process before continuing! =>./neo core/build/neon\n",  Console::FG_CYAN);
+			$this->stdout("-> Please run the build process before continuing! =>./neo core/build/neon\n", Console::FG_CYAN);
 			return ExitCode::UNSPECIFIED_ERROR;
 		}
 
@@ -83,7 +83,7 @@ 
 		// need to make sure that the version to update to is specified and checked in, in the composer.json file
 		// this ensures the tag will have the correct version listed
 		if (!$this->confirm("=> Are your tests passing?\n")) {
-			$this->stdout("-> Please run all of the tests! =>./codecept run\n",  Console::FG_CYAN);
+			$this->stdout("-> Please run all of the tests! =>./codecept run\n", Console::FG_CYAN);
 			return ExitCode::UNSPECIFIED_ERROR;
 		}
 
@@ -100,10 +100,10 @@ 
 		$process->wait();
 		$gitVersions = explode("\n", $process->getOutput());
 		$versions = [];
-		foreach($gitVersions as $v) {
-			$v = substr($v, strrpos($v, "/")+1);
+		foreach ($gitVersions as $v) {
+			$v = substr($v, strrpos($v, "/") + 1);
 			if ($v == '') continue;
-			$versions[] = $v ;
+			$versions[] = $v;
 		}
 		if (in_array($version, $versions)) {
 			if (!$this->force) {

Braces +3 added lines, -1 removed lines

@@ -102,7 +102,9 @@
 		$versions = [];
 		foreach($gitVersions as $v) {
 			$v = substr($v, strrpos($v, "/")+1);
-			if ($v == '') continue;
+			if ($v == '') {
+				continue;
+			}
 			$versions[] = $v ;
 		}
 		if (in_array($version, $versions)) {

neon/cms/components/Daedalus.php

Spacing +13 added lines, -13 removed lines

@@ -175,7 +175,7 @@ 
 	 * @param array $params  any paramters from @see dds and dds_choice
 	 * @param object $renderer  the render object
 	 */
-	public function __construct($params, $renderer=null)
+	public function __construct($params, $renderer = null)
 	{
 		$this->params = $params;
 		$this->renderer = $renderer;
@@ -200,7 +200,7 @@ 
 			$request = self::convertDataRequestToJson($this->params['data']);
 			$responded = neon()->cms->getPage()->requestWidgetData($request, $data, $id, false, $meta);
 			if ($responded) {
-				$result['hasData'] = count($data)>0;
+				$result['hasData'] = count($data) > 0;
 				$result['hasResponse'] = true;
 				$result['data'] = $data;
 				$result['meta'] = $meta;
@@ -225,21 +225,21 @@ 
 	 * @return null|errors|array  returns errors if not valid, null if called
 	 *   from within a template and the data if from within a plugin
 	 */
-	protected function queryChoice($template=true)
+	protected function queryChoice($template = true)
 	{
 		// check usage
 		if (!isset($this->params['member']))
-			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params, true);
 		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
-		if (strpos($this->params['member'],':') === false && !isset($this->params['class']))
+			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params, true);
+		if (strpos($this->params['member'], ':') === false && !isset($this->params['class']))
 			return "Usage: if you do not scope the member as class::member then you must provide the class parameter";
 
 		// extract out class and member
 		$class = null;
 		$member = null;
-		if (strpos($this->params['member'],':') !== false)
-			list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
+		if (strpos($this->params['member'], ':') !== false)
+			list ($class, $member) = explode(':', str_replace('::', ':', $this->params['member']));
 		else {
 			$class = $this->params['class'];
 			$member = $this->params['member'];
@@ -287,10 +287,10 @@ 
 	{
 		// check usage
 		if (!isset($this->params['class']))
-			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params, true);
 
 		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params, true);
 
 		$fields = isset($this->params['fields']) ? $this->params['fields'] : [];
 
@@ -388,7 +388,7 @@ 
 				if (is_array($dps['dds_filter']))
 					$filters[] = json_encode($dps['dds_filter']);
 				// else deprecated json approach
-				else if (strpos(trim($dps['dds_filter']), '[')!==0)
+				else if (strpos(trim($dps['dds_filter']), '[') !== 0)
 					$filters[] = "[$dps[dds_filter]]";
 				else
 					$filters[] = $dps['dds_filter'];
@@ -396,7 +396,7 @@ 
 
 			// create the filters clause
 			if (count($filters))
-				$data[] = "'filters':".implode(',',$filters);
+				$data[] = "'filters':".implode(',', $filters);
 
 			// sort out the order
 			if (isset($dps['dds_order'])) {
@@ -463,7 +463,7 @@ 
 				$classType = $d['_class_type'];
 				foreach ($d as $field=>$value) {
 					// ignore all bookkeeping fields
-					if (strpos($field, '_')===0)
+					if (strpos($field, '_') === 0)
 						continue;
 					$edit[$i][$field] = self::createFieldEditable($classType, $field, $d['_uuid'], $value);
 				}

Braces +91 added lines, -66 removed lines

@@ -209,10 +209,11 @@ 
 				// $result['edit'] = $this->createEditable($data);
 			}
 		}
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $result);
-		else
-			return $result;
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $result);
+		} else {
+					return $result;
+		}
 	}
 
 	/**
@@ -230,19 +231,22 @@ 
 	protected function queryChoice($template=true)
 	{
 		// check usage
-		if (!isset($this->params['member']))
-			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params,true);
-		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
-		if (strpos($this->params['member'],':') === false && !isset($this->params['class']))
-			return "Usage: if you do not scope the member as class::member then you must provide the class parameter";
+		if (!isset($this->params['member'])) {
+					return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params,true);
+		}
+		if ($this->renderer && !isset($this->params['assign'])) {
+					return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+		}
+		if (strpos($this->params['member'],':') === false && !isset($this->params['class'])) {
+					return "Usage: if you do not scope the member as class::member then you must provide the class parameter";
+		}
 
 		// extract out class and member
 		$class = null;
 		$member = null;
-		if (strpos($this->params['member'],':') !== false)
-			list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
-		else {
+		if (strpos($this->params['member'],':') !== false) {
+					list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
+		} else {
 			$class = $this->params['class'];
 			$member = $this->params['member'];
 		}
@@ -254,10 +258,11 @@ 
 		if (!isset(self::$_choices[$key])) {
 			$dds = neon('dds')->iDdsClassManagement;
 			$result = $dds->getMember($class, $member, ['choices']);
-			if (!empty($result) && isset($result['choices']))
-				self::$_choices[$key] = $result['choices'];
-			else
-				self::$_choices[$key] = [];
+			if (!empty($result) && isset($result['choices'])) {
+							self::$_choices[$key] = $result['choices'];
+			} else {
+							self::$_choices[$key] = [];
+			}
 		}
 		$choices = self::$_choices[$key];
 		if (isset($this->params['order'])) {
@@ -267,10 +272,11 @@ 
 				asort($choices);
 			}
 		}
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $choices);
-		else
-			return $choices;
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $choices);
+		} else {
+					return $choices;
+		}
 	}
 
 	/**
@@ -288,11 +294,13 @@ 
 	protected function queryMap()
 	{
 		// check usage
-		if (!isset($this->params['class']))
-			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+		if (!isset($this->params['class'])) {
+					return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+		}
 
-		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+		if ($this->renderer && !isset($this->params['assign'])) {
+					return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+		}
 
 		$fields = isset($this->params['fields']) ? $this->params['fields'] : [];
 
@@ -311,11 +319,13 @@ 
 			self::$_maps[$class] = $result;
 		}
 		$map = self::$_maps[$class];
-		if (isset($this->params['flip']))
-			$map = array_flip($map);
+		if (isset($this->params['flip'])) {
+					$map = array_flip($map);
+		}
 
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $map);
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $map);
+		}
 		return $map;
 	}
 
@@ -331,11 +341,13 @@ 
 		$json = trim(str_replace("'", '"', $data));
 		if (strlen($json) > 0) {
 			// for convenience the beginning and ending brackets are optional so add if not supplied
-			if (strpos($json, '{') !== 0)
-				$json = '{'.$json.'}';
+			if (strpos($json, '{') !== 0) {
+							$json = '{'.$json.'}';
+			}
 			$request = json_decode($json, true);
-			if ($request === null)
-				throw new \Exception("Failing to json decode the data request: $json converted from $data. ");
+			if ($request === null) {
+							throw new \Exception("Failing to json decode the data request: $json converted from $data. ");
+			}
 		}
 		return $request;
 	}
@@ -360,10 +372,12 @@ 
 		$dps = array_intersect_key($params, array_flip($dpa));
 		if (count($dps)) {
 			$data = [];
-			if ((isset($dps['dds']) || isset($dps['dds_page'])) && empty($dps['dds_class']))
-				$dps['dds_class'] = $params['type'];
-			if (isset($dps['dds_class']))
-				$data[] = "'class':'$dps[dds_class]'";
+			if ((isset($dps['dds']) || isset($dps['dds_page'])) && empty($dps['dds_class'])) {
+							$dps['dds_class'] = $params['type'];
+			}
+			if (isset($dps['dds_class'])) {
+							$data[] = "'class':'$dps[dds_class]'";
+			}
 
 			// create the filters
 			$filters = [];
@@ -371,9 +385,9 @@ 
 			// create the page specific filter
 			if (!empty($dps['dds_page'])) {
 				$pageId = null;
-				if ($dps['dds_page'] === true || $dps['dds_page'] === 'true')
-					$pageId = neon()->cms->getPage()->getId();
-				else {
+				if ($dps['dds_page'] === true || $dps['dds_page'] === 'true') {
+									$pageId = neon()->cms->getPage()->getId();
+				} else {
 					// either a nice id or a page id
 					// $pageId = self::$page->niceId2PageId($dps['dds_page']);
 					// if (!$pageId)
@@ -381,43 +395,51 @@ 
 					// object therefore has not worked for a while!
 					$pageId = $dps['dds_page'];
 				}
-				if ($pageId)
-					$filters[] = "['page_id','=','$pageId']";
+				if ($pageId) {
+									$filters[] = "['page_id','=','$pageId']";
+				}
 			}
 
 			// add other filters
 			if (isset($dps['dds_filter']) && !empty($dps['dds_filter'])) {
-				if (is_array($dps['dds_filter']))
-					$filters[] = json_encode($dps['dds_filter']);
+				if (is_array($dps['dds_filter'])) {
+									$filters[] = json_encode($dps['dds_filter']);
+				}
 				// else deprecated json approach
-				else if (strpos(trim($dps['dds_filter']), '[')!==0)
-					$filters[] = "[$dps[dds_filter]]";
-				else
-					$filters[] = $dps['dds_filter'];
+				else if (strpos(trim($dps['dds_filter']), '[')!==0) {
+									$filters[] = "[$dps[dds_filter]]";
+				} else {
+									$filters[] = $dps['dds_filter'];
+				}
 			}
 
 			// create the filters clause
-			if (count($filters))
-				$data[] = "'filters':".implode(',',$filters);
+			if (count($filters)) {
+							$data[] = "'filters':".implode(',',$filters);
+			}
 
 			// sort out the order
 			if (isset($dps['dds_order'])) {
-				if (is_array($dps['dds_order']))
-					$data[] = "'order':".json_encode($dps['dds_order']);
+				if (is_array($dps['dds_order'])) {
+									$data[] = "'order':".json_encode($dps['dds_order']);
+				}
 				// else deprecated json approach
-				else
-					$data[] = "'order':{".$dps['dds_order']."}";
+				else {
+									$data[] = "'order':{".$dps['dds_order']."}";
+				}
 			}
 
 			// sort out the limit
 			if (isset($dps['dds_limit'])) {
-				if (is_numeric($dps['dds_limit']))
-					$data[] = "'limit':{'length':$dps[dds_limit]}";
-				else if (is_array($dps['dds_limit']))
-					$data[] = "'limit':".json_encode($dps['dds_limit']);
+				if (is_numeric($dps['dds_limit'])) {
+									$data[] = "'limit':{'length':$dps[dds_limit]}";
+				} else if (is_array($dps['dds_limit'])) {
+									$data[] = "'limit':".json_encode($dps['dds_limit']);
+				}
 				// else deprecated json approach
-				else
-					$data[] = "'limit':{".$dps['dds_limit']."}";
+				else {
+									$data[] = "'limit':{".$dps['dds_limit']."}";
+				}
 			}
 			$params['data'] = '{'.implode(', ', $data).'}';
 		}
@@ -434,8 +456,9 @@ 
 	protected function canonicalise($params)
 	{
 		$canon = [];
-		if (empty($params['assign']) && $this->renderer !== null)
-			throw new \InvalidArgumentException("You must set an 'assign' parameter when using the 'dds' tag");
+		if (empty($params['assign']) && $this->renderer !== null) {
+					throw new \InvalidArgumentException("You must set an 'assign' parameter when using the 'dds' tag");
+		}
 		foreach ($params as $k => $v) {
 			if ($k == 'assign') {
 				$canon[$k] = $v;
@@ -465,8 +488,9 @@ 
 				$classType = $d['_class_type'];
 				foreach ($d as $field=>$value) {
 					// ignore all bookkeeping fields
-					if (strpos($field, '_')===0)
-						continue;
+					if (strpos($field, '_')===0) {
+											continue;
+					}
 					$edit[$i][$field] = self::createFieldEditable($classType, $field, $d['_uuid'], $value);
 				}
 			}
@@ -488,8 +512,9 @@ 
 	 */
 	public static function createFieldEditable($classType, $field, $key, $value)
 	{
-		if (is_array($value))
-			return $value;
+		if (is_array($value)) {
+					return $value;
+		}
 
 		/**
 		 * This needs to be changed to generate an appropriate form to edit the

neon/core/form/fields/ImageMultiple.php

Spacing +3 added lines, -3 removed lines

@@ -47,14 +47,14 @@
 		];
 	}
 
-	public function getValueDisplay($context='')
+	public function getValueDisplay($context = '')
 	{
 		$json = $this->getValue();
 		if (empty($json))
 			return neon()->formatter->asJson($this->getValue());
-		if ($context==='grid') {
+		if ($context === 'grid') {
 			$out = '';
-			foreach($json as $image) {
+			foreach ($json as $image) {
 				$url = neon()->firefly->getImage($image);
 				$out .= "<img src='$url' />";
 			}

Braces +9 added lines, -6 removed lines

@@ -24,10 +24,12 @@ 
 
 	public function setValue($value)
 	{
-		if (is_array($value))
-			$this->_value = $value;
-		if (is_string($value))
-			$this->_value = json_decode($value);
+		if (is_array($value)) {
+					$this->_value = $value;
+		}
+		if (is_string($value)) {
+					$this->_value = json_decode($value);
+		}
 	}
 
 	/**
@@ -62,8 +64,9 @@ 
 	public function getValueDisplay($context='')
 	{
 		$json = $this->getValue();
-		if (empty($json))
-			return neon()->formatter->asJson($this->getValue());
+		if (empty($json)) {
+					return neon()->formatter->asJson($this->getValue());
+		}
 		if ($context==='grid') {
 			$out = '';
 			foreach($json as $image) {

neon/cms/form/fields/ImageCompare.php

Spacing +3 added lines, -3 removed lines

@@ -48,14 +48,14 @@
 		];
     }
     
-    public function getValueDisplay($context='')
+    public function getValueDisplay($context = '')
 	{
 		$json = $this->getValue();
 		if (empty($json))
 			return neon()->formatter->asJson($this->getValue());
-		if ($context==='grid') {
+		if ($context === 'grid') {
 			$out = '';
-			foreach($json as $image) {
+			foreach ($json as $image) {
 				$url = neon()->firefly->getImage($image);
 				$out .= "<img src='$url' />";
 			}

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
     public function getValueDisplay($context='')
 	{
 		$json = $this->getValue();
-		if (empty($json))
-			return neon()->formatter->asJson($this->getValue());
+		if (empty($json)) {
+					return neon()->formatter->asJson($this->getValue());
+		}
 		if ($context==='grid') {
 			$out = '';
 			foreach($json as $image) {

Indentation +9 added lines, -9 removed lines

@@ -14,21 +14,21 @@ 
 
 class ImageCompare extends ImageMultiple
 {
-    /**
+	/**
 	 * @inheritdoc
 	 */
-    public $ddsDataType = 'json';
+	public $ddsDataType = 'json';
 
-    /**
+	/**
 	 * @inheritdoc
 	 */
 	public function registerScripts($view)
 	{
-        $view->registerAssetBundle(\neon\cms\assets\CmsFormAsset::class);
+		$view->registerAssetBundle(\neon\cms\assets\CmsFormAsset::class);
 		$view->registerAssetBundle(\neon\firefly\assets\BrowserAsset::class);
-    }
+	}
 
-    /**
+	/**
 	 * @inheritdoc
 	 */
 	public function getFilterField()
@@ -36,7 +36,7 @@ 
 		return ['class' => 'neon\\core\\form\\fields\\Text'];
 	}
 
-    /**
+	/**
 	 * @inheritdoc
 	 */
 	public function getComponentDetails()
@@ -44,9 +44,9 @@ 
 		return [
 			'icon' => 'fa fa-image', 'group' => 'Media', 'order' => 612, 'label' => 'Image Compare'
 		];
-    }
+	}
 
-    public function getValueDisplay($context='')
+	public function getValueDisplay($context='')
 	{
 		$json = $this->getValue();
 		if (empty($json))

neon/firefly/services/ImageManager.php

Braces +9 added lines, -5 removed lines

@@ -38,11 +38,13 @@ 
 	{
 		// get firefly image if the source is a firefly id
 		if (Hash::isUuid64($source)) {
-			if (!neon()->firefly->fileManager->exists($source))
-				throw new HttpException(404);
+			if (!neon()->firefly->fileManager->exists($source)) {
+							throw new HttpException(404);
+			}
 			$meta = neon()->firefly->fileManager->getMeta($source);
-			if ($meta['mime_type'] == 'image/svg')
-				return neon()->firefly->fileManager->read($source);
+			if ($meta['mime_type'] == 'image/svg') {
+							return neon()->firefly->fileManager->read($source);
+			}
 			$source = neon()->firefly->fileManager->readStream($source);
 		}
 		$manager = new InterventionImageManager();
@@ -103,7 +105,9 @@ 
 	public function imageRotate(Image & $image, $params)
 	{
 		$rotate = Arr::get($params, 'rotate', false);
-		if ($rotate) $image->rotate($rotate);
+		if ($rotate) {
+			$image->rotate($rotate);
+		}
 	}
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
 			// add callback functionality to retain maximal original image size
 			$options = ['top-left', 'top', 'top-right', 'left', 'center', 'right', 'bottom-left', 'bottom', 'bottom-right'];
 			$option = in_array($params['fit'], $options) ? $params['fit'] : 'center';
-			$image->fit($width, $height, function ($constraint) {
+			$image->fit($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			}, $option);
@@ -93,7 +93,7 @@ 
 		} elseif ($width || $height) {
 			$width = $width * $pd;
 			$height = $height * $pd;
-			$image->resize($width, $height, function ($constraint) {
+			$image->resize($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			});
@@ -153,7 +153,7 @@ 
 	{
 		$filter = Arr::get($params, 'filter', false);
 		if ($filter) {
-			$filters = explode(',',$filter);
+			$filters = explode(',', $filter);
 			if (in_array('greyscale', $filters, true)) {
 				$image->greyscale();
 			}
@@ -188,7 +188,7 @@ 
 				$x = Arr::get($crop, 'x', null);
 				$y = Arr::get($crop, 'y', null);
 			}
-			if ($w == 0 && $h == 0 && $x == 0 && $y ==0) {
+			if ($w == 0 && $h == 0 && $x == 0 && $y == 0) {
 				return $image;
 			}
 			$image->crop($w, $h, $x, $y);

neon/cms/controllers/RenderController.php

Spacing +5 added lines, -5 removed lines

@@ -82,13 +82,13 @@ 
 	 * slug it uses - without this property the canonical function will return the url of the first blog-post
 	 * (collection page) it finds.
 	 */
-	public function actionPage($nice_id, $slug='')
+	public function actionPage($nice_id, $slug = '')
 	{
 		\Neon::beginProfile('COBE::RENDER_ACTION', 'cobe');
 		$cms = $this->getCms();
 		$page = $cms->getPage();
 		// check the page with the nice_id exists
-		if (! $page->setById($nice_id)) {
+		if (!$page->setById($nice_id)) {
 			$this->pageNotFound();
 		}
 		//return neon()->view->injectHtml('');
@@ -103,7 +103,7 @@ 
 		}
 
 		// Don't display draft pages unless in edit mode.
-		if ($page->isStatusDraft() && ! $page->isInEditMode()) {
+		if ($page->isStatusDraft() && !$page->isInEditMode()) {
 			$this->pageNotFound();
 		}
 
@@ -135,8 +135,8 @@ 
 			->innerJoin(CmsPage::tableName(), 'cms_page.nice_id = cms_url.nice_id')
 			->where("status='PUBLISHED'")
 			->all()
-		)->reduce(function($carry, $url){
-			return $carry . "\t<url>\n\t\t<loc>" . url($url['url'], true) . "</loc>\n\t</url>" . "\n";
+		)->reduce(function($carry, $url) {
+			return $carry."\t<url>\n\t\t<loc>".url($url['url'], true)."</loc>\n\t</url>"."\n";
 		});
 		header('Content-Type:application/rss+xml');
 		echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";

Braces +9 added lines, -6 removed lines

@@ -108,8 +108,9 @@ 
 		}
 
 		$render = $page->render();
-		if ($render === false)
-			throw new \yii\web\HttpException(404, 'No template found');
+		if ($render === false) {
+					throw new \yii\web\HttpException(404, 'No template found');
+		}
 
 		\Neon::endProfile('COBE::RENDER_ACTION', 'cobe');
 
@@ -153,10 +154,12 @@ 
 	{
 		$request = neon()->request;
 		$url = $request->get('page');
-		if (!$url)
-			$this->pageNotFound();
-		if (($urlEntry = CmsUrl::findByUrl($url)))
-			return $this->actionPage($urlEntry['nice_id']);
+		if (!$url) {
+					$this->pageNotFound();
+		}
+		if (($urlEntry = CmsUrl::findByUrl($url))) {
+					return $this->actionPage($urlEntry['nice_id']);
+		}
 		$this->pageNotFound();
 	}