Skip to content

Commit 1291e59

Browse files
xabbuhxabbuh
committed
Merge branch '6.2' into 6.3
* 6.2: fix Doctrine deprecations fix merge Fix Doctrine deprecations [Validator] Remove internal from methods on non-internal interfaces [PhpUnitBridge] Fix support for the NO_COLOR env var
2 parents 501d0c8 + 076e8b6 commit 1291e59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+263
-42
lines changed

‎Form/ChoiceList/ORMQueryBuilderLoader.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
1313

14+
use Doctrine\DBAL\ArrayParameterType;
1415
use Doctrine\DBAL\Connection;
1516
use Doctrine\DBAL\Types\ConversionException;
1617
use Doctrine\DBAL\Types\Type;
@@ -70,13 +71,13 @@ public function getEntitiesByIds(string $identifier, array $values): array
7071
$entity = current($qb->getRootEntities());
7172
$metadata = $qb->getEntityManager()->getClassMetadata($entity);
7273
if (\in_array($type = $metadata->getTypeOfField($identifier), ['integer', 'bigint', 'smallint'])) {
73-
$parameterType = Connection::PARAM_INT_ARRAY;
74+
$parameterType = class_exists(ArrayParameterType::class) ? ArrayParameterType::INTEGER : Connection::PARAM_INT_ARRAY;
7475

7576
// Filter out non-integer values (e.g. ""). If we don't, some
7677
// databases such as PostgreSQL fail.
7778
$values = array_values(array_filter($values, fn ($v) => (string) $v === (string) (int) $v || ctype_digit($v)));
7879
} elseif (\in_array($type, ['ulid', 'uuid', 'guid'])) {
79-
$parameterType = Connection::PARAM_STR_ARRAY;
80+
$parameterType = class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY;
8081

8182
// Like above, but we just filter out empty strings.
8283
$values = array_values(array_filter($values, fn ($v) => '' !== (string) $v));
@@ -95,7 +96,7 @@ public function getEntitiesByIds(string $identifier, array $values): array
9596
unset($value);
9697
}
9798
} else {
98-
$parameterType = Connection::PARAM_STR_ARRAY;
99+
$parameterType = class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY;
99100
}
100101
if (!$values) {
101102
return [];

‎Tests/DependencyInjection/DoctrineExtensionTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public function testMappingTypeDetection()
185185

186186
// The ordinary fixtures contain annotation
187187
$mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures', $container);
188-
$this->assertSame($mappingType, 'annotation');
188+
$this->assertSame($mappingType, 'attribute');
189189

190190
// In the attribute folder, attributes are used
191191
$mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures/Attribute', $container);
@@ -273,9 +273,9 @@ public function testUnrecognizedCacheDriverException()
273273

274274
public static function providerBundles()
275275
{
276-
yield ['AnnotationsBundle', 'annotation', '/Entity'];
277-
yield ['AnnotationsOneLineBundle', 'annotation', '/Entity'];
278-
yield ['FullEmbeddableAnnotationsBundle', 'annotation', '/Entity'];
276+
yield ['AnnotationsBundle', 'attribute', '/Entity'];
277+
yield ['AnnotationsOneLineBundle', 'attribute', '/Entity'];
278+
yield ['FullEmbeddableAnnotationsBundle', 'attribute', '/Entity'];
279279
yield ['AttributesBundle', 'attribute', '/Entity'];
280280
yield ['FullEmbeddableAttributesBundle', 'attribute', '/Entity'];
281281
yield ['XmlBundle', 'xml', '/Resources/config/doctrine'];
@@ -284,7 +284,7 @@ public static function providerBundles()
284284

285285
yield ['SrcXmlBundle', 'xml', '/Resources/config/doctrine'];
286286

287-
yield ['NewAnnotationsBundle', 'annotation', \DIRECTORY_SEPARATOR.'src/Entity'];
287+
yield ['NewAnnotationsBundle', 'attribute', \DIRECTORY_SEPARATOR.'src/Entity'];
288288
yield ['NewXmlBundle', 'xml', '/config/doctrine'];
289289
}
290290

‎Tests/DoctrineTestHelper.php‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@
1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
15+
use Doctrine\DBAL\DriverManager;
16+
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
1517
use Doctrine\ORM\Configuration;
1618
use Doctrine\ORM\EntityManager;
1719
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
20+
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
1821
use Doctrine\ORM\Mapping\Driver\XmlDriver;
22+
use Doctrine\ORM\ORMSetup;
1923
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
2024
use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
2125
use PHPUnit\Framework\TestCase;
@@ -41,17 +45,30 @@ public static function createTestEntityManager(Configuration $config = null): En
4145
'memory' => true,
4246
];
4347

44-
return EntityManager::create($params, $config ?? self::createTestConfiguration());
48+
$config ??= self::createTestConfiguration();
49+
50+
if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
51+
return EntityManager::create($params, $config);
52+
}
53+
54+
return new EntityManager(DriverManager::getConnection($params, $config), $config);
4555
}
4656

4757
public static function createTestConfiguration(): Configuration
4858
{
49-
$config = new Configuration();
59+
$config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
5060
$config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
5161
$config->setAutoGenerateProxyClasses(true);
5262
$config->setProxyDir(sys_get_temp_dir());
5363
$config->setProxyNamespace('SymfonyTests\Doctrine');
54-
$config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader()));
64+
if (class_exists(AttributeDriver::class)) {
65+
$config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
66+
} else {
67+
$config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), null, true));
68+
}
69+
if (class_exists(DefaultSchemaManagerFactory::class)) {
70+
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
71+
}
5572

5673
return $config;
5774
}
@@ -65,7 +82,9 @@ public static function createTestConfigurationWithXmlLoader(): Configuration
6582
new XmlDriver(
6683
new SymfonyFileLocator(
6784
[__DIR__.'/../Tests/Resources/orm' => 'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'], '.orm.xml'
68-
)
85+
),
86+
'.orm.xml',
87+
true
6988
),
7089
'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'
7190
);

‎Tests/Fixtures/AssociationEntity.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,23 @@
1616
/**
1717
* @ORM\Entity
1818
*/
19+
#[ORM\Entity]
1920
class AssociationEntity
2021
{
2122
/**
2223
* @var int
2324
* @ORM\Id @ORM\GeneratedValue
2425
* @ORM\Column(type="integer")
2526
*/
27+
#[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
2628
private $id;
2729

2830
/**
2931
* @ORM\ManyToOne(targetEntity="SingleIntIdEntity")
3032
*
3133
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity
3234
*/
35+
#[ORM\ManyToOne(targetEntity: SingleIntIdEntity::class)]
3336
public $single;
3437

3538
/**
@@ -41,5 +44,8 @@ class AssociationEntity
4144
*
4245
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
4346
*/
47+
#[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]
48+
#[ORM\JoinColumn(name: 'composite_id1', referencedColumnName: 'id1')]
49+
#[ORM\JoinColumn(name: 'composite_id2', referencedColumnName: 'id2')]
4450
public $composite;
4551
}

‎Tests/Fixtures/AssociationEntity2.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,23 @@
1616
/**
1717
* @ORM\Entity
1818
*/
19+
#[ORM\Entity]
1920
class AssociationEntity2
2021
{
2122
/**
2223
* @var int
2324
* @ORM\Id @ORM\GeneratedValue
2425
* @ORM\Column(type="integer")
2526
*/
27+
#[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
2628
private $id;
2729

2830
/**
2931
* @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity")
3032
*
3133
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity
3234
*/
35+
#[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class)]
3336
public $single;
3437

3538
/**
@@ -41,5 +44,8 @@ class AssociationEntity2
4144
*
4245
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
4346
*/
47+
#[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]
48+
#[ORM\JoinColumn(name: 'composite_id1', referencedColumnName: 'id1')]
49+
#[ORM\JoinColumn(name: 'composite_id2', referencedColumnName: 'id2')]
4450
public $composite;
4551
}

‎Tests/Fixtures/Bundles/AnnotationsBundle/Entity/Person.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@
1818
/**
1919
* @Entity
2020
*/
21+
#[Entity]
2122
class Person
2223
{
2324
/** @Id @Column(type="integer") */
25+
#[Id, Column(type: 'integer')]
2426
protected $id;
2527

2628
/** @Column(type="string") */
29+
#[Column(type: 'string')]
2730
public $name;
2831

2932
public function __construct($id, $name)

‎Tests/Fixtures/Bundles/AnnotationsOneLineBundle/Entity/Person.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616
use Doctrine\ORM\Mapping\Id;
1717

1818
/** @Entity */
19+
#[Entity]
1920
class Person
2021
{
2122
/** @Id @Column(type="integer") */
23+
#[Id, Column(type: 'integer')]
2224
protected $id;
2325

2426
/** @Column(type="string") */
27+
#[Column(type: 'string')]
2528
public $name;
2629

2730
public function __construct($id, $name)

‎Tests/Fixtures/Bundles/AttributesBundle/AnnotatedEntity/Person.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@
1818
/**
1919
* @Entity
2020
*/
21+
#[Entity]
2122
class Person
2223
{
2324
/** @Id @Column(type="integer") */
25+
#[Id, Column(type: 'integer')]
2426
protected $id;
2527

2628
/** @Column(type="string") */
29+
#[Column(type: 'string')]
2730
public $name;
2831

2932
public function __construct($id, $name)

‎Tests/Fixtures/Bundles/FullEmbeddableAnnotationsBundle/Entity/Address.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,24 @@
1313

1414
use Doctrine\ORM\Mapping\Column;
1515
use Doctrine\ORM\Mapping\Embeddable;
16-
use Doctrine\ORM\Mapping\Id;
1716

1817
/**
1918
* @Embeddable
2019
*/
20+
#[Embeddable]
2121
class Address
2222
{
2323

2424
/** @Column(type="string") */
25+
#[Column(type: 'string')]
2526
public $street;
2627

2728
/** @Column(type="string") */
29+
#[Column(type: 'string')]
2830
public $zipCode;
2931

3032
/** @Column(type="string") */
33+
#[Column(type: 'string')]
3134
public $city;
3235

3336
public function __construct($street, $zipCode, $city)

‎Tests/Fixtures/Bundles/FullEmbeddableAttributesBundle/Entity/Address.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Doctrine\ORM\Mapping\Column;
1515
use Doctrine\ORM\Mapping\Embeddable;
16-
use Doctrine\ORM\Mapping\Id;
1716

1817
#[Embeddable]
1918
class Address

0 commit comments

Comments
 (0)