newicon / neon

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/m170104_26042017_user_api_tokens.php

Indentation +21 added lines, -21 removed lines

@@ -6,30 +6,30 @@
 class m170104_26042017_user_api_tokens extends Migration
 {
 
-    /**
-     * @inheritdoc
-     * Install the User, AuthRule, AuthItem, AuthItemChild, AuthAssignment tables
-     */
+	/**
+	 * @inheritdoc
+	 * Install the User, AuthRule, AuthItem, AuthItemChild, AuthAssignment tables
+	 */
 	public function safeUp()
-    {
+	{
 		$sql = "DROP TABLE IF EXISTS ".UserApiToken::tableName();
 		\Yii::$app->getDb()->createCommand($sql)->execute();
 
-	    $this->createTable(UserApiToken::tableName(), [
-		    'token'=>'varchar(64) PRIMARY KEY COMMENT "The token"',
-	    	'name' => 'varchar(100) COMMENT "A name for this token"',
-		    'user_id'=>'int COMMENT "foreign key of the user who owns this token"',
-		    'active'=>'int not null default 0 COMMENT "whether the token is currently active, 1 is an active token, 0 is a non active token and will not produce successful requests"',
-		    'last_used'=>'datetime COMMENT "store the date and time of the last request that used this token"',
-		    'used_count'=>'int not null default 0 COMMENT "number of times this token has been used"',
-		    // timestamps
-		    'created_at' =>  $this->createdAt(),
-		    'updated_at' =>  $this->updatedAt(),
-	    ]);
-    }
+		$this->createTable(UserApiToken::tableName(), [
+			'token'=>'varchar(64) PRIMARY KEY COMMENT "The token"',
+			'name' => 'varchar(100) COMMENT "A name for this token"',
+			'user_id'=>'int COMMENT "foreign key of the user who owns this token"',
+			'active'=>'int not null default 0 COMMENT "whether the token is currently active, 1 is an active token, 0 is a non active token and will not produce successful requests"',
+			'last_used'=>'datetime COMMENT "store the date and time of the last request that used this token"',
+			'used_count'=>'int not null default 0 COMMENT "number of times this token has been used"',
+			// timestamps
+			'created_at' =>  $this->createdAt(),
+			'updated_at' =>  $this->updatedAt(),
+		]);
+	}
 
-    public function safeDown()
-    {
-	    $this->dropTable(UserApiToken::tableName());
-    }
+	public function safeDown()
+	{
+		$this->dropTable(UserApiToken::tableName());
+	}
 }

neon/user/migrations/m181128_143758_user_create_invite_table.php

Indentation +11 added lines, -11 removed lines

@@ -7,17 +7,17 @@
 {
 	public function safeUp()
 	{
-	    $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(),
-		    // timestamps
-		    'expires_at' => $this->dateTime(),
-		    'created_at' => $this->createdAt(),
-		    'updated_at' => $this->updatedAt(),
-		    // blames
-		    'created_by' => $this->createdBy(),
-		    'updated_by' => $this->updatedBy()
-	    ]);
+		$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(),
+			// timestamps
+			'expires_at' => $this->dateTime(),
+			'created_at' => $this->createdAt(),
+			'updated_at' => $this->updatedAt(),
+			// blames
+			'created_by' => $this->createdBy(),
+			'updated_by' => $this->updatedBy()
+		]);
 	}
 
 	public function safeDown()

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/migrations/m171214_150436_user_add_admin_role.php

Indentation +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	public function safeDown()
 	{
 		$auth = neon()->authManager;
-        $auth->removeAll();
+		$auth->removeAll();
 	}
 
 }
\ No newline at end of file

neon/user/migrations/m171220_130000_user_add_uuid_column.php

Braces +3 added lines, -2 removed lines

@@ -17,8 +17,9 @@
 		$this->addColumn(User::tableName(), 'uuid', 'char(22) AFTER `id`');
 		// fetch 50 users at a time and iterate them one by one
 		// save call will automatically create the uuid if it currently does not exist
-		foreach (User::find()->each(50) as $user)
-			$user->save(false, [User::UUID]);
+		foreach (User::find()->each(50) as $user) {
+					$user->save(false, [User::UUID]);
+		}
 		// create a unique index
 		$this->createIndex('uuid', User::tableName(), 'uuid', true);
 	}

neon/user/migrations/m161211_160816_user_correct_current_field.php

Indentation +6 added lines, -6 removed lines

@@ -5,23 +5,23 @@
 class m161211_160816_user_correct_current_field extends Migration
 {
 
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		/**
 		 * fix an incorrect definition of current in the code and make the name more meaningful
 		 */
 		$table = \neon\user\models\Session::tableName();
 		$this->dropColumn($table, 'current');
 		$this->addColumn($table, 'current_url', $this->string(1000)->comment('The current url the user requested in this session'));
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		/**
 		 * revert back to the broken definition
 		 */
 		$table = \neon\user\models\Session::tableName();
 		$this->dropColumn($table, 'current_url');
 		$this->addColumn($table, 'current', $this->dateTime()->comment('The current url the user requested in this session'));
-    }
+	}
 }

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