8000 fix: roles cannot be considered a list, because array_unique keeps th… · symfony/maker-bundle@d621686 · GitHub
[go: up one dir, main page]

Skip to content

Commit d621686

Browse files
committed
fix: roles cannot be considered a list, because array_unique keeps the previous keys
1 parent 0624f13 commit d621686

8 files changed

+13
-10
lines changed

src/Security/UserClassBuilder.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,15 @@ private function addGetRoles(ClassSourceManipulator $manipulator, UserClassConfi
160160
)
161161
);
162162
$builder->addStmt($manipulator->createMethodLevelBlankLine());
163-
// return array_unique($roles);
163+
// return array_values(array_unique($roles));
164164
$builder->addStmt(
165165
new Node\Stmt\Return_(
166166
new Node\Expr\FuncCall(
167-
new Node\Name('array_unique'),
168-
[new Node\Expr\Variable('roles')]
167+
new Node\Name('array_values'),
168+
[new Node\Expr\FuncCall(
169+
new Node\Name('array_unique'),
170+
[new Node\Expr\Variable('roles')]
171+
)]
169172
)
170173
)
171174
);

tests/Security/fixtures/expected/UserEntityWithEmailAsIdentifier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function getRoles(): array
6767
// guarantee every user at least has ROLE_USER
6868
$roles[] = 'ROLE_USER';
6969

70-
return array_unique($roles);
70+
return array_values(array_unique($roles));
7171
}
7272

7373
/**

tests/Security/fixtures/expected/UserEntityWithPassword.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getRoles(): array
6262
// guarantee every user at least has ROLE_USER
6363
$roles[] = 'ROLE_USER';
6464

65-
return array_unique($roles);
65+
return array_values(array_unique($roles));
6666
}
6767

6868
/**

tests/Security/fixtures/expected/UserEntityWithUser_IdentifierAsIdentifier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getRoles(): array
6262
// guarantee every user at least has ROLE_USER
6363
$roles[] = 'ROLE_USER';
6464

65-
return array_unique($roles);
65+
return array_values(array_unique($roles));
6666
}
6767

6868
/**

tests/Security/fixtures/expected/UserEntityWithoutPassword.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function getRoles(): array
5555
// guarantee every user at least has ROLE_USER
5656
$roles[] = 'ROLE_USER';
5757

58-
return array_unique($roles);
58+
return array_values(array_unique($roles));
5959
}
6060

6161
/**

tests/Security/fixtures/expected/UserModelWithEmailAsIdentifier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getRoles(): array
5151
// guarantee every user at least has ROLE_USER
5252
$roles[] = 'ROLE_USER';
5353

54-
return array_unique($roles);
54+
return array_values(array_unique($roles));
5555
}
5656

5757
/**

tests/Security/fixtures/expected/UserModelWithPassword.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getRoles(): array
4646
// guarantee every user at least has ROLE_USER
4747
$roles[] = 'ROLE_USER';
4848

49-
return array_unique($roles);
49+
return array_values(array_unique($roles));
5050
}
5151

5252
/**

tests/Security/fixtures/expected/UserModelWithoutPassword.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function getRoles(): array
4040
// guarantee every user at least has ROLE_USER
4141
$roles[] = 'ROLE_USER';
4242

43-
return array_unique($roles);
43+
return array_values(array_unique($roles));
4444
}
4545

4646
/**

0 commit comments

Comments
 (0)
0