8000 [DoctrineBridge] Fix UniqueEntity interaction with inheritance · lemoinem/symfony@3e61c58 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3e61c58

Browse files
lemoinemlemoinem
committed
[DoctrineBridge] Fix UniqueEntity interaction with inheritance
Fixes symfony#16969 Fixes symfony#4087 Fixes symfony#12573 Incompatible with symfony#15002 Incompatible with symfony#12977
1 parent dba386e commit 3e61c58

18 files changed

+446
-26
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/ChildEntity.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
13+
14+
use Doctrine\ORM\Mapping\Id;
15+
use Doctrine\ORM\Mapping\Column;
16+
use Doctrine\ORM\Mapping\Entity;
17+
18+
/** @Entity */
19+
class ChildEntity extends SingleIntIdEntity
20+
{
21+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/GoodEntity.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
use Doctrine\ORM\Mapping\Entity;
15+
16+
/**
17+
* @Entity
18+
*/
19+
class GoodEntity extends UpperTransient
20+
{
21+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/InstanceEntity.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
use Doctrine\ORM\Mapping\Entity;
15+
16+
/**
17+
* @Entity
18+
*/
19+
class InstanceEntity extends LowerEntity
20+
{
21+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerEntity.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
use Doctrine\ORM\Mapping\Entity;
15+
16+
/**
17+
* @Entity
18+
*/
19+
class LowerEntity extends LowerTransient
20+
{
21+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerMappedSuperClass.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
use Doctrine\ORM\Mapping\MappedSuperclass;
15+
16+
/** @MappedSuperclass */
17+
class LowerMappedSuperClass extends GoodEntity
18+
{
19+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerTransient.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
class LowerTransient extends LowerMappedSuperClass
15+
{
16+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideEntity.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
use Doctrine\ORM\Mapping\Entity;
15+
16+
/**
17+
* @Entity
18+
*/
19+
class SideEntity extends SideTransient
20+
{
21+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideMappedSuperClass.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
use Doctrine\ORM\Mapping\MappedSuperclass;
15+
16+
/** @MappedSuperclass */
17+
class SideMappedSuperClass extends GoodEntity
18+
{
19+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideTransient.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
class SideTransient extends SideMappedSuperClass
15+
{
16+
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/TargetMappedSuperClass.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
13+
14+
use Doctrine\ORM\Mapping\MappedSuperclass;
15+
16+
/** @MappedSuperclass */
17+
class TargetMappedSuperClass extends TopEntity
18+
{
19+
}

0 commit comments

Comments
 (0)
0