newicon / neon

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

neon/install/forms/InstallDatabase.php

Spacing +8 added lines, -8 removed lines

@@ -6,7 +6,7 @@ 
 
 class InstallDatabase extends \yii\base\Model
 {
-	public $name='';
+	public $name = '';
 	public $username;
 	public $password;
 	public $host = 'localhost';
@@ -52,18 +52,18 @@ 
 		} else {
 			if ($result == InstallHelper::ERROR_DB_UNKNOWN_DATABASE) {
 				// Attempt to create the database (if asked to do so)
-				if ($this->create_database == 1 ) {
-					if (! $this->createDatabase($exception)) {
+				if ($this->create_database == 1) {
+					if (!$this->createDatabase($exception)) {
 						$this->error_message = 'cant_create_database';
-						$this->addError('name', 'Failed to create database "' . $this->name . '" Database error: ' . $exception);
+						$this->addError('name', 'Failed to create database "'.$this->name.'" Database error: '.$exception);
 					}
-				}  else {
+				} else {
 					$this->error_message = 'unknown_database';
-					$this->addError('name', 'Unknown database name "' . $this->name . '"');
+					$this->addError('name', 'Unknown database name "'.$this->name.'"');
 				}
 			} else if ($result == InstallHelper::ERROR_DB_UNKNOWN_HOST) {
 				$this->error_message = 'unknown_host';
-				$this->addError('host', 'Unknown host name "' . $this->host . '"');
+				$this->addError('host', 'Unknown host name "'.$this->host.'"');
 			} else if ($result == InstallHelper::ERROR_DB_ACCESS_DENIED) {
 				$this->error_message = 'access_denied';
 				$this->addError('username', 'The username either does not exist or does not work with the given password');
@@ -87,7 +87,7 @@ 
 			$config['dsn'] = 'mysql:host='.$this->host.';';
 			$connection = new \neon\core\db\Connection($config);
 			try {
-				$connection->createCommand('CREATE DATABASE ' . $this->name)->execute();
+				$connection->createCommand('CREATE DATABASE '.$this->name)->execute();
 			} catch (\yii\db\Exception $e) {
 				// could not create the database
 				$exception = $e->getMessage();

Braces +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 						$this->error_message = 'cant_create_database';
 						$this->addError('name', 'Failed to create database "' . $this->name . '" Database error: ' . $exception);
 					}
-				}  else {
+				} else {
 					$this->error_message = 'unknown_database';
 					$this->addError('name', 'Unknown database name "' . $this->name . '"');
 				}

neon/install/forms/InstallUser.php

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,9 @@
 	 */
 	public function createUser(&$user)
 	{
-		if (!$this->validate())
-			return false;
+		if (!$this->validate()) {
+					return false;
+		}
 		$user = new User();
 		$user->username = $this->username;
 		$user->email = $this->email;

neon/daedalus/interfaces/IDdsChangeLogManagement.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
 	 * @param \neon\core\helpers\Iterator $iterator  Iterate over the results.
 	 * @return array  the change log data
 	 */
-	public function listChangeLog($fromDate=null, Iterator $iterator=null);
+	public function listChangeLog($fromDate = null, Iterator $iterator = null);
 
 	/**
 	 * List an object's change log, if the object's class has been set up to store changes
@@ -73,7 +73,7 @@ 
 	 * @return If the object's class is set to have a change log, this will return the
 	 *   change log for this object. Otherwise it will return a blank array.
 	 */
-	public function listObjectChangeLog($uuid, $fromDate=null, Iterator $iterator=null);
+	public function listObjectChangeLog($uuid, $fromDate = null, Iterator $iterator = null);
 
 	/**
 	 * List the history of an object, if the object's class has been set up to store changes.
@@ -84,7 +84,7 @@ 
 	 * @return If the object's class is set to have a change log, this will return the
 	 *   history for this object. Otherwise it will return a blank array.
 	 */
-	public function listObjectHistory($uuid, $fromDate=null, Iterator $iterator=null);
+	public function listObjectHistory($uuid, $fromDate = null, Iterator $iterator = null);
 
 	/**
 	 * Clear change log to a certain date and optionally for particular class types
@@ -98,7 +98,7 @@ 
 	 *   then the $classList is the set of log items to be preserved and all
 	 *   others are cleared.
 	 */
-	public function clearChangeLog($toDate, $classList=[], $clearClassList=true);
+	public function clearChangeLog($toDate, $classList = [], $clearClassList = true);
 
 	/**
 	 * Clear an object's change log
@@ -124,7 +124,7 @@ 
 	 *   This can be empty, if the item was deleted or destroyed for example.
 	 * @return string  the uuid of the created log entry
 	 */
-	public function addLogEntry($objectUuid, $class, $changeKey, $before=[], $after=[]);
+	public function addLogEntry($objectUuid, $class, $changeKey, $before = [], $after = []);
 
 	/**
 	 * Get the log entry
@@ -163,7 +163,7 @@ 
 	 * @param array $associateObjectUuids  any associated objects that are related to the principal one.
 	 * @return string  the uuid of the created log entry
 	 */
-	public function addGeneralComment($module, $classType, $comment, $objectUuid=null, array $associateObjectUuids=[]);
+	public function addGeneralComment($module, $classType, $comment, $objectUuid = null, array $associateObjectUuids = []);
 
 	/**
 	 * Get an object's value at a particular log point.