From 32b36f42f05c0213084575ada31db482a26bfc1a Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Fri, 19 Apr 2019 18:42:25 +0200 Subject: [PATCH] remove unused role ROLE_CUSTOMER (#712) --- config/packages/security.yaml | 1 - src/DataFixtures/UserFixtures.php | 4 ---- src/Entity/User.php | 1 - src/Validator/Constraints/RoleValidator.php | 4 ---- tests/Entity/UserTest.php | 2 +- tests/Validator/Constraints/RoleValidatorTest.php | 1 - translations/messages.ar.xliff | 4 ---- translations/messages.de.xliff | 4 ---- translations/messages.en.xliff | 4 ---- translations/messages.es.xliff | 4 ---- translations/messages.fr.xliff | 4 ---- translations/messages.hu.xliff | 4 ---- translations/messages.it.xliff | 4 ---- translations/messages.pt_BR.xliff | 4 ---- translations/messages.ru.xliff | 4 ---- 15 files changed, 1 insertion(+), 48 deletions(-) diff --git a/config/packages/security.yaml b/config/packages/security.yaml index a4622ab6..d4b2f9d5 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -41,7 +41,6 @@ security: allow_if_all_abstain: false role_hierarchy: - ROLE_USER: ROLE_CUSTOMER ROLE_TEAMLEAD: ROLE_USER ROLE_ADMIN: ROLE_TEAMLEAD ROLE_SUPER_ADMIN: ROLE_ADMIN diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php index cdbbffc3..c429853c 100644 --- a/src/DataFixtures/UserFixtures.php +++ b/src/DataFixtures/UserFixtures.php @@ -153,10 +153,6 @@ class UserFixtures extends Fixture protected function getUserDefinition() { 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, self::DEFAULT_AVATAR, true diff --git a/src/Entity/User.php b/src/Entity/User.php index c12a2eca..fa007b79 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -30,7 +30,6 @@ use Symfony\Component\Validator\Constraints as Assert; */ class User extends BaseUser implements UserInterface { - public const ROLE_CUSTOMER = 'ROLE_CUSTOMER'; public const ROLE_USER = 'ROLE_USER'; public const ROLE_TEAMLEAD = 'ROLE_TEAMLEAD'; public const ROLE_ADMIN = 'ROLE_ADMIN'; diff --git a/src/Validator/Constraints/RoleValidator.php b/src/Validator/Constraints/RoleValidator.php index 71e9c686..16aabe36 100644 --- a/src/Validator/Constraints/RoleValidator.php +++ b/src/Validator/Constraints/RoleValidator.php @@ -14,16 +14,12 @@ use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Exception\UnexpectedTypeException; -/** - * Class RoleValidator - */ class RoleValidator extends ConstraintValidator { /** * @var string[] */ protected $allowedRoles = [ - User::ROLE_CUSTOMER, User::ROLE_USER, User::ROLE_TEAMLEAD, User::ROLE_ADMIN, diff --git a/tests/Entity/UserTest.php b/tests/Entity/UserTest.php index eb40b465..06745321 100644 --- a/tests/Entity/UserTest.php +++ b/tests/Entity/UserTest.php @@ -52,7 +52,7 @@ class UserTest extends AbstractEntityTest { return [ [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 ]; } diff --git a/tests/Validator/Constraints/RoleValidatorTest.php b/tests/Validator/Constraints/RoleValidatorTest.php index 7ebf04ef..bbe3d551 100644 --- a/tests/Validator/Constraints/RoleValidatorTest.php +++ b/tests/Validator/Constraints/RoleValidatorTest.php @@ -28,7 +28,6 @@ class RoleValidatorTest extends ConstraintValidatorTestCase public function getValidRoles() { return [ - [User::ROLE_CUSTOMER], [User::ROLE_USER], [User::ROLE_TEAMLEAD], [User::ROLE_ADMIN], diff --git a/translations/messages.ar.xliff b/translations/messages.ar.xliff index 96ac4785..7c8cbfc6 100755 --- a/translations/messages.ar.xliff +++ b/translations/messages.ar.xliff @@ -537,10 +537,6 @@ ROLE_USER المستخدم - - ROLE_CUSTOMER - زبون -