newicon / neon

neon/user/controllers/InviteController.php

Spacing +2 added lines, -2 removed lines

@@ -87,11 +87,11 @@
 			// allow authenticated users if invites are allowed
 			[
 				'allow' => setting('user', 'allowUserInvitations', false),
-				'roles' => [ 'neon-administrator' ]
+				'roles' => ['neon-administrator']
 			],
 			[
 				'allow' => setting('user', 'allowUserInvitations', false),
-				'matchCallback' => function ($rule, $action) {
+				'matchCallback' => function($rule, $action) {
 					return neon()->user->isSuper();
 				}
 			]

neon/user/forms/PasswordResetRequest.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 				return neon()->mailer->compose($templates, $templateData)
 					->setFrom([$fromAddress => $fromName])
 					->setTo($this->email)
-					->setSubject('Password reset for ' . $siteName)
+					->setSubject('Password reset for '.$siteName)
 					->send();
 			}
 		}

neon/user/migrations/m20200407_122322_user_store_user_uuid.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		// the key fields in this table are responsible for the session
 		// this is the session id, expire and data fields.  After that the next important field is the user_uuid
 		// then the following additional information fields
-		$this->addColumn(\neon\user\models\Session::tableName(), 'user_uuid', $this->uuid64()  .' AFTER `data`');
+		$this->addColumn(\neon\user\models\Session::tableName(), 'user_uuid', $this->uuid64().' AFTER `data`');
 	}
 
 	public function safeDown()

neon/user/migrations/m181128_143758_user_create_invite_table.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	{
 	    $this->createTable(UserInvite::tableName(), [
 		    'token'=>'varchar(255) CHARACTER SET latin1 COLLATE latin1_general_cs PRIMARY KEY COMMENT "The token"',
-		    'user_id'=> $this->uuid64( 'foreign key of the user who owns this token')->notNull(),
+		    'user_id'=> $this->uuid64('foreign key of the user who owns this token')->notNull(),
 		    // timestamps
 		    'expires_at' => $this->dateTime(),
 		    'created_at' => $this->createdAt(),

neon/user/migrations/m140506_102106_user_init.php

Spacing +4 added lines, -4 removed lines

@@ -71,22 +71,22 @@
 			'created_at' => $this->integer(),
 			'updated_at' => $this->integer(),
 			'PRIMARY KEY (name)',
-			'FOREIGN KEY (rule_name) REFERENCES ' . neon()->authManager->ruleTable . ' (name) ON DELETE SET NULL ON UPDATE CASCADE'
+			'FOREIGN KEY (rule_name) REFERENCES '.neon()->authManager->ruleTable.' (name) ON DELETE SET NULL ON UPDATE CASCADE'
 		]);
 		$this->createIndex('idx-auth_item-type', AuthItem::tableName(), 'type');
 		$this->createTable(AuthItemChild::tableName(), [
 			'parent' => $this->string(64)->notNull(),
 			'child' => $this->string(64)->notNull(),
 			'PRIMARY KEY (parent, child)',
-			'FOREIGN KEY (parent) REFERENCES ' . neon()->authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
-			'FOREIGN KEY (child) REFERENCES ' . neon()->authManager->itemTable  . ' (name) ON DELETE CASCADE ON UPDATE CASCADE'
+			'FOREIGN KEY (parent) REFERENCES '.neon()->authManager->itemTable.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+			'FOREIGN KEY (child) REFERENCES '.neon()->authManager->itemTable.' (name) ON DELETE CASCADE ON UPDATE CASCADE'
 		]);
 		$this->createTable(AuthAssignment::tableName(), [
 			'item_name' => $this->string(64)->notNull(),
 			'user_id' => $this->string(64)->notNull(),
 			'created_at' => $this->integer(),
 			'PRIMARY KEY (item_name, user_id)',
-			'FOREIGN KEY (item_name) REFERENCES ' . neon()->authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+			'FOREIGN KEY (item_name) REFERENCES '.neon()->authManager->itemTable.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
 		]);
 		$this->createTable(Session::tableName(), [
 			'id' => 'CHAR(64) NOT NULL PRIMARY KEY',

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

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

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