newicon / neon

neon/user/models/UserInvite.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 	public static function getInvite($token)
 	{
 		static $_invite;
-		if ($_invite === null){
+		if ($_invite === null) {
 			$_invite = self::findOne(['token' => $token]);
 		}
 		return $_invite;

neon/user/grid/UserGrid.php

Spacing +6 added lines, -6 removed lines

@@ -45,10 +45,10 @@ 
 			$this->addTextColumn('impersonate')->setFilter(false);
 		// scopes
 		// $this->addScope('all','All');
-		$this->addScope('active','Active');
-		$this->addScope('pending','Pending');
-		$this->addScope('suspended','Suspended');
-		$this->addScope('banned','Banned');
+		$this->addScope('active', 'Active');
+		$this->addScope('pending', 'Pending');
+		$this->addScope('suspended', 'Suspended');
+		$this->addScope('banned', 'Banned');
 		$this->addScope('super', 'Super');
 
 		$this->setPageSize(100);
@@ -196,7 +196,7 @@ 
 	 */
 	private function getRoles()
 	{
-		static $roles=null;
+		static $roles = null;
 		if (is_null($roles)) {
 			$roles = neon('user')->getRoles(true);
 		}
@@ -210,7 +210,7 @@ 
 	 */
 	private function getRoleLabels()
 	{
-		static $labels=null;
+		static $labels = null;
 		if (is_null($labels)) {
 			$roles = $this->getRoles();
 			foreach ($roles as $role => $details)

neon/user/services/apiTokenManager/JwtTokenAuth.php

Spacing +4 added lines, -4 removed lines

@@ -113,13 +113,13 @@ 
 		try {
 			$jwt = (array) JWT::decode($cookieString, static::secret(), ['HS256']);
 		} catch (Exception $e) {
-			throw new UnauthorizedHttpException('Your request was made with invalid credentials.' . neon()->debug ? ' Can not decode JWT token' : '');
+			throw new UnauthorizedHttpException('Your request was made with invalid credentials.'.neon()->debug ? ' Can not decode JWT token' : '');
 		}
 		// We will compare the CSRF token in the decoded API token against the CSRF header
 		// sent with the request. If the two don't match then this request is sent from
 		// an invalid source and we won't authenticate the request for further handling.
 		if (!$this->validCsrf($jwt, $request)) {
-			throw new UnauthorizedHttpException('Your request was made with invalid credentials.' . neon()->debug ? ' CSRF validation failed' : '');
+			throw new UnauthorizedHttpException('Your request was made with invalid credentials.'.neon()->debug ? ' CSRF validation failed' : '');
 		}
 
 		return $jwt;
@@ -215,7 +215,7 @@ 
 	 */
 	protected static function requestShouldReceiveFreshToken(Request $request)
 	{
-		return $request->isMethod('GET') && neon()->user->isLoggedIn() && ! $request->getIsAjax();
+		return $request->isMethod('GET') && neon()->user->isLoggedIn() && !$request->getIsAjax();
 	}
 
 	/**
@@ -227,6 +227,6 @@ 
 	protected static function responseShouldReceiveFreshToken(Response $response)
 	{
 		// if the cookie already exists do not create another one
-		return ! isset($response->cookies[static::$cookieName]);
+		return !isset($response->cookies[static::$cookieName]);
 	}
 }
\ No newline at end of file

neon/user/services/apiTokenManager/models/UserApiToken.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 	 */
 	public function getHttpBasicAuthorizationBase64()
 	{
-		return base64_encode($this->user_id . ':' . $this->token);
+		return base64_encode($this->user_id.':'.$this->token);
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @param string $name
 	 * @return UserApiToken|null
 	 */
-	public static function generateTokenFor($userId, $name='')
+	public static function generateTokenFor($userId, $name = '')
 	{
 		$token = UserApiToken::getTokenRecord($userId);
 		// extra security:

neon/user/services/UserManager.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listUsers(Iterator &$iterator=null)
+	public function listUsers(Iterator &$iterator = null)
 	{
 		return $this->findUsers(null, $iterator);
 	}
@@ -55,7 +55,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function searchUsers($searchString, Iterator &$iterator=null)
+	public function searchUsers($searchString, Iterator &$iterator = null)
 	{
 		return $this->findUsers(['like', 'username', $searchString], $iterator);
 	}
@@ -63,7 +63,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addUser($username, $email, $password, $roles=[], $superuser=false)
+	public function addUser($username, $email, $password, $roles = [], $superuser = false)
 	{
 		$user = new UserModel;
 		$user->uuid = Hash::uuid64();
@@ -95,7 +95,7 @@ 
 				'uuid'=>$user->uuid,
 				'username'=>$user->username,
 				'email'=>$user->email,
-				'superuser'=>(boolean)$user->super,
+				'superuser'=>(boolean) $user->super,
 				'status' => $user->status,
 				'roles'=>$user->getRoles()
 			];
@@ -113,7 +113,7 @@ 
 	{
 		$user = $this->findUserModel($uuid);
 		if ($user) {
-			$newValues = array_intersect_key($changes, array_flip(['email','password','roles']));
+			$newValues = array_intersect_key($changes, array_flip(['email', 'password', 'roles']));
 			foreach ($newValues as $key=>$value) {
 				$user->$key = $value;
 			}
@@ -153,7 +153,7 @@ 
 	 *   for the query.
 	 * @param Iterator $iterator  an iterator to go over the query
 	 */
-	private function findUsers($where, Iterator &$iterator=null) 
+	private function findUsers($where, Iterator &$iterator = null) 
 	{
 		$iterator = $iterator ? $iterator : new Iterator;
 
@@ -163,7 +163,7 @@ 
 		}
 
 		// get the rows
-		$query = UserModel::find()->select(['uuid','username'])
+		$query = UserModel::find()->select(['uuid', 'username'])
 			->limit($iterator->length)
 			->offset($iterator->start)
 			->orderBy('username');

neon/user/services/User.php

Spacing +5 added lines, -5 removed lines

@@ -226,7 +226,7 @@ 
 	 * @param int $size
 	 * @return string
 	 */
-	public function getGuestUserImageUrl($size=40)
+	public function getGuestUserImageUrl($size = 40)
 	{
 		return "//www.gravatar.com/avatar?d=mm&s=$size";
 	}
@@ -234,7 +234,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getImageUrl($size=40)
+	public function getImageUrl($size = 40)
 	{
 		return $this->noIdentity() ? $this->getGuestUserImageUrl($size) : $this->identity->getImageUrl($size);
 	}
@@ -276,7 +276,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getHomeUrl($role=null)
+	public function getHomeUrl($role = null)
 	{
 		return $this->noIdentity() ? null : $this->identity->getHomeUrl($role);
 	}
@@ -295,13 +295,13 @@ 
 		foreach ($userRoles as $ur) {
 			if (array_key_exists('homeUrl', $appRoles[$ur])) {
 				$url = $appRoles[$ur]['homeUrl'];
-				return parent::getReturnUrl( is_array($url) ? $url : [ $url ]);
+				return parent::getReturnUrl(is_array($url) ? $url : [$url]);
 			}
 		}
 
 		// use the default or application set one
 		if ($defaultUrl)
-			return parent::getReturnUrl( is_array($defaultUrl) ? $defaultUrl : [ $defaultUrl ] );
+			return parent::getReturnUrl(is_array($defaultUrl) ? $defaultUrl : [$defaultUrl]);
 
 		return parent::getReturnUrl();
 	}

neon/user/services/UserInvite.php

Spacing +1 added lines, -1 removed lines

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

neon/user/plugins/smarty/function.getUser.php

Spacing +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
  */
 function smarty_function_getUser($params, $template)
 {
-	$assign = isset($params['assign'])?$params['assign']:'user';
+	$assign = isset($params['assign']) ? $params['assign'] : 'user';
 	$template->assign($assign, neon()->user);
 }

neon/user/web/DbSession.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  */
 class DbSession extends \yii\web\DbSession
 {
-	protected function composeFields($id=null, $data=null)
+	protected function composeFields($id = null, $data = null)
 	{
 		// NOTE: do not interact with the identity inside this call
 		// this will trigger a "session_regenerate_id(): Cannot call session save handler in a recursive manner" error