Optimized Interface structure

application/src/Creator/Modificator/Entity/LawModificator.php

@@ -4,12 +4,12 @@ namespace App\Creator\Modificator\Entity;
 
 use App\DBAL\Types\LayerType;
 use App\DBAL\Types\RightType;
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 use App\Entity\Right;
-use App\Entity\LawInterface;
+use App\Entity\Interfaces\LawInterface;
 use App\DBAL\Types\RecieverType;
-use App\Entity\RightInterface;
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Interfaces\RightInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
 use App\Entity\RecieverGroup;
 
 /**

application/src/Entity/AbstractSource.php

@@ -5,6 +5,8 @@ namespace App\Entity;
 use App\Entity\Attribut\NodeAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
+use App\Entity\Interfaces\SourceInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/ChildsAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 use Doctrine\Common\Collections\Collection;
 
 /**

application/src/Entity/Attribut/Interfaces/BlacklistAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/ChildsAttributeInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use Doctrine\Common\Collections\Collection;
 

application/src/Entity/Attribut/Interfaces/ConditionAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use App\Logic\Operation\OperationInterface;
 

application/src/Entity/Attribut/Interfaces/GrantAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/IdAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/LawAttributInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\LawInterface;
+use App\Entity\Interfaces\LawInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/LayerAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/NameAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/NameSourceAttributInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\NameSourceInterface;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/NodeAttributInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/ParentAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/ParentsAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use Doctrine\Common\Collections\Collection;
 

application/src/Entity/Attribut/Interfaces/RecieverAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/RecieverGroupAttributInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/RightAttributInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\RightInterface;
+use App\Entity\Interfaces\RightInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/RightsAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use Doctrine\Common\Collections\Collection;
 

application/src/Entity/Attribut/Interfaces/SourceAttributInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\SourceInterface;
+use App\Entity\Interfaces\SourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/TypeAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/UserAttributInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Entity\Attribut\Interfaces;
+
+use App\Entity\Interfaces\UserInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface UserAttributInterface
+{
+    public function setUser(UserInterface $user): void;
+
+    public function getUser(): UserInterface;
+}

application/src/Entity/Attribut/Interfaces/UserSourceAttributInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\UserSourceInterface;
+use App\Entity\Interfaces\UserSourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/Interfaces/WhitelistAttributInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/LawAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\LawInterface;
+use App\Entity\Interfaces\LawInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/NameSourceAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NameSourceInterface;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/NodeAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/ParentAttribut.php

@@ -2,6 +2,8 @@
 
 namespace Entity\Attribut;
 
+use App\Entity\Attribut\Interfaces\ParentAttributInterface;
+
 /**
  * @author kevinfrantz
  */

application/src/Entity/Attribut/ParentsAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 use Doctrine\Common\Collections\Collection;
 
 /**

application/src/Entity/Attribut/RecieverGroupAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/RightAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RightInterface;
+use App\Entity\Interfaces\RightInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/SourceAttribut.php

@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\SourceInterface;
+use App\Entity\Interfaces\SourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Attribut/UserAttribut.php

@@ -3,6 +3,7 @@
 namespace App\Entity\Attribut;
 
 use App\Entity\User;
+use App\Entity\Interfaces\UserInterface;
 
 /**
  * @author kevinfrantz
@@ -14,12 +15,12 @@ trait UserAttribut
      */
     protected $user;
 
-    public function setUser(User $user): void
+    public function setUser(UserInterface $user): void
     {
         $this->user = $user;
     }
 
-    public function getUser(): User
+    public function getUser(): UserInterface
     {
         return $this->user;
     }

application/src/Entity/Attribut/UserAttributInterface.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Entity\Attribut;
-
-use App\Entity\User;
-
-/**
- * @author kevinfrantz
- */
-interface UserAttributInterface
-{
-    public function setUser(User $user): void;
-
-    public function getUser(): User;
-}

application/src/Entity/Attribut/UserSourceAttribut.php

@@ -2,7 +2,7 @@
 
 namespace Entity\Attribut;
 
-use App\Entity\UserSourceInterface;
+use App\Entity\Interfaces\UserSourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Interfaces/LawInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\RightsAttributInterface;
+use App\Entity\Method\Interfaces\NodeGrantedInterface;
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface LawInterface extends RightsAttributInterface, NodeGrantedInterface, NodeAttributInterface
+{
+}

application/src/Entity/Interfaces/NameSourceInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Interfaces;
 
-use App\Entity\Attribut\NameAttributInterface;
+use App\Entity\Attribut\Interfaces\NameAttributInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Interfaces/NodeInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\SourceAttributInterface;
+use App\Entity\Attribut\Interfaces\IdAttributInterface;
+use App\Entity\Attribut\Interfaces\ParentsAttributInterface;
+use App\Entity\Attribut\Interfaces\ChildsAttributeInterface;
+use App\Entity\Attribut\Interfaces\LawAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface NodeInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface
+{
+}

application/src/Entity/Interfaces/RecieverGroupInterface.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Interfaces;
 
-use App\Entity\Attribut\NodeAttributInterface;
-use App\Entity\Attribut\RecieverAttributInterface;
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+use App\Entity\Attribut\Interfaces\RecieverAttributInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**

application/src/Entity/Interfaces/RightInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\TypeAttributInterface;
+use App\Entity\Attribut\Interfaces\LawAttributInterface;
+use App\Entity\Method\Interfaces\NodeGrantedInterface;
+use App\Entity\Attribut\Interfaces\RecieverGroupAttributInterface;
+use App\Entity\Attribut\Interfaces\GrantAttributInterface;
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+use App\Entity\Attribut\Interfaces\ConditionAttributInterface;
+use App\Entity\Attribut\Interfaces\LayerAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface RightInterface extends TypeAttributInterface, LawAttributInterface, NodeGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, NodeAttributInterface, ConditionAttributInterface, LayerAttributInterface
+{
+}

application/src/Entity/Interfaces/SourceInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+use App\Entity\Attribut\Interfaces\IdAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface SourceInterface extends IdAttributInterface, NodeAttributInterface
+{
+}

application/src/Entity/Interfaces/UserInterface.php

@@ -0,0 +1,15 @@
+<?php
+namespace App\Entity\Interfaces;
+
+use FOS\UserBundle\Model\UserInterface as FOSUserInterface;
+use App\Entity\Attribut\Interfaces\SourceAttributInterface;
+
+/**
+ *
+ * @author kevinfrantz
+ *        
+ */
+interface UserInterface extends FOSUserInterface, SourceAttributInterface
+{
+    
+}

application/src/Entity/Interfaces/UserSourceInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\UserAttributInterface;
+use App\Entity\Attribut\Interfaces\NameSourceAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface UserSourceInterface extends SourceInterface, UserAttributInterface, NameSourceAttributInterface
+{
+}

application/src/Entity/Law.php

@@ -6,6 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\RightsAttribute;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Attribut\NodeAttribut;
+use App\Entity\Interfaces\LawInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/LawInterface.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\RightsAttributInterface;
-use App\Entity\Method\NodeGrantedInterface;
-use App\Entity\Attribut\NodeAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface LawInterface extends RightsAttributInterface, NodeGrantedInterface, NodeAttributInterface
-{
-}

application/src/Entity/Method/Interfaces/NodeGrantedInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Method;
+namespace App\Entity\Method\Interfaces;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/NameSource.php

@@ -5,6 +5,7 @@ namespace App\Entity;
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Node.php

@@ -9,6 +9,9 @@ use App\Entity\Attribut\ParentsAttribut;
 use App\Entity\Attribut\ChildsAttribut;
 use App\Entity\Attribut\LawAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
+use App\Entity\Interfaces\NodeInterface;
+use App\Entity\Interfaces\SourceInterface;
+use App\Entity\Interfaces\LawInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/NodeInterface.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\SourceAttributInterface;
-use App\Entity\Attribut\IdAttributInterface;
-use App\Entity\Attribut\ParentsAttributInterface;
-use App\Entity\Attribut\ChildsAttributeInterface;
-use App\Entity\Attribut\LawAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface NodeInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface
-{
-}

application/src/Entity/RecieverGroup.php

@@ -9,6 +9,8 @@ use App\DBAL\Types\RecieverType;
 use Symfony\Component\Intl\Exception\NotImplementedException;
 use Doctrine\ORM\Mapping as ORM;
 use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
+use App\Entity\Interfaces\RecieverGroupInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/Right.php

@@ -14,6 +14,10 @@ use App\Logic\Operation\OperationInterface;
 use App\Entity\Attribut\ConditionAttribut;
 use App\Entity\Attribut\RecieverGroupAttribut;
 use App\Entity\Attribut\LayerAttribut;
+use App\Entity\Interfaces\LawInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
+use App\Entity\Interfaces\NodeInterface;
+use App\Entity\Interfaces\RightInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/RightInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\TypeAttributInterface;
-use App\Entity\Attribut\LawAttributInterface;
-use App\Entity\Method\NodeGrantedInterface;
-use App\Entity\Attribut\RecieverGroupAttributInterface;
-use App\Entity\Attribut\GrantAttributInterface;
-use App\Entity\Attribut\NodeAttributInterface;
-use App\Entity\Attribut\ConditionAttributInterface;
-use App\Entity\Attribut\LayerAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface RightInterface extends TypeAttributInterface, LawAttributInterface, NodeGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, NodeAttributInterface, ConditionAttributInterface, LayerAttributInterface
-{
-}

application/src/Entity/SourceInterface.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\NodeAttributInterface;
-use App\Entity\Attribut\IdAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface SourceInterface extends IdAttributInterface, NodeAttributInterface
-{
-}

application/src/Entity/User.php

@@ -4,17 +4,19 @@ namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
-use App\Entity\Attribut\SourceAttributInterface;
+use App\Entity\Attribut\Interfaces\SourceAttributInterface;
 use App\Entity\Attribut\SourceAttribut;
 use App\Entity\Attribut\IdAttribut;
 use App\Creator\Modificator\Entity\LawModificator;
+use App\Entity\Interfaces\UserInterface;
+use App\Entity\Interfaces\UserSourceInterface;
 
 /**
  * @author kevinfrantz
  * @ORM\Table(name="user")
  * @ORM\Entity(repositoryClass="App\Repository\UserRepository")
  */
-class User extends BaseUser implements SourceAttributInterface
+class User extends BaseUser implements UserInterface
 {
     use SourceAttribut,IdAttribut;
 

application/src/Entity/UserSource.php

@@ -6,6 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use App\Entity\Attribut\UserAttribut;
 use App\Entity\Attribut\NameSourceAttribut;
+use App\Entity\Interfaces\UserSourceInterface;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz

application/src/Entity/UserSourceInterface.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\UserAttributInterface;
-use App\Entity\Attribut\NameSourceAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface UserSourceInterface extends SourceInterface, UserAttributInterface, NameSourceAttributInterface
-{
-}