Implemented getChoices and getValues from Doctrine ENUM on the right way

This commit is contained in:
Kevin Frantz
2019-02-25 13:32:37 +01:00
parent 0bf7554afb
commit 90df65828c
21 changed files with 29 additions and 29 deletions

View File

@@ -22,7 +22,7 @@ trait ActionTypeAttribut
*/
public function setActionType(string $actionType): void
{
if (!array_key_exists($actionType, ActionType::getChoices())) {
if (!in_array($actionType, ActionType::getValues())) {
throw new NoValidChoiceException('The type is not a valid action type.');
}
$this->actionType = $actionType;

View File

@@ -22,7 +22,7 @@ trait CrudAttribut
*/
public function setCrud(string $crud): void
{
if (!array_key_exists($crud, CRUDType::getChoices())) {
if (!in_array($crud, CRUDType::getValues())) {
throw new NoValidChoiceException();
}
$this->crud = $crud;

View File

@@ -26,7 +26,7 @@ trait LayerAttribut
*/
public function setLayer(string $layer): void
{
if (!array_key_exists($layer, LayerType::getChoices())) {
if (!in_array($layer, LayerType::getValues())) {
throw new NoValidChoiceException("'$layer' is not a correct layer type.");
}
$this->layer = $layer;

View File

@@ -30,8 +30,8 @@ final class LayerType extends AbstractEnumType
self::SOURCE => 'source',
self::LAW => 'law',
self::RIGHT => 'right',
self::MEMBER => 'member',
self::HEREDITY => 'heredity',
self::CREATOR => 'creator',
self::MEMBER => 'member relation',
self::HEREDITY => 'heredity relation',
self::CREATOR => 'creator relation',
];
}

View File

@@ -47,8 +47,8 @@ final class RightLayerCombinationService implements RightLayerCombinationService
private function setCombination(): void
{
foreach (LayerType::getChoices() as $layer) {
foreach (CRUDType::getChoices() as $crud) {
foreach (LayerType::getValues() as $layer) {
foreach (CRUDType::getValues() as $crud) {
if (!array_key_exists($layer, $this->possibleCombinations)) {
$this->possibleCombinations[$layer] = [];
}

View File

@@ -15,7 +15,7 @@ interface RightLayerCombinationServiceInterface
/**
* For layer parameter see:.
*
* @see LayerType::getChoices()
* @see LayerType::getValues()
*
* @param string $layer
*
@@ -26,7 +26,7 @@ interface RightLayerCombinationServiceInterface
/**
* For layer parameter see:.
*
* @see CRUDType::getChoices()
* @see CRUDType::getValues()
*
* @param string $crud
*

View File

@@ -44,7 +44,7 @@ final class ActionTemplateDataStoreService implements ActionTemplateDataStoreSer
*/
private function isValidActionType(string $actionType): bool
{
if (in_array($actionType, ActionType::getChoices())) {
if (in_array($actionType, ActionType::getValues())) {
return true;
}
throw new NoValidChoiceException("The action type <<$actionType>> is not defined and not valid!");