From 11dc20657565b80e7ee692b530e99c270595a471 Mon Sep 17 00:00:00 2001
From: Kevin Frantz <mail@kevin-frantz.de>
Date: Wed, 21 Nov 2018 18:22:05 +0100
Subject: [PATCH] Changed AbstractDataSoure to AbstractPrimitiveSource

---
 application/src/Entity/Source/AbstractSource.php   |  2 +-
 .../Source/Complex/ComplexSourceInterface.php      |  9 +++++++--
 ...tDataSource.php => AbstractPrimitiveSource.php} |  2 +-
 .../Source/Primitive/DataSourceInterface.php       |  9 ---------
 .../Source/Primitive/Name/AbstractNameSource.php   |  4 ++--
 .../Source/Primitive/Name/NameSourceInterface.php  |  4 ++--
 .../Source/Primitive/PrimitiveSourceInterface.php  | 14 ++++++++++++++
 7 files changed, 27 insertions(+), 17 deletions(-)
 rename application/src/Entity/Source/Primitive/{AbstractDataSource.php => AbstractPrimitiveSource.php} (79%)
 delete mode 100644 application/src/Entity/Source/Primitive/DataSourceInterface.php
 create mode 100644 application/src/Entity/Source/Primitive/PrimitiveSourceInterface.php

diff --git a/application/src/Entity/Source/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
index 9fc1629..96b7556 100644
--- a/application/src/Entity/Source/AbstractSource.php
+++ b/application/src/Entity/Source/AbstractSource.php
@@ -23,7 +23,7 @@ use App\Entity\Source\Collection\TreeCollectionSourceInterface;
  * @ORM\Table(name="source")
  * @ORM\InheritanceType("JOINED")
  * @ORM\DiscriminatorColumn(name="discr", type="string")
- * @ORM\DiscriminatorMap({"data" = "App\Entity\Source\Primitive\AbstractDataSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
+ * @ORM\DiscriminatorMap({"primitive" = "App\Entity\Source\Primitive\AbstractPrimitiveSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
  */
 abstract class AbstractSource extends AbstractEntity implements SourceInterface
 {
diff --git a/application/src/Entity/Source/Complex/ComplexSourceInterface.php b/application/src/Entity/Source/Complex/ComplexSourceInterface.php
index 42e7c26..9756c4e 100644
--- a/application/src/Entity/Source/Complex/ComplexSourceInterface.php
+++ b/application/src/Entity/Source/Complex/ComplexSourceInterface.php
@@ -2,8 +2,13 @@
 
 namespace App\Entity\Source\Complex;
 
-use App\Entity\Source\Primitive\DataSourceInterface;
+use App\Entity\Source\SourceInterface;
 
-interface ComplexSourceInterface extends DataSourceInterface
+/**
+ * Complex sources contain out of one or more primitive sources.
+ *
+ * @author kevinfrantz
+ */
+interface ComplexSourceInterface extends SourceInterface
 {
 }
diff --git a/application/src/Entity/Source/Primitive/AbstractDataSource.php b/application/src/Entity/Source/Primitive/AbstractPrimitiveSource.php
similarity index 79%
rename from application/src/Entity/Source/Primitive/AbstractDataSource.php
rename to application/src/Entity/Source/Primitive/AbstractPrimitiveSource.php
index dc8d9cc..e95982b 100644
--- a/application/src/Entity/Source/Primitive/AbstractDataSource.php
+++ b/application/src/Entity/Source/Primitive/AbstractPrimitiveSource.php
@@ -14,6 +14,6 @@ use App\Entity\Source\AbstractSource;
  * @ORM\DiscriminatorColumn(name="discr", type="string")
  * @ORM\DiscriminatorMap({"name" = "App\Entity\Source\Primitive\Name\AbstractNameSource"})
  */
-abstract class AbstractDataSource extends AbstractSource implements DataSourceInterface
+abstract class AbstractPrimitiveSource extends AbstractSource implements PrimitiveSourceInterface
 {
 }
diff --git a/application/src/Entity/Source/Primitive/DataSourceInterface.php b/application/src/Entity/Source/Primitive/DataSourceInterface.php
deleted file mode 100644
index 20d53a2..0000000
--- a/application/src/Entity/Source/Primitive/DataSourceInterface.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Entity\Source\Primitive;
-
-use App\Entity\Source\SourceInterface;
-
-interface DataSourceInterface extends SourceInterface
-{
-}
diff --git a/application/src/Entity/Source/Primitive/Name/AbstractNameSource.php b/application/src/Entity/Source/Primitive/Name/AbstractNameSource.php
index 435681e..f0b3ce5 100644
--- a/application/src/Entity/Source/Primitive/Name/AbstractNameSource.php
+++ b/application/src/Entity/Source/Primitive/Name/AbstractNameSource.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Source\Primitive\Name;
 
-use App\Entity\Source\Primitive\AbstractDataSource;
+use App\Entity\Source\Primitive\AbstractPrimitiveSource;
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -19,7 +19,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\DiscriminatorColumn(name="discr", type="string")
  * @ORM\DiscriminatorMap({"nickname" = "NicknameSource","firstname" = "FirstNameSource", "surname" = "SurnameSource"})
  */
-class AbstractNameSource extends AbstractDataSource implements NameSourceInterface
+class AbstractNameSource extends AbstractPrimitiveSource implements NameSourceInterface
 {
     use NameAttribut;
 
diff --git a/application/src/Entity/Source/Primitive/Name/NameSourceInterface.php b/application/src/Entity/Source/Primitive/Name/NameSourceInterface.php
index 0d51909..8f3a10a 100644
--- a/application/src/Entity/Source/Primitive/Name/NameSourceInterface.php
+++ b/application/src/Entity/Source/Primitive/Name/NameSourceInterface.php
@@ -2,9 +2,9 @@
 
 namespace App\Entity\Source\Primitive\Name;
 
-use App\Entity\Source\Primitive\DataSourceInterface;
+use App\Entity\Source\Primitive\PrimitiveSourceInterface;
 use App\Entity\Attribut\NameAttributInterface;
 
-interface NameSourceInterface extends DataSourceInterface, NameAttributInterface
+interface NameSourceInterface extends PrimitiveSourceInterface, NameAttributInterface
 {
 }
diff --git a/application/src/Entity/Source/Primitive/PrimitiveSourceInterface.php b/application/src/Entity/Source/Primitive/PrimitiveSourceInterface.php
new file mode 100644
index 0000000..d2f4930
--- /dev/null
+++ b/application/src/Entity/Source/Primitive/PrimitiveSourceInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Entity\Source\Primitive;
+
+use App\Entity\Source\SourceInterface;
+
+/**
+ * Primitive sources contain one attribut, which is not a source.
+ *
+ * @author kevinfrantz
+ */
+interface PrimitiveSourceInterface extends SourceInterface
+{
+}