From 25020bbe97d346261ba942977d7dcd77d21f8e46 Mon Sep 17 00:00:00 2001
From: Kevin Frantz <mail@kevin-frantz.de>
Date: Sun, 28 Oct 2018 15:25:32 +0100
Subject: [PATCH] Moved meta entities to meta

---
 application/src/Controller/LawController.php   |  4 ++--
 .../Modificator/Entity/LawModificator.php      | 18 +++++++++---------
 .../src/Entity/Attribut/LawAttribut.php        |  2 +-
 .../Entity/Attribut/LawAttributInterface.php   |  2 +-
 .../Entity/Attribut/RecieverGroupAttribut.php  |  2 +-
 .../RecieverGroupAttributInterface.php         |  2 +-
 .../src/Entity/Attribut/RelationAttribut.php   |  2 +-
 .../Attribut/RelationAttributInterface.php     |  2 +-
 .../src/Entity/Attribut/RightAttribut.php      |  2 +-
 .../Entity/Attribut/RightAttributInterface.php |  2 +-
 application/src/Entity/Meta/AbstractMeta.php   | 13 +++++++++++++
 application/src/Entity/{ => Meta}/Law.php      |  9 ++++++---
 .../src/Entity/{ => Meta}/LawInterface.php     |  4 ++--
 application/src/Entity/Meta/MetaInterface.php  | 15 +++++++++++++++
 .../src/Entity/{ => Meta}/RecieverGroup.php    |  4 ++--
 .../{ => Meta}/RecieverGroupInterface.php      |  4 ++--
 application/src/Entity/{ => Meta}/Relation.php |  4 ++--
 .../Entity/{ => Meta}/RelationInterface.php    |  4 ++--
 application/src/Entity/{ => Meta}/Right.php    |  4 ++--
 .../src/Entity/{ => Meta}/RightInterface.php   |  6 +++---
 .../Entity/Method/RelationGrantedInterface.php |  2 +-
 .../src/Entity/Source/AbstractSource.php       |  6 +++---
 application/tests/unit/Entity/UserTest.php     |  7 ++++---
 23 files changed, 76 insertions(+), 44 deletions(-)
 create mode 100644 application/src/Entity/Meta/AbstractMeta.php
 rename application/src/Entity/{ => Meta}/Law.php (92%)
 rename application/src/Entity/{ => Meta}/LawInterface.php (75%)
 create mode 100644 application/src/Entity/Meta/MetaInterface.php
 rename application/src/Entity/{ => Meta}/RecieverGroup.php (93%)
 rename application/src/Entity/{ => Meta}/RecieverGroupInterface.php (81%)
 rename application/src/Entity/{ => Meta}/Relation.php (96%)
 rename application/src/Entity/{ => Meta}/RelationInterface.php (85%)
 rename application/src/Entity/{ => Meta}/Right.php (97%)
 rename application/src/Entity/{ => Meta}/RightInterface.php (87%)

diff --git a/application/src/Controller/LawController.php b/application/src/Controller/LawController.php
index 60cff99..9ae4bb2 100644
--- a/application/src/Controller/LawController.php
+++ b/application/src/Controller/LawController.php
@@ -5,8 +5,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Request;
-use App\Entity\Law;
-use App\Entity\LawInterface;
+use App\Entity\Meta\Law;
+use App\Entity\Meta\LawInterface;
 
 /**
  *
diff --git a/application/src/Creator/Modificator/Entity/LawModificator.php b/application/src/Creator/Modificator/Entity/LawModificator.php
index 597a8b8..afd15c9 100644
--- a/application/src/Creator/Modificator/Entity/LawModificator.php
+++ b/application/src/Creator/Modificator/Entity/LawModificator.php
@@ -4,20 +4,20 @@ namespace App\Creator\Modificator\Entity;
 
 use App\DBAL\Types\LayerType;
 use App\DBAL\Types\RightType;
-use App\Entity\NodeInterface;
-use App\Entity\Right;
-use App\Entity\LawInterface;
+use App\Entity\Meta\RelationInterface;
+use App\Entity\Meta\Right;
+use App\Entity\Meta\LawInterface;
 use App\DBAL\Types\RecieverType;
-use App\Entity\RightInterface;
-use App\Entity\RecieverGroupInterface;
-use App\Entity\RecieverGroup;
+use App\Entity\Meta\RightInterface;
+use App\Entity\Meta\RecieverGroupInterface;
+use App\Entity\Meta\RecieverGroup;
 
 /**
  * @author kevinfrantz
  */
 abstract class LawModificator
 {
-    public static function grantAllRights(LawInterface $law, NodeInterface $node): void
+    public static function grantAllRights(LawInterface $law, RelationInterface $node): void
     {
         foreach (LayerType::getChoices() as $layerKey => $layerValue) {
             foreach (RightType::getChoices() as $rightKey => $rightValue) {
@@ -28,7 +28,7 @@ abstract class LawModificator
         }
     }
 
-    public static function createRight(LawInterface $law, NodeInterface $node, string $type, string $layer): RightInterface
+    public static function createRight(LawInterface $law, RelationInterface $node, string $type, string $layer): RightInterface
     {
         $right = new Right();
         $right->setType($type);
@@ -39,7 +39,7 @@ abstract class LawModificator
         return $right;
     }
 
-    public static function createRecieverGroup(NodeInterface $node, string $reciever): RecieverGroupInterface
+    public static function createRecieverGroup(RelationInterface $node, string $reciever): RecieverGroupInterface
     {
         $recieverGroup = new RecieverGroup();
         $recieverGroup->setNode($node);
diff --git a/application/src/Entity/Attribut/LawAttribut.php b/application/src/Entity/Attribut/LawAttribut.php
index ed634b0..058e845 100644
--- a/application/src/Entity/Attribut/LawAttribut.php
+++ b/application/src/Entity/Attribut/LawAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\LawInterface;
+use App\Entity\Meta\LawInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/LawAttributInterface.php b/application/src/Entity/Attribut/LawAttributInterface.php
index 3926b55..d42952c 100644
--- a/application/src/Entity/Attribut/LawAttributInterface.php
+++ b/application/src/Entity/Attribut/LawAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\LawInterface;
+use App\Entity\Meta\LawInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RecieverGroupAttribut.php b/application/src/Entity/Attribut/RecieverGroupAttribut.php
index ead37d6..aae2a1f 100644
--- a/application/src/Entity/Attribut/RecieverGroupAttribut.php
+++ b/application/src/Entity/Attribut/RecieverGroupAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Meta\RecieverGroupInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RecieverGroupAttributInterface.php b/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
index 6027fcc..1c9e043 100644
--- a/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
+++ b/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Meta\RecieverGroupInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RelationAttribut.php b/application/src/Entity/Attribut/RelationAttribut.php
index 2fc87b9..9e5d328 100644
--- a/application/src/Entity/Attribut/RelationAttribut.php
+++ b/application/src/Entity/Attribut/RelationAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RelationInterface;
+use App\Entity\Meta\RelationInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RelationAttributInterface.php b/application/src/Entity/Attribut/RelationAttributInterface.php
index fba0773..4f02939 100644
--- a/application/src/Entity/Attribut/RelationAttributInterface.php
+++ b/application/src/Entity/Attribut/RelationAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RelationInterface;
+use App\Entity\Meta\RelationInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RightAttribut.php b/application/src/Entity/Attribut/RightAttribut.php
index 564695b..245970a 100644
--- a/application/src/Entity/Attribut/RightAttribut.php
+++ b/application/src/Entity/Attribut/RightAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RightInterface;
+use App\Entity\Meta\RightInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RightAttributInterface.php b/application/src/Entity/Attribut/RightAttributInterface.php
index cd9970b..ef418f2 100644
--- a/application/src/Entity/Attribut/RightAttributInterface.php
+++ b/application/src/Entity/Attribut/RightAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RightInterface;
+use App\Entity\Meta\RightInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Meta/AbstractMeta.php b/application/src/Entity/Meta/AbstractMeta.php
new file mode 100644
index 0000000..0a11353
--- /dev/null
+++ b/application/src/Entity/Meta/AbstractMeta.php
@@ -0,0 +1,13 @@
+<?php
+namespace App\Entity\Meta;
+
+use App\Entity\AbstractEntity;
+
+/**
+ *
+ * @author kevinfrantz
+ *        
+ */
+abstract class AbstractMeta extends AbstractEntity implements MetaInterface
+{
+}
\ No newline at end of file
diff --git a/application/src/Entity/Law.php b/application/src/Entity/Meta/Law.php
similarity index 92%
rename from application/src/Entity/Law.php
rename to application/src/Entity/Meta/Law.php
index e22e3f9..79deca4 100644
--- a/application/src/Entity/Law.php
+++ b/application/src/Entity/Meta/Law.php
@@ -1,6 +1,5 @@
 <?php
-
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\RightsAttribute;
@@ -8,15 +7,17 @@ use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Attribut\RelationAttribut;
 
 /**
+ *
  * @author kevinfrantz
  * @ORM\Table(name="law")
  * @ORM\Entity(repositoryClass="App\Repository\LawRepository")
  */
-class Law extends AbstractEntity implements LawInterface
+class Law extends AbstractMeta implements LawInterface
 {
     use RightsAttribute, RelationAttribut;
 
     /**
+     *
      * @ORM\OneToMany(targetEntity="Right", mappedBy="law", cascade={"persist", "remove"})
      *
      * @var ArrayCollection | Right[]
@@ -24,6 +25,7 @@ class Law extends AbstractEntity implements LawInterface
     protected $rights;
 
     /**
+     *
      * @ORM\OneToOne(targetEntity="Relation",cascade={"persist", "remove"})
      * @ORM\JoinColumn(name="relation_id", referencedColumnName="id")
      *
@@ -44,6 +46,7 @@ class Law extends AbstractEntity implements LawInterface
     public function isGranted(RelationInterface $relation, string $layer, string $right): bool
     {
         /**
+         *
          * @var RightInterface
          */
         foreach ($this->rights->toArray() as $right) {
diff --git a/application/src/Entity/LawInterface.php b/application/src/Entity/Meta/LawInterface.php
similarity index 75%
rename from application/src/Entity/LawInterface.php
rename to application/src/Entity/Meta/LawInterface.php
index 6de598b..2f02b96 100644
--- a/application/src/Entity/LawInterface.php
+++ b/application/src/Entity/Meta/LawInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use App\Entity\Attribut\RightsAttributInterface;
 use App\Entity\Attribut\RelationAttributInterface;
@@ -9,6 +9,6 @@ use App\Entity\Method\RelationGrantedInterface;
 /**
  * @author kevinfrantz
  */
-interface LawInterface extends RightsAttributInterface, RelationGrantedInterface, RelationAttributInterface
+interface LawInterface extends RightsAttributInterface, RelationGrantedInterface, RelationAttributInterface,MetaInterface
 {
 }
diff --git a/application/src/Entity/Meta/MetaInterface.php b/application/src/Entity/Meta/MetaInterface.php
new file mode 100644
index 0000000..c452262
--- /dev/null
+++ b/application/src/Entity/Meta/MetaInterface.php
@@ -0,0 +1,15 @@
+<?php
+namespace App\Entity\Meta;
+
+use App\Entity\EntityInterface;
+
+/**
+ * Meta entities contain informations which describe sources.
+ * If you refer from a meta entity to an source be aware to catch infinite loops! 
+ * @author kevinfrantz
+ *        
+ */
+interface MetaInterface extends EntityInterface
+{
+}
+
diff --git a/application/src/Entity/RecieverGroup.php b/application/src/Entity/Meta/RecieverGroup.php
similarity index 93%
rename from application/src/Entity/RecieverGroup.php
rename to application/src/Entity/Meta/RecieverGroup.php
index ceae156..5eccd17 100644
--- a/application/src/Entity/RecieverGroup.php
+++ b/application/src/Entity/Meta/RecieverGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use App\Entity\Attribut\RecieverAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -16,7 +16,7 @@ use App\Entity\Attribut\RelationAttributInterface;
  * @ORM\Table(name="reciever_group")
  * @ORM\Entity()
  */
-class RecieverGroup extends AbstractEntity implements RecieverGroupInterface
+class RecieverGroup extends AbstractMeta implements RecieverGroupInterface
 {
     use RelationAttribut,RecieverAttribut;
 
diff --git a/application/src/Entity/RecieverGroupInterface.php b/application/src/Entity/Meta/RecieverGroupInterface.php
similarity index 81%
rename from application/src/Entity/RecieverGroupInterface.php
rename to application/src/Entity/Meta/RecieverGroupInterface.php
index 1030989..44d166b 100644
--- a/application/src/Entity/RecieverGroupInterface.php
+++ b/application/src/Entity/Meta/RecieverGroupInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use App\Entity\Attribut\RecieverAttributInterface;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -9,7 +9,7 @@ use App\Entity\Attribut\RelationAttributInterface;
 /**
  * @author kevinfrantz
  */
-interface RecieverGroupInterface extends RelationAttributInterface, RecieverAttributInterface
+interface RecieverGroupInterface extends RelationAttributInterface, RecieverAttributInterface,MetaInterface
 {
     public function getAllRecievers(): ArrayCollection;
 }
diff --git a/application/src/Entity/Relation.php b/application/src/Entity/Meta/Relation.php
similarity index 96%
rename from application/src/Entity/Relation.php
rename to application/src/Entity/Meta/Relation.php
index 63c94b7..a7f6318 100644
--- a/application/src/Entity/Relation.php
+++ b/application/src/Entity/Meta/Relation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\IdAttribut;
@@ -21,7 +21,7 @@ use Doctrine\Common\Collections\Collection;
  * @ORM\Table(name="node")
  * @ORM\Entity()
  */
-class Relation extends AbstractEntity implements RelationInterface
+class Relation extends AbstractMeta implements RelationInterface
 {
     use IdAttribut,
     SourceAttribut,
diff --git a/application/src/Entity/RelationInterface.php b/application/src/Entity/Meta/RelationInterface.php
similarity index 85%
rename from application/src/Entity/RelationInterface.php
rename to application/src/Entity/Meta/RelationInterface.php
index ff34dc7..6e7ea06 100644
--- a/application/src/Entity/RelationInterface.php
+++ b/application/src/Entity/Meta/RelationInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use App\Entity\Attribut\SourceAttributInterface;
 use App\Entity\Attribut\IdAttributInterface;
@@ -11,6 +11,6 @@ use App\Entity\Attribut\LawAttributInterface;
 /**
  * @author kevinfrantz
  */
-interface RelationInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface
+interface RelationInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface,MetaInterface
 {
 }
diff --git a/application/src/Entity/Right.php b/application/src/Entity/Meta/Right.php
similarity index 97%
rename from application/src/Entity/Right.php
rename to application/src/Entity/Meta/Right.php
index b8c8eda..078542f 100644
--- a/application/src/Entity/Right.php
+++ b/application/src/Entity/Meta/Right.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use App\Entity\Attribut\TypeAttribut;
 use Doctrine\ORM\Mapping as ORM;
@@ -20,7 +20,7 @@ use App\Entity\Attribut\RelationAttribut;
  * @ORM\Table(name="`right`")
  * @ORM\Entity(repositoryClass="App\Repository\RightRepository")
  */
-class Right extends AbstractEntity implements RightInterface
+class Right extends AbstractMeta implements RightInterface
 {
     use TypeAttribut,LawAttribut, RelationAttribut, GrantAttribut,ConditionAttribut,RecieverGroupAttribut,LayerAttribut;
 
diff --git a/application/src/Entity/RightInterface.php b/application/src/Entity/Meta/RightInterface.php
similarity index 87%
rename from application/src/Entity/RightInterface.php
rename to application/src/Entity/Meta/RightInterface.php
index 43837be..1a4d5a5 100644
--- a/application/src/Entity/RightInterface.php
+++ b/application/src/Entity/Meta/RightInterface.php
@@ -1,6 +1,5 @@
 <?php
-
-namespace App\Entity;
+namespace App\Entity\Meta;
 
 use App\Entity\Attribut\TypeAttributInterface;
 use App\Entity\Attribut\LawAttributInterface;
@@ -12,8 +11,9 @@ use App\Entity\Method\RelationGrantedInterface;
 use App\Entity\Attribut\RelationAttributInterface;
 
 /**
+ *
  * @author kevinfrantz
  */
-interface RightInterface extends TypeAttributInterface, LawAttributInterface, RelationGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, RelationAttributInterface, ConditionAttributInterface, LayerAttributInterface
+interface RightInterface extends TypeAttributInterface, LawAttributInterface, RelationGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, RelationAttributInterface, ConditionAttributInterface, LayerAttributInterface, MetaInterface
 {
 }
diff --git a/application/src/Entity/Method/RelationGrantedInterface.php b/application/src/Entity/Method/RelationGrantedInterface.php
index a9d08aa..f60b3fd 100644
--- a/application/src/Entity/Method/RelationGrantedInterface.php
+++ b/application/src/Entity/Method/RelationGrantedInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Method;
 
-use App\Entity\RelationInterface;
+use App\Entity\Meta\RelationInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
index f611190..3ef3b1b 100644
--- a/application/src/Entity/Source/AbstractSource.php
+++ b/application/src/Entity/Source/AbstractSource.php
@@ -7,9 +7,9 @@ use JMS\Serializer\Annotation\Exclude;
 use App\Entity\AbstractEntity;
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Source\Attribut\GroupSourcesAttribut;
-use App\Entity\RelationInterface;
+use App\Entity\Meta\RelationInterface;
 use App\Entity\Attribut\RelationAttribut;
-use App\Entity\Relation;
+use App\Entity\Meta\Relation;
 
 /**
  * @author kevinfrantz
@@ -27,7 +27,7 @@ abstract class AbstractSource extends AbstractEntity implements SourceInterface
 
     /**
      * @var RelationInterface
-     * @ORM\OneToOne(targetEntity="App\Entity\Relation",cascade={"persist", "remove"})
+     * @ORM\OneToOne(targetEntity="App\Entity\Meta\Relation",cascade={"persist", "remove"})
      * @ORM\JoinColumn(name="relation_id", referencedColumnName="id")
      * @Exclude
      */
diff --git a/application/tests/unit/Entity/UserTest.php b/application/tests/unit/Entity/UserTest.php
index 347f96a..5b2f5d8 100644
--- a/application/tests/unit/Entity/UserTest.php
+++ b/application/tests/unit/Entity/UserTest.php
@@ -4,12 +4,13 @@ namespace tests\unit\Entity;
 
 use PHPUnit\Framework\TestCase;
 use App\Entity\User;
-use App\Entity\Law;
+use App\Entity\Meta\Law;
+use App\Entity\Meta\Relation;
 use App\Entity\Source\UserSource;
-use App\Entity\Node;
 
 /**
  * @author kevinfrantz
+use App\Entity\Source\UserSource;
  */
 class UserTest extends TestCase
 {
@@ -46,7 +47,7 @@ class UserTest extends TestCase
 
     public function testNode(): void
     {
-        $this->assertInstanceOf(Node::class, $this->user->getSource()->getNode());
+        $this->assertInstanceOf(Relation::class, $this->user->getSource()->getNode());
     }
 
     public function testLaw(): void