Moved collections to complex

This commit is contained in:
Kevin Frantz 2018-11-22 20:50:05 +01:00
parent e702e356a0
commit e63b265ee4
12 changed files with 17 additions and 17 deletions

View File

@ -2,8 +2,8 @@
namespace App\Domain\SourceManagement; namespace App\Domain\SourceManagement;
use App\Entity\Source\Collection\TreeCollectionSourceInterface; use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
use App\Entity\Source\Collection\TreeCollectionSource; use App\Entity\Source\Complex\Collection\TreeCollectionSource;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use App\Entity\Source\SourceInterface; use App\Entity\Source\SourceInterface;

View File

@ -3,7 +3,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use App\Entity\Source\Collection\TreeCollectionSourceInterface; use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -3,7 +3,7 @@
namespace App\Entity\Attribut; namespace App\Entity\Attribut;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use App\Entity\Source\Collection\TreeCollectionSourceInterface; use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -14,7 +14,7 @@ use App\Entity\Meta\LawInterface;
use App\Entity\Meta\Law; use App\Entity\Meta\Law;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use App\Entity\Attribut\MembershipsAttribut; use App\Entity\Attribut\MembershipsAttribut;
use App\Entity\Source\Collection\TreeCollectionSourceInterface; use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
/** /**
* @author kevinfrantz * @author kevinfrantz
@ -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({"primitive" = "App\Entity\Source\Primitive\AbstractPrimitiveSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"}) * @ORM\DiscriminatorMap({"primitive" = "App\Entity\Source\Primitive\AbstractPrimitiveSource", "collection" = "App\Entity\Source\Complex\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
*/ */
abstract class AbstractSource extends AbstractEntity implements SourceInterface abstract class AbstractSource extends AbstractEntity implements SourceInterface
{ {
@ -42,7 +42,7 @@ abstract class AbstractSource extends AbstractEntity implements SourceInterface
* @todo Rename table to use the right schema * @todo Rename table to use the right schema
* *
* @var Collection|TreeCollectionSourceInterface[] * @var Collection|TreeCollectionSourceInterface[]
* @ORM\ManyToMany(targetEntity="App\Entity\Source\Collection\TreeCollectionSource",mappedBy="collection") * @ORM\ManyToMany(targetEntity="App\Entity\Source\Complex\Collection\TreeCollectionSource",mappedBy="collection")
*/ */
protected $memberships; protected $memberships;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Collection; namespace App\Entity\Source\Complex\Collection;
use App\Entity\Source\AbstractSource; use App\Entity\Source\AbstractSource;
use App\Entity\Attribut\CollectionAttribut; use App\Entity\Attribut\CollectionAttribut;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Collection; namespace App\Entity\Source\Complex\Collection;
use App\Entity\Source\SourceInterface; use App\Entity\Source\SourceInterface;
use App\Entity\Attribut\CollectionAttributInterface; use App\Entity\Attribut\CollectionAttributInterface;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Collection; namespace App\Entity\Source\Complex\Collection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use App\Entity\Attribut\CollectionAttribut; use App\Entity\Attribut\CollectionAttribut;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Entity\Source\Collection; namespace App\Entity\Source\Complex\Collection;
/** /**
* @author kevinfrantz * @author kevinfrantz

View File

@ -3,7 +3,7 @@
namespace Tests\Unit\Domain\SourceManagement; namespace Tests\Unit\Domain\SourceManagement;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use App\Entity\Source\Collection\TreeCollectionSource; use App\Entity\Source\Complex\Collection\TreeCollectionSource;
use App\Entity\Source\SourceInterface; use App\Entity\Source\SourceInterface;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use App\Domain\SourceManagement\TreeSourceServiceInterface; use App\Domain\SourceManagement\TreeSourceServiceInterface;

View File

@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase;
use App\Entity\Attribut\MembershipsAttributInterface; use App\Entity\Attribut\MembershipsAttributInterface;
use App\Entity\Attribut\MembershipsAttribut; use App\Entity\Attribut\MembershipsAttribut;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use App\Entity\Source\Collection\TreeCollectionSourceInterface; use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
class MembershipsAttributTest extends TestCase class MembershipsAttributTest extends TestCase
{ {

View File

@ -3,8 +3,8 @@
namespace Tests\Unit\Entity\Source\Collection; namespace Tests\Unit\Entity\Source\Collection;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use App\Entity\Source\Collection\CollectionSourceInterface; use App\Entity\Source\Complex\Collection\CollectionSourceInterface;
use App\Entity\Source\Collection\AbstractCollectionSource; use App\Entity\Source\Complex\Collection\AbstractCollectionSource;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
class AbstractCollectionSourceTest extends TestCase class AbstractCollectionSourceTest extends TestCase

View File

@ -6,8 +6,8 @@ use PHPUnit\Framework\TestCase;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use App\Entity\Source\AbstractSource; use App\Entity\Source\AbstractSource;
use App\Entity\Source\Collection\TreeCollectionSourceInterface; use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
use App\Entity\Source\Collection\TreeCollectionSource; use App\Entity\Source\Complex\Collection\TreeCollectionSource;
/** /**
* @author kevinfrantz * @author kevinfrantz