kevinveenbirkenbach/infinito
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/infinito.git synced 2025-10-31 17:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed AbstractDataSoure to AbstractPrimitiveSource

Browse Source
This commit is contained in:
Kevin Frantz
2018-11-21 18:22:05 +01:00
parent aaf335ce30
commit 11dc206575
7 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/Entity/Source/AbstractSource.php
View File

@@ -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
{

9
application/src/Entity/Source/Complex/ComplexSourceInterface.php
View File

@@ -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
{
}

2
application/src/Entity/Source/Primitive/AbstractDataSource.php → application/src/Entity/Source/Primitive/AbstractPrimitiveSource.php
View File

@@ -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
{
}

9
application/src/Entity/Source/Primitive/DataSourceInterface.php
View File

@@ -1,9 +0,0 @@
<?php
namespace App\Entity\Source\Primitive;
use App\Entity\Source\SourceInterface;
interface DataSourceInterface extends SourceInterface
{
}

4
application/src/Entity/Source/Primitive/Name/AbstractNameSource.php
View File

@@ -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;

4
application/src/Entity/Source/Primitive/Name/NameSourceInterface.php
View File

@@ -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
{
}

14
application/src/Entity/Source/Primitive/PrimitiveSourceInterface.php Normal file
View File

@@ -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
{
}