diff --git a/application/src/Entity/Source/Complex/AbstractCombinationSource.php b/application/src/Entity/Source/Complex/AbstractComplexSource.php similarity index 82% rename from application/src/Entity/Source/Complex/AbstractCombinationSource.php rename to application/src/Entity/Source/Complex/AbstractComplexSource.php index 4fd076b..e19ca4b 100644 --- a/application/src/Entity/Source/Complex/AbstractCombinationSource.php +++ b/application/src/Entity/Source/Complex/AbstractComplexSource.php @@ -14,6 +14,6 @@ use Doctrine\ORM\Mapping as ORM; * @ORM\DiscriminatorColumn(name="discr", type="string") * @ORM\DiscriminatorMap({"user" = "UserSource","fullpersonname" = "FullPersonNameSource","personidentitysource"="PersonIdentitySource","fullpersonnamesource"="FullPersonNameSource"}) */ -abstract class AbstractCombinationSource extends AbstractSource implements CombinationSourceInterface +abstract class AbstractComplexSource extends AbstractSource implements ComplexSourceInterface { } diff --git a/application/src/Entity/Source/Complex/CombinationSourceInterface.php b/application/src/Entity/Source/Complex/ComplexSourceInterface.php similarity index 61% rename from application/src/Entity/Source/Complex/CombinationSourceInterface.php rename to application/src/Entity/Source/Complex/ComplexSourceInterface.php index 7139b8d..42e7c26 100644 --- a/application/src/Entity/Source/Complex/CombinationSourceInterface.php +++ b/application/src/Entity/Source/Complex/ComplexSourceInterface.php @@ -4,6 +4,6 @@ namespace App\Entity\Source\Complex; use App\Entity\Source\Primitive\DataSourceInterface; -interface CombinationSourceInterface extends DataSourceInterface +interface ComplexSourceInterface extends DataSourceInterface { } diff --git a/application/src/Entity/Source/Complex/FullPersonNameSource.php b/application/src/Entity/Source/Complex/FullPersonNameSource.php index ad4dfdf..f93975d 100644 --- a/application/src/Entity/Source/Complex/FullPersonNameSource.php +++ b/application/src/Entity/Source/Complex/FullPersonNameSource.php @@ -15,7 +15,7 @@ use App\Entity\Source\Primitive\Name\FirstNameSourceInterface; * @ORM\Table(name="source_combination_fullpersonname") * @ORM\Entity() */ -class FullPersonNameSource extends AbstractCombinationSource implements FullPersonNameSourceInterface +class FullPersonNameSource extends AbstractComplexSource implements FullPersonNameSourceInterface { use FirstNameSourceAttribut,SurnameSourceAttribut; diff --git a/application/src/Entity/Source/Complex/FullPersonNameSourceInterface.php b/application/src/Entity/Source/Complex/FullPersonNameSourceInterface.php index db047f5..5315cff 100644 --- a/application/src/Entity/Source/Complex/FullPersonNameSourceInterface.php +++ b/application/src/Entity/Source/Complex/FullPersonNameSourceInterface.php @@ -10,6 +10,6 @@ use App\Entity\Attribut\SurnameSourceAttributInterface; * * @author kevinfrantz */ -interface FullPersonNameSourceInterface extends CombinationSourceInterface, FirstNameSourceAttributInterface, SurnameSourceAttributInterface +interface FullPersonNameSourceInterface extends ComplexSourceInterface, FirstNameSourceAttributInterface, SurnameSourceAttributInterface { } diff --git a/application/src/Entity/Source/Complex/PersonIdentitySource.php b/application/src/Entity/Source/Complex/PersonIdentitySource.php index fc22d32..52b5800 100644 --- a/application/src/Entity/Source/Complex/PersonIdentitySource.php +++ b/application/src/Entity/Source/Complex/PersonIdentitySource.php @@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM; * @ORM\Table(name="source_combination_person_identity") * @ORM\Entity() */ -class PersonIdentitySource extends AbstractCombinationSource implements PersonIdentitySourceInterface +class PersonIdentitySource extends AbstractComplexSource implements PersonIdentitySourceInterface { use FullPersonNameSourceAttribut; diff --git a/application/src/Entity/Source/Complex/PersonIdentitySourceInterface.php b/application/src/Entity/Source/Complex/PersonIdentitySourceInterface.php index 0195f1b..e018924 100644 --- a/application/src/Entity/Source/Complex/PersonIdentitySourceInterface.php +++ b/application/src/Entity/Source/Complex/PersonIdentitySourceInterface.php @@ -4,6 +4,6 @@ namespace App\Entity\Source\Complex; use App\Entity\Attribut\FullPersonNameSourceAttributInterface; -interface PersonIdentitySourceInterface extends CombinationSourceInterface, FullPersonNameSourceAttributInterface +interface PersonIdentitySourceInterface extends ComplexSourceInterface, FullPersonNameSourceAttributInterface { } diff --git a/application/src/Entity/Source/Complex/UserSource.php b/application/src/Entity/Source/Complex/UserSource.php index 39d26a2..6f869e1 100644 --- a/application/src/Entity/Source/Complex/UserSource.php +++ b/application/src/Entity/Source/Complex/UserSource.php @@ -12,7 +12,7 @@ use App\Entity\Attribut\PersonIdentitySourceAttribut; * @ORM\Table(name="source_data_user") * @ORM\Entity(repositoryClass="App\Repository\UserSourceRepository") */ -class UserSource extends AbstractCombinationSource implements UserSourceInterface +class UserSource extends AbstractComplexSource implements UserSourceInterface { use UserAttribut,PersonIdentitySourceAttribut; diff --git a/application/src/Entity/Source/Complex/UserSourceInterface.php b/application/src/Entity/Source/Complex/UserSourceInterface.php index 349f1b7..f743f8d 100644 --- a/application/src/Entity/Source/Complex/UserSourceInterface.php +++ b/application/src/Entity/Source/Complex/UserSourceInterface.php @@ -4,11 +4,10 @@ namespace App\Entity\Source\Complex; use App\Entity\Attribut\UserAttributInterface; use App\Entity\Attribut\PersonIdentitySourceAttributInterface; -use App\Entity\Source\Primitive\DataSourceInterface; /** * @author kevinfrantz */ -interface UserSourceInterface extends DataSourceInterface, UserAttributInterface, PersonIdentitySourceAttributInterface +interface UserSourceInterface extends ComplexSourceInterface, UserAttributInterface, PersonIdentitySourceAttributInterface { }