Only pass user's ID into Users::addRole() #7092
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Nitpick-CI
reviewed
Oct 16, 2017
src/Users.php
Outdated
| @@ -152,7 +152,7 @@ public function deleteUser($id) | |||
| { | |||
| $user = $this->getRepository()->find($id); | |||
|
|
|||
| if (!$user) { | |||
| if ( ! $user) { | |||
There was a problem hiding this comment.
Expected 0 spaces after opening bracket; 1 found
Nitpick-CI
reviewed
Oct 16, 2017
src/Users.php
Outdated
| @@ -187,18 +187,18 @@ public function getEmptyUser() | |||
| */ | |||
| public function getUsers() | |||
| { | |||
| if (!empty($this->users)) { | |||
| if ( ! empty($this->users)) { | |||
There was a problem hiding this comment.
Expected 0 spaces after opening bracket; 1 found
Nitpick-CI
reviewed
Oct 16, 2017
src/Users.php
Outdated
| return $this->users; | ||
| } | ||
|
|
||
| try { | ||
| if (!$tempusers = $this->getRepository()->getUsers()) { | ||
| if ( ! $tempusers = $this->getRepository()->getUsers()) { |
There was a problem hiding this comment.
Expected 0 spaces after opening bracket; 1 found
Nitpick-CI
reviewed
Oct 16, 2017
src/Users.php
Outdated
| * @param boolean|integer $enabled | ||
| * | ||
| * @return integer | ||
| */ | ||
| public function setEnabled($id, $enabled = true) | ||
| { | ||
| if (!$user = $this->getUser($id)) { | ||
| if ( ! $user = $this->getUser($id)) { |
There was a problem hiding this comment.
Expected 0 spaces after opening bracket; 1 found
Nitpick-CI
reviewed
Oct 16, 2017
src/Users.php
Outdated
| * | ||
| * @return boolean | ||
| */ | ||
| public function hasRole($id, $role) | ||
| { | ||
| if (!$user = $this->getUser($id)) { | ||
| if ( ! $user = $this->getUser($id)) { |
There was a problem hiding this comment.
Expected 0 spaces after opening bracket; 1 found
|
I've rebased this to 3.3 as it is a valid bug fix 👍 … I also stripped out the IDE changes 😉 |
|
Sorry for the messy request :( |
|
Meh, mistakes are how we learn in life, and: Oh, and more importantly around here nobody makes mistakes, it was always the sneaky 🐨 |
GwendolenLynch
approved these changes
Oct 16, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolved small bug that occurs when first user is created via app/nut command without Root permissions.
At line 458,
addRole()is aimed to accept a user id (int or string), the whole user object as array was passed instead causing a crash at line 234 when userId is used inarray_key_exists.Sorry for IDE autoindent