From ea20f7562a8a761a6424a321dfafd9b8bf17574a Mon Sep 17 00:00:00 2001
From: Kevin Frantz <mail@kevin-frantz.de>
Date: Sun, 11 Nov 2018 21:12:21 +0100
Subject: [PATCH] Declared AbstractNameSource as abstract and adapted paths for
 usersource

---
 application/src/Entity/Source/Combination/UserSource.php      | 4 ++--
 .../src/Entity/Source/Combination/UserSourceInterface.php     | 3 ++-
 .../src/Entity/Source/Data/Name/AbstractNameSource.php        | 2 +-
 application/src/Entity/User.php                               | 4 ++--
 .../tests/Unit/Entity/Source/Combination/UserSourceTest.php   | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/application/src/Entity/Source/Combination/UserSource.php b/application/src/Entity/Source/Combination/UserSource.php
index ce5b8e0..d5d7efe 100644
--- a/application/src/Entity/Source/Combination/UserSource.php
+++ b/application/src/Entity/Source/Combination/UserSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data;
+namespace App\Entity\Source\Combination;
 
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\UserAttribut;
@@ -12,7 +12,7 @@ use Entity\Attribut\PersonIdentityAttribut;
  * @ORM\Table(name="source_data_user")
  * @ORM\Entity(repositoryClass="App\Repository\UserSourceRepository")
  */
-class UserSource extends AbstractDataSource implements UserSourceInterface
+class UserSource extends AbstractCombinationSource implements UserSourceInterface
 {
     use UserAttribut,PersonIdentityAttribut;
 
diff --git a/application/src/Entity/Source/Combination/UserSourceInterface.php b/application/src/Entity/Source/Combination/UserSourceInterface.php
index 22808c6..9bd1e2f 100644
--- a/application/src/Entity/Source/Combination/UserSourceInterface.php
+++ b/application/src/Entity/Source/Combination/UserSourceInterface.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Entity\Source\Data;
+namespace App\Entity\Source\Combination;
 
 use App\Entity\Attribut\UserAttributInterface;
 use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
+use App\Entity\Source\Data\DataSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/Data/Name/AbstractNameSource.php b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
index c851230..8b95e59 100644
--- a/application/src/Entity/Source/Data/Name/AbstractNameSource.php
+++ b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
@@ -4,6 +4,6 @@ namespace App\Entity\Source\Data\Name;
 
 use App\Entity\Source\Data\AbstractDataSource;
 
-class AbstractNameSource extends AbstractDataSource implements NameSourceInterface
+abstract class AbstractNameSource extends AbstractDataSource implements NameSourceInterface
 {
 }
diff --git a/application/src/Entity/User.php b/application/src/Entity/User.php
index 10dc4f2..0ca753c 100644
--- a/application/src/Entity/User.php
+++ b/application/src/Entity/User.php
@@ -6,8 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
 use App\Entity\Attribut\SourceAttribut;
 use App\Entity\Attribut\IdAttribut;
-use App\Entity\Source\Data\UserSourceInterface;
-use App\Entity\Source\Data\UserSource;
+use App\Entity\Source\Combination\UserSourceInterface;
+use App\Entity\Source\Combination\UserSource;
 use App\Entity\Attribut\VersionAttribut;
 
 /**
diff --git a/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php b/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
index 9c87583..09568f7 100644
--- a/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
@@ -3,8 +3,8 @@
 namespace tests\unit\Entity\Source\Combination;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Data\UserSourceInterface;
-use App\Entity\Source\Data\UserSource;
+use App\Entity\Source\Combination\UserSourceInterface;
+use App\Entity\Source\Combination\UserSource;
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Source\Data\PersonIdentitySourceInterface;