diff --git a/application/src/Entity/Meta/Law.php b/application/src/Entity/Meta/Law.php index d8e2bfa..24da95f 100644 --- a/application/src/Entity/Meta/Law.php +++ b/application/src/Entity/Meta/Law.php @@ -6,6 +6,7 @@ use Doctrine\ORM\Mapping as ORM; use App\Entity\Attribut\RightsAttribute; use Doctrine\Common\Collections\ArrayCollection; use App\Entity\Attribut\RelationAttribut; +use App\Entity\Source\SourceInterface; /** * @author kevinfrantz @@ -33,7 +34,7 @@ final class Law extends AbstractMeta implements LawInterface $this->rights = new ArrayCollection(); } - public function isGranted(RelationInterface $relation, string $layer, string $right): bool + public function isGranted(SourceInterface $source, string $layer, string $right): bool { /* * diff --git a/application/src/Entity/Meta/LawInterface.php b/application/src/Entity/Meta/LawInterface.php index 9337370..604218a 100644 --- a/application/src/Entity/Meta/LawInterface.php +++ b/application/src/Entity/Meta/LawInterface.php @@ -3,11 +3,11 @@ namespace App\Entity\Meta; use App\Entity\Attribut\RightsAttributInterface; -use App\Entity\Method\RelationGrantedInterface; +use App\Entity\Method\GrantedInterface; /** * @author kevinfrantz */ -interface LawInterface extends RightsAttributInterface, RelationGrantedInterface, MetaInterface +interface LawInterface extends RightsAttributInterface,GrantedInterface, MetaInterface { } diff --git a/application/src/Entity/Meta/Right.php b/application/src/Entity/Meta/Right.php index df67868..ce05afc 100644 --- a/application/src/Entity/Meta/Right.php +++ b/application/src/Entity/Meta/Right.php @@ -14,6 +14,7 @@ use App\Entity\Attribut\ConditionAttribut; use App\Entity\Attribut\RecieverAttribut; use App\Entity\Attribut\LayerAttribut; use App\Entity\Attribut\RelationAttribut; +use App\Entity\Source\SourceInterface; /** * @author kevinfrantz @@ -85,7 +86,7 @@ final class Right extends AbstractMeta implements RightInterface $this->grant = true; } - public function isGranted(RelationInterface $relation, string $layer, string $right): bool + public function isGranted(SourceInterface $source, string $layer, string $right): bool { if ($this->layer == $layer && $this->type == $right && $this->checkIfNodeIsReciever($relation) && $this->getConditionBoolOrTrue()) { return $this->grant; diff --git a/application/src/Entity/Meta/RightInterface.php b/application/src/Entity/Meta/RightInterface.php index 6625642..b97cf4a 100644 --- a/application/src/Entity/Meta/RightInterface.php +++ b/application/src/Entity/Meta/RightInterface.php @@ -8,12 +8,12 @@ use App\Entity\Attribut\RecieverAttributInterface; use App\Entity\Attribut\GrantAttributInterface; use App\Entity\Attribut\ConditionAttributInterface; use App\Entity\Attribut\LayerAttributInterface; -use App\Entity\Method\RelationGrantedInterface; +use App\Entity\Method\GrantedInterface; use App\Entity\Attribut\RelationAttributInterface; /** * @author kevinfrantz */ -interface RightInterface extends TypeAttributInterface, LawAttributInterface, RelationGrantedInterface, GrantAttributInterface, RecieverAttributInterface, RelationAttributInterface, ConditionAttributInterface, LayerAttributInterface, MetaInterface +interface RightInterface extends TypeAttributInterface, LawAttributInterface, GrantedInterface, GrantAttributInterface, RecieverAttributInterface, RelationAttributInterface, ConditionAttributInterface, LayerAttributInterface, MetaInterface { } diff --git a/application/src/Entity/Method/GrantedInterface.php b/application/src/Entity/Method/GrantedInterface.php new file mode 100644 index 0000000..5e7c4a3 --- /dev/null +++ b/application/src/Entity/Method/GrantedInterface.php @@ -0,0 +1,19 @@ +