remove unused role ROLE_CUSTOMER (#712)
This commit is contained in:
@@ -41,7 +41,6 @@ security:
|
|||||||
allow_if_all_abstain: false
|
allow_if_all_abstain: false
|
||||||
|
|
||||||
role_hierarchy:
|
role_hierarchy:
|
||||||
ROLE_USER: ROLE_CUSTOMER
|
|
||||||
ROLE_TEAMLEAD: ROLE_USER
|
ROLE_TEAMLEAD: ROLE_USER
|
||||||
ROLE_ADMIN: ROLE_TEAMLEAD
|
ROLE_ADMIN: ROLE_TEAMLEAD
|
||||||
ROLE_SUPER_ADMIN: ROLE_ADMIN
|
ROLE_SUPER_ADMIN: ROLE_ADMIN
|
||||||
|
|||||||
@@ -153,10 +153,6 @@ class UserFixtures extends Fixture
|
|||||||
protected function getUserDefinition()
|
protected function getUserDefinition()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
[
|
|
||||||
'Clara Haynes', 'CFO', 'clara_customer', 'clara_customer@example.com', User::ROLE_CUSTOMER,
|
|
||||||
'https://www.gravatar.com/avatar/00000000000000000000000000000000?d=monsterid&f=y', true
|
|
||||||
],
|
|
||||||
[
|
[
|
||||||
'John Doe', 'Developer', self::USERNAME_USER, 'john_user@example.com', User::ROLE_USER,
|
'John Doe', 'Developer', self::USERNAME_USER, 'john_user@example.com', User::ROLE_USER,
|
||||||
self::DEFAULT_AVATAR, true
|
self::DEFAULT_AVATAR, true
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ use Symfony\Component\Validator\Constraints as Assert;
|
|||||||
*/
|
*/
|
||||||
class User extends BaseUser implements UserInterface
|
class User extends BaseUser implements UserInterface
|
||||||
{
|
{
|
||||||
public const ROLE_CUSTOMER = 'ROLE_CUSTOMER';
|
|
||||||
public const ROLE_USER = 'ROLE_USER';
|
public const ROLE_USER = 'ROLE_USER';
|
||||||
public const ROLE_TEAMLEAD = 'ROLE_TEAMLEAD';
|
public const ROLE_TEAMLEAD = 'ROLE_TEAMLEAD';
|
||||||
public const ROLE_ADMIN = 'ROLE_ADMIN';
|
public const ROLE_ADMIN = 'ROLE_ADMIN';
|
||||||
|
|||||||
@@ -14,16 +14,12 @@ use Symfony\Component\Validator\Constraint;
|
|||||||
use Symfony\Component\Validator\ConstraintValidator;
|
use Symfony\Component\Validator\ConstraintValidator;
|
||||||
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
|
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
|
||||||
|
|
||||||
/**
|
|
||||||
* Class RoleValidator
|
|
||||||
*/
|
|
||||||
class RoleValidator extends ConstraintValidator
|
class RoleValidator extends ConstraintValidator
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var string[]
|
* @var string[]
|
||||||
*/
|
*/
|
||||||
protected $allowedRoles = [
|
protected $allowedRoles = [
|
||||||
User::ROLE_CUSTOMER,
|
|
||||||
User::ROLE_USER,
|
User::ROLE_USER,
|
||||||
User::ROLE_TEAMLEAD,
|
User::ROLE_TEAMLEAD,
|
||||||
User::ROLE_ADMIN,
|
User::ROLE_ADMIN,
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ class UserTest extends AbstractEntityTest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
[str_pad('#', 3, '-'), 'test@x.x'], // shortest possible username
|
[str_pad('#', 3, '-'), 'test@x.x'], // shortest possible username
|
||||||
[str_pad('#', 60, '-'), 'test@x.x', ['ROLE_CUSTOMER']], // longest possible password and valid role
|
[str_pad('#', 60, '-'), 'test@x.x', ['ROLE_TEAMLEAD']], // longest possible password and valid role
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class RoleValidatorTest extends ConstraintValidatorTestCase
|
|||||||
public function getValidRoles()
|
public function getValidRoles()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
[User::ROLE_CUSTOMER],
|
|
||||||
[User::ROLE_USER],
|
[User::ROLE_USER],
|
||||||
[User::ROLE_TEAMLEAD],
|
[User::ROLE_TEAMLEAD],
|
||||||
[User::ROLE_ADMIN],
|
[User::ROLE_ADMIN],
|
||||||
|
|||||||
@@ -537,10 +537,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>المستخدم</target>
|
<target>المستخدم</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>زبون</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics data for Dashboard & Users profile
|
Statistics data for Dashboard & Users profile
|
||||||
|
|||||||
@@ -604,10 +604,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>Benutzer</target>
|
<target>Benutzer</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Kunde</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics data for Dashboard & Users profile
|
Statistics data for Dashboard & Users profile
|
||||||
|
|||||||
@@ -604,10 +604,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>User</target>
|
<target>User</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Customer</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics data for Dashboard & Users profile
|
Statistics data for Dashboard & Users profile
|
||||||
|
|||||||
@@ -541,10 +541,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>Usuario</target>
|
<target>Usuario</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Cliente</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics
|
Statistics
|
||||||
|
|||||||
@@ -542,10 +542,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>Usager</target>
|
<target>Usager</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Client</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Données statistiques pour le tableau de bord et les profils des usagers
|
Données statistiques pour le tableau de bord et les profils des usagers
|
||||||
|
|||||||
@@ -596,10 +596,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>Felhasználó</target>
|
<target>Felhasználó</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Ügyfél</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics data for Dashboard & Users profile
|
Statistics data for Dashboard & Users profile
|
||||||
|
|||||||
@@ -523,10 +523,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>Utente</target>
|
<target>Utente</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Cliente</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics data for Dashboard & Users profile
|
Statistics data for Dashboard & Users profile
|
||||||
|
|||||||
@@ -558,10 +558,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>Usuário</target>
|
<target>Usuário</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Cliente</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics data for Dashboard & Users profile
|
Statistics data for Dashboard & Users profile
|
||||||
|
|||||||
@@ -533,10 +533,6 @@
|
|||||||
<source>ROLE_USER</source>
|
<source>ROLE_USER</source>
|
||||||
<target>Пользователь</target>
|
<target>Пользователь</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="ROLE_CUSTOMER">
|
|
||||||
<source>ROLE_CUSTOMER</source>
|
|
||||||
<target>Клиент</target>
|
|
||||||
</trans-unit>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Statistics data for Dashboard & Users profile
|
Statistics data for Dashboard & Users profile
|
||||||
|
|||||||
Reference in New Issue
Block a user