newicon / neon

neon/user/migrations/m170104_161200_use_baseclass_timestamps.php

Indentation +6 added lines, -6 removed lines

@@ -5,17 +5,17 @@
 class m170104_161200_use_baseclass_timestamps extends Migration
 {
 
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$table = \neon\user\models\User::tableName();
 		$this->renameColumn($table, 'created_on', 'created_at');
 		$this->renameColumn($table, 'updated_on', 'updated_at');
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$table = \neon\user\models\User::tableName();
 		$this->renameColumn($table, 'created_at', 'created_on');
 		$this->renameColumn($table, 'updated_at', 'updated_on');
-    }
+	}
 }

neon/user/App.php

Spacing +3 added lines, -3 removed lines

@@ -125,7 +125,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getDataMap($key, $query='', $filters=[], $fields=[], $start=0, $length=100)
+	public function getDataMap($key, $query = '', $filters = [], $fields = [], $start = 0, $length = 100)
 	{
 		if ($key === 'users') {
 			return User::getUserList($query, $filters, $fields, $start, $length);
@@ -276,7 +276,7 @@ 
 	 * @param array &$roles  the roles that matched
 	 * @return boolean  whether it matched any roles
 	 */
-	public function routeHasRoles($route, &$roles=null)
+	public function routeHasRoles($route, &$roles = null)
 	{
 		$roles = [];
 		foreach ($this->_routes as $r) {
@@ -285,7 +285,7 @@ 
 			}
 		}
 		// allow guest access if this is the only allowed role
-		if (count($roles)==1 && isset($roles['?']))
+		if (count($roles) == 1 && isset($roles['?']))
 			return false;
 		// otherwise restrict to requiring a role if one matched
 		return (count($roles) > 0);

Braces +12 added lines, -8 removed lines

@@ -144,8 +144,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 === 'users') {
 			return User::getUserList('', ['uuid' => $ids]);
@@ -255,15 +256,17 @@ 
 	public function setRoles(array $roles)
 	{
 		foreach ($roles as $role => $details) {
-			if (!array_key_exists($role, $this->_roles))
-				$this->_roles[$role] = ['routes'=>[]];
+			if (!array_key_exists($role, $this->_roles)) {
+							$this->_roles[$role] = ['routes'=>[]];
+			}
 			if (array_key_exists('routes', $details)) {
 				foreach ($details['routes'] as $r) {
 					$this->_roles[$role]['routes'][$r] = $r;
 					$this->_routes2Roles[$r][$role] = $role;
 				}
-				if (array_key_exists('homeUrl', $details))
-					$this->_roles[$role]['homeUrl'] = $details['homeUrl'];
+				if (array_key_exists('homeUrl', $details)) {
+									$this->_roles[$role]['homeUrl'] = $details['homeUrl'];
+				}
 				$this->_roles[$role]['label'] = (array_key_exists('label', $details) ? $details['label'] : $role);
 			}
 		}
@@ -285,8 +288,9 @@ 
 			}
 		}
 		// allow guest access if this is the only allowed role
-		if (count($roles)==1 && isset($roles['?']))
-			return false;
+		if (count($roles)==1 && isset($roles['?'])) {
+					return false;
+		}
 		// otherwise restrict to requiring a role if one matched
 		return (count($roles) > 0);
 	}

neon/admin/services/menu/Manager.php

Braces +3 added lines, -2 removed lines

@@ -32,8 +32,9 @@
 			$menu = $app->getMenu();
 			if ($menu !== null) {
 				if (is_int(key($menu))) {
-					foreach ($menu as $menuItem)
-						$this->add('admin', $menuItem);
+					foreach ($menu as $menuItem) {
+											$this->add('admin', $menuItem);
+					}
 				} else {
 					$this->add('admin', $app->getMenu());
 				}

neon/admin/App.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 					['class'=>'email'],
 					['class'=>'required']
 				],
-				'placeholder' => 'e.g. robot@' . strtolower(setting('core', 'site_name', neon()->name)) . '.com'
+				'placeholder' => 'e.g. robot@'.strtolower(setting('core', 'site_name', neon()->name)).'.com'
 			],
 			'fromEmailName' => [
 				'name' => 'fromEmailName',
@@ -43,7 +43,7 @@ 
 				'name' => 'sslOnly',
 				'class' => '\neon\core\form\fields\SwitchButton',
 				'label' => 'Force SSL (https) everywhere',
-				'hint' => 'The application will redirect all requests to secure https requests. ' .
+				'hint' => 'The application will redirect all requests to secure https requests. '.
 					(neon()->isDevMode() ? 'Note: You are currently in dev mode so the redirects to https will not happen' : '')
 			],
 		];

neon/install/helpers/requirements.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
         (for example, plural in
         <a href=\"http://www.yiiframework.com/doc-2.0/yii-i18n-formatter.html#asRelativeTime%28%29-detail\">
         Formatter::asRelativeTime()</a>) in the <code>yii\i18n\Formatter</code> class. Your current ICU version is ' .
-			(defined('INTL_ICU_VERSION') ? INTL_ICU_VERSION : '(ICU is missing)') . '.'
+			(defined('INTL_ICU_VERSION') ? INTL_ICU_VERSION : '(ICU is missing)').'.'
 	],
 	[
 		'name' => 'ICU Data version',
@@ -82,7 +82,7 @@ 
         (for example, plural in
         <a href=\"http://www.yiiframework.com/doc-2.0/yii-i18n-formatter.html#asRelativeTime%28%29-detail\">
         Formatter::asRelativeTime()</a>) in the <code>yii\i18n\Formatter</code> class. Your current ICU Data version is ' .
-			(defined('INTL_ICU_DATA_VERSION') ? INTL_ICU_DATA_VERSION : '(ICU Data is missing)') . '.'
+			(defined('INTL_ICU_DATA_VERSION') ? INTL_ICU_DATA_VERSION : '(ICU Data is missing)').'.'
 	],
 	[
 		'name' => 'Fileinfo extension',

neon/install/helpers/InstallHelper.php

Indentation +1 added lines, -1 removed lines

@@ -335,7 +335,7 @@
 	 * Check the system requirements
 	 * Returns an array of tests that detect if the system meats the requirements for Neon
 	 *
-	* @return array of requirement tests:
+	 * @return array of requirement tests:
 	 *  for e.g:
 	 *
 	 * ```php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public static function getLocalConfigFile()
 	{
-		return \Neon::getALias(DIR_CONFIG . '/env.ini');
+		return \Neon::getALias(DIR_CONFIG.'/env.ini');
 	}
 
 	/**
@@ -42,7 +42,7 @@ 
 
 			0 => 'Ready Check', // (a requirements check stage)
 			1 => 'Configure', // condition=>self::hasLocalConfigFile  // create config file
-			2 => 'Database Install',// condition=>self::tablesExist  // install tables
+			2 => 'Database Install', // condition=>self::tablesExist  // install tables
 			3 => 'Account', // condition=>self::hasUserAccount // install user admin account
 			4 => 'Log In' // (just a "well done, all done", link to log in page)
 		];
@@ -112,7 +112,7 @@ 
 		try {
 			\Neon::$app->db->open();
 			return true;
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
@@ -225,14 +225,14 @@ 
 	public static function getAllMigrations()
 	{
 		$migrations = ['core' => [], 'apps' => []];
-		foreach(neon()->getCoreApps() as $appName => $config) {
+		foreach (neon()->getCoreApps() as $appName => $config) {
 			$app = neon()->getApp($appName);
 			if ($app) {
 				$ms = $app->getNewMigrations();
 				$migrations['core'][$appName] = $ms;
 			}
 		}
-		foreach(neon()->getApps() as $appName => $config) {
+		foreach (neon()->getApps() as $appName => $config) {
 			$app = neon()->getApp($appName);
 			if ($app) {
 				$ms = $app->getNewMigrations();
@@ -397,11 +397,11 @@ 
 	 * @return boolean
 	 * @throws \yii\db\Exception
 	 */
-	private static function checkForUserAccounts($super=false)
+	private static function checkForUserAccounts($super = false)
 	{
 		$userTable = \neon\user\models\User::tableName();
 		try {
-			$query = 'SELECT `id` from ' . $userTable;
+			$query = 'SELECT `id` from '.$userTable;
 			if ($super)
 				$query .= " WHERE `super`=1";
 			$result = neon()->db->createCommand($query)->queryOne();

Braces +6 added lines, -8 removed lines

@@ -377,14 +377,11 @@ 
 			$msg = $e->getMessage();
 			if (preg_match('/\bUnknown database\b/i', $msg)) {
 				return static::ERROR_DB_UNKNOWN_DATABASE;
-			}
-			else if (preg_match('/\bUnknown .* server host\b/i', $msg)) {
+			} else if (preg_match('/\bUnknown .* server host\b/i', $msg)) {
 				return static::ERROR_DB_UNKNOWN_HOST;
-			}
-			else if (preg_match('/\bAccess denied for user\b/i', $msg)) {
+			} else if (preg_match('/\bAccess denied for user\b/i', $msg)) {
 				return static::ERROR_DB_ACCESS_DENIED;
-			}
-			else {
+			} else {
 				return static::ERROR_DB;
 			}
 		}
@@ -402,8 +399,9 @@ 
 		$userTable = \neon\user\models\User::tableName();
 		try {
 			$query = 'SELECT `id` from ' . $userTable;
-			if ($super)
-				$query .= " WHERE `super`=1";
+			if ($super) {
+							$query .= " WHERE `super`=1";
+			}
 			$result = neon()->db->createCommand($query)->queryOne();
 		} catch (\yii\db\Exception $e) {
 			// if this has thrown an exception because the user table does not exist.

neon/install/controllers/AccountController.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		if ($model->load(\Yii::$app->request->post()) && $model->validate()) {
 			$success = $model->createUser($user);
 			if ($success === false) {
-				throw new \Exception('Unable to create and save a valid user ' . print_r($user->getErrors(), true));
+				throw new \Exception('Unable to create and save a valid user '.print_r($user->getErrors(), true));
 			} else {
 				return $this->redirect(['/install/account/complete']);
 			}

neon/install/controllers/DatabaseController.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 */
 	public function actionMigrations()
 	{
-	    ob_start();
+		ob_start();
 		$migrator = new \neon\core\db\Migrator();
 		$migrator->runAllMigrations();
 		$migrations = ob_get_clean();

Spacing +2 added lines, -2 removed lines

@@ -106,10 +106,10 @@
 			// show message saying no config file found
 			// and provide a button to go back to the config step /install/config
 			$errorResponse = $this->render('/install/_error.tpl', [
-				'message' => 'Could not find the database <strong>' . env('DB_NAME') . '</strong>',
+				'message' => 'Could not find the database <strong>'.env('DB_NAME').'</strong>',
 				'buttons' => [
 					[
-						'label' => 'Try to Create &amp; Install Database <strong>' . env('DB_NAME') . '</strong>',
+						'label' => 'Try to Create &amp; Install Database <strong>'.env('DB_NAME').'</strong>',
 						'url' => Url::toRoute(['/install/database/create-database']),
 						'iconClass' => 'fa fa-plus',
 						'type' => 'primary',

Braces +7 added lines, -6 removed lines

@@ -26,10 +26,12 @@ 
 	{
 		neon()->view->params['step'] = 2;
 
-		if ($this->hasLocalConfigError($errorResponse))
-			return $errorResponse;
-		if ($this->hasDatabaseError($errorResponse))
-			return $errorResponse;
+		if ($this->hasLocalConfigError($errorResponse)) {
+					return $errorResponse;
+		}
+		if ($this->hasDatabaseError($errorResponse)) {
+					return $errorResponse;
+		}
 
 		// check if tables have already been installed:
 		if (InstallHelper::coreInstalled()) {
@@ -123,8 +125,7 @@ 
 				]
 			]);
 			return true;
-		}
-		else if ($error !== 0) {
+		} else if ($error !== 0) {
 			// show message saying no config file found
 			// and provide a button to go back to the config step /install/config
 			$errorResponse = $this->render('/install/_error.tpl', [

neon/install/controllers/ConfigController.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 					InstallHelper::createConfigFile($installer);
 					return $this->render('_created');
 				}
-				return $this->render('_show', [ 'config' => InstallHelper::createConfigFileContents($installer) ]);
+				return $this->render('_show', ['config' => InstallHelper::createConfigFileContents($installer)]);
 			}
 		}
 		return $this->render('index', ['model'=>$installer]);