Changed data to primitive folder

This commit is contained in:
Kevin Frantz 2018-11-21 17:16:32 +01:00
parent 9a3801152f
commit 706a439b52
25 changed files with 35 additions and 35 deletions

View File

@ -2,7 +2,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\Source\Data\Name\FirstNameSourceInterface; use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
trait FirstNameSourceAttribut trait FirstNameSourceAttribut
{ {

View File

@ -2,7 +2,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\Source\Data\Name\FirstNameSourceInterface; use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
interface FirstNameSourceAttributInterface interface FirstNameSourceAttributInterface
{ {

View File

@ -2,7 +2,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\Source\Data\Name\NameSourceInterface; use App\Entity\Source\Primitive\Name\NameSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -2,7 +2,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\Source\Data\Name\NameSourceInterface; use App\Entity\Source\Primitive\Name\NameSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -2,7 +2,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\Source\Data\Name\SurnameSourceInterface; use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
trait SurnameSourceAttribut trait SurnameSourceAttribut
{ {

View File

@ -2,7 +2,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use App\Entity\Source\Data\Name\SurnameSourceInterface; use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
interface SurnameSourceAttributInterface interface SurnameSourceAttributInterface
{ {

View File

@ -23,7 +23,7 @@ use App\Entity\Source\Collection\TreeCollectionSourceInterface;
* @ORM\Table(name="source") * @ORM\Table(name="source")
* @ORM\InheritanceType("JOINED") * @ORM\InheritanceType("JOINED")
* @ORM\DiscriminatorColumn(name="discr", type="string") * @ORM\DiscriminatorColumn(name="discr", type="string")
* @ORM\DiscriminatorMap({"data" = "App\Entity\Source\Data\AbstractDataSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"}) * @ORM\DiscriminatorMap({"data" = "App\Entity\Source\Primitive\AbstractDataSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
*/ */
abstract class AbstractSource extends AbstractEntity implements SourceInterface abstract class AbstractSource extends AbstractEntity implements SourceInterface
{ {

View File

@ -2,7 +2,7 @@
namespace App\Entity\Source\Combination; namespace App\Entity\Source\Combination;
use App\Entity\Source\Data\DataSourceInterface; use App\Entity\Source\Primitive\DataSourceInterface;
interface CombinationSourceInterface extends DataSourceInterface interface CombinationSourceInterface extends DataSourceInterface
{ {

View File

@ -4,11 +4,11 @@ namespace App\Entity\Source\Combination;
use App\Entity\Attribut\FirstNameSourceAttribut; use App\Entity\Attribut\FirstNameSourceAttribut;
use App\Entity\Attribut\SurnameSourceAttribut; use App\Entity\Attribut\SurnameSourceAttribut;
use App\Entity\Source\Data\Name\SurnameSource; use App\Entity\Source\Primitive\Name\SurnameSource;
use App\Entity\Source\Data\Name\FirstNameSource; use App\Entity\Source\Primitive\Name\FirstNameSource;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use App\Entity\Source\Data\Name\SurnameSourceInterface; use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
use App\Entity\Source\Data\Name\FirstNameSourceInterface; use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz
@ -20,7 +20,7 @@ class FullPersonNameSource extends AbstractCombinationSource implements FullPers
use FirstNameSourceAttribut,SurnameSourceAttribut; use FirstNameSourceAttribut,SurnameSourceAttribut;
/** /**
* @ORM\OneToOne(targetEntity="App\Entity\Source\Data\Name\SurnameSource",cascade={"persist", "remove"}) * @ORM\OneToOne(targetEntity="App\Entity\Source\Primitive\Name\SurnameSource",cascade={"persist", "remove"})
* @ORM\JoinColumn(name="surname_id", referencedColumnName="id",onDelete="CASCADE") * @ORM\JoinColumn(name="surname_id", referencedColumnName="id",onDelete="CASCADE")
* *
* @var SurnameSourceInterface * @var SurnameSourceInterface
@ -28,7 +28,7 @@ class FullPersonNameSource extends AbstractCombinationSource implements FullPers
protected $surnameSource; protected $surnameSource;
/** /**
* @ORM\OneToOne(targetEntity="App\Entity\Source\Data\Name\FirstNameSource",cascade={"persist", "remove"}) * @ORM\OneToOne(targetEntity="App\Entity\Source\Primitive\Name\FirstNameSource",cascade={"persist", "remove"})
* @ORM\JoinColumn(name="firstname_id", referencedColumnName="id",onDelete="CASCADE") * @ORM\JoinColumn(name="firstname_id", referencedColumnName="id",onDelete="CASCADE")
* *
* @var FirstNameSourceInterface * @var FirstNameSourceInterface

View File

@ -4,7 +4,7 @@ namespace App\Entity\Source\Combination;
use App\Entity\Attribut\UserAttributInterface; use App\Entity\Attribut\UserAttributInterface;
use App\Entity\Attribut\PersonIdentitySourceAttributInterface; use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
use App\Entity\Source\Data\DataSourceInterface; use App\Entity\Source\Primitive\DataSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data; namespace App\Entity\Source\Primitive;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use App\Entity\Source\AbstractSource; use App\Entity\Source\AbstractSource;
@ -12,7 +12,7 @@ use App\Entity\Source\AbstractSource;
* @ORM\Table(name="source_data") * @ORM\Table(name="source_data")
* @ORM\InheritanceType("JOINED") * @ORM\InheritanceType("JOINED")
* @ORM\DiscriminatorColumn(name="discr", type="string") * @ORM\DiscriminatorColumn(name="discr", type="string")
* @ORM\DiscriminatorMap({"name" = "App\Entity\Source\Data\Name\AbstractNameSource"}) * @ORM\DiscriminatorMap({"name" = "App\Entity\Source\Primitive\Name\AbstractNameSource"})
*/ */
abstract class AbstractDataSource extends AbstractSource implements DataSourceInterface abstract class AbstractDataSource extends AbstractSource implements DataSourceInterface
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data; namespace App\Entity\Source\Primitive;
use App\Entity\Source\SourceInterface; use App\Entity\Source\SourceInterface;

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
use App\Entity\Source\Data\AbstractDataSource; use App\Entity\Source\Primitive\AbstractDataSource;
use App\Entity\Attribut\NameAttribut; use App\Entity\Attribut\NameAttribut;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
interface FirstNameSourceInterface extends NameSourceInterface interface FirstNameSourceInterface extends NameSourceInterface
{ {

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
use App\Entity\Source\Data\DataSourceInterface; use App\Entity\Source\Primitive\DataSourceInterface;
use App\Entity\Attribut\NameAttributInterface; use App\Entity\Attribut\NameAttributInterface;
interface NameSourceInterface extends DataSourceInterface, NameAttributInterface interface NameSourceInterface extends DataSourceInterface, NameAttributInterface

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Data\Name; namespace App\Entity\Source\Primitive\Name;
interface SurnameSourceInterface extends NameSourceInterface interface SurnameSourceInterface extends NameSourceInterface
{ {

View File

@ -5,7 +5,7 @@ namespace App\Form;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use App\Entity\Source\Data\NameSource; use App\Entity\Source\Primitive\NameSource;
class NameSourceType extends AbstractType class NameSourceType extends AbstractType
{ {

View File

@ -5,7 +5,7 @@ namespace Tests\Unit\Entity\Attribut;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use App\Entity\Attribut\FirstNameSourceAttribut; use App\Entity\Attribut\FirstNameSourceAttribut;
use App\Entity\Attribut\FirstNameSourceAttributInterface; use App\Entity\Attribut\FirstNameSourceAttributInterface;
use App\Entity\Source\Data\Name\FirstNameSourceInterface; use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -5,7 +5,7 @@ namespace tests\unit\Entity\Attribut;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use App\Entity\Attribut\NameSourceAttributInterface; use App\Entity\Attribut\NameSourceAttributInterface;
use App\Entity\Attribut\NameSourceAttribut; use App\Entity\Attribut\NameSourceAttribut;
use App\Entity\Source\Data\Name\NameSourceInterface; use App\Entity\Source\Primitive\Name\NameSourceInterface;
class NameSourceAttributTest extends TestCase class NameSourceAttributTest extends TestCase
{ {

View File

@ -5,8 +5,8 @@ namespace tests\unit\Entity\Source\Combination;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use App\Entity\Source\Combination\FullPersonNameSourceInterface; use App\Entity\Source\Combination\FullPersonNameSourceInterface;
use App\Entity\Source\Combination\FullPersonNameSource; use App\Entity\Source\Combination\FullPersonNameSource;
use App\Entity\Source\Data\Name\SurnameSourceInterface; use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
use App\Entity\Source\Data\Name\FirstNameSourceInterface; use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
class FullPersonNameSourceTest extends TestCase class FullPersonNameSourceTest extends TestCase
{ {

View File

@ -3,8 +3,8 @@
namespace tests\unit\Entity\Source\Data; namespace tests\unit\Entity\Source\Data;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use App\Entity\Source\Data\Name\NameSourceInterface; use App\Entity\Source\Primitive\Name\NameSourceInterface;
use App\Entity\Source\Data\Name\AbstractNameSource; use App\Entity\Source\Primitive\Name\AbstractNameSource;
/** /**
* @author kevinfrantz * @author kevinfrantz