Skip to content

Commit f0a5f45

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.0
* 6.4: [GHA] Remove deprecations-baseline [DoctrineBridge] Cleanup tests [DependencyInjection] Support PHP 8.2 `true` type
2 parents 9a2d19f + 4ba0137 commit f0a5f45

Some content is hidden

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

46 files changed

+42
-1276
lines changed

‎.github/deprecations-baseline.json

Lines changed: 0 additions & 887 deletions
This file was deleted.

‎.github/workflows/integration-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ jobs:
157157
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
158158
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
159159
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
160-
echo SYMFONY_DEPRECATIONS_HELPER="baselineFile=$(pwd)/.github/deprecations-baseline.json" >> $GITHUB_ENV
161160
162161
echo "::group::composer update"
163162
composer require --dev --no-update mongodb/mongodb

‎.github/workflows/unit-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ jobs:
8888
8989
# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
9090
if [[ ! "${{ matrix.mode }}" = *-deps ]]; then
91-
echo SYMFONY_DEPRECATIONS_HELPER="baselineFile=$(pwd)/.github/deprecations-baseline.json" >> $GITHUB_ENV
9291
php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
9392
else
9493
echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV

‎src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

14-
use Doctrine\Common\Annotations\AnnotationReader;
1514
use Doctrine\Common\EventManager;
1615
use Doctrine\DBAL\DriverManager;
1716
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
1817
use Doctrine\ORM\Configuration;
1918
use Doctrine\ORM\EntityManager;
20-
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
2119
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
2220
use Doctrine\ORM\Mapping\Driver\XmlDriver;
2321
use Doctrine\ORM\ORMSetup;
@@ -64,11 +62,7 @@ public static function createTestConfiguration(): Configuration
6462
$config->setAutoGenerateProxyClasses(true);
6563
$config->setProxyDir(sys_get_temp_dir());
6664
$config->setProxyNamespace('SymfonyTests\Doctrine');
67-
if (class_exists(AttributeDriver::class)) {
68-
$config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
69-
} else {
70-
$config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), null, true));
71-
}
65+
$config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
7266
if (class_exists(DefaultSchemaManagerFactory::class)) {
7367
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
7468
}

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,22 @@
1313

1414
use Doctrine\ORM\Mapping as ORM;
1515

16-
/**
17-
* @ORM\Entity
18-
*/
1916
#[ORM\Entity]
2017
class AssociationEntity
2118
{
2219
/**
2320
* @var int
24-
* @ORM\Id @ORM\GeneratedValue
25-
* @ORM\Column(type="integer")
2621
*/
2722
#[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
2823
private $id;
2924

3025
/**
31-
* @ORM\ManyToOne(targetEntity="SingleIntIdEntity")
32-
*
3326
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity
3427
*/
3528
#[ORM\ManyToOne(targetEntity: SingleIntIdEntity::class)]
3629
public $single;
3730

3831
/**
39-
* @ORM\ManyToOne(targetEntity="CompositeIntIdEntity")
40-
* @ORM\JoinColumns({
41-
* @ORM\JoinColumn(name="composite_id1", referencedColumnName="id1"),
42-
* @ORM\JoinColumn(name="composite_id2", referencedColumnName="id2")
43-
* })
44-
*
4532
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
4633
*/
4734
#[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,22 @@
1313

1414
use Doctrine\ORM\Mapping as ORM;
1515

16-
/**
17-
* @ORM\Entity
18-
*/
1916
#[ORM\Entity]
2017
class AssociationEntity2
2118
{
2219
/**
2320
* @var int
24-
* @ORM\Id @ORM\GeneratedValue
25-
* @ORM\Column(type="integer")
2621
*/
2722
#[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
2823
private $id;
2924

3025
/**
31-
* @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity")
32-
*
3326
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity
3427
*/
3528
#[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class)]
3629
public $single;
3730

3831
/**
39-
* @ORM\ManyToOne(targetEntity="CompositeIntIdEntity")
40-
* @ORM\JoinColumns({
41-
* @ORM\JoinColumn(name="composite_id1", referencedColumnName="id1"),
42-
* @ORM\JoinColumn(name="composite_id2", referencedColumnName="id2")
43-
* })
44-
*
4532
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
4633
*/
4734
#[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AnnotationsBundle/Entity/Person.php

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

18-
/**
19-
* @Entity
20-
*/
2118
#[Entity]
2219
class Person
2320
{
24-
/** @Id @Column(type="integer") */
2521
#[Id, Column(type: 'integer')]
2622
protected $id;
2723

28-
/** @Column(type="string") */
2924
#[Column(type: 'string')]
3025
public $name;
3126

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AnnotationsOneLineBundle/Entity/Person.php

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

18-
/** @Entity */
1918
#[Entity]
2019
class Person
2120
{
22-
/** @Id @Column(type="integer") */
2321
#[Id, Column(type: 'integer')]
2422
protected $id;
2523

26-
/** @Column(type="string") */
2724
#[Column(type: 'string')]
2825
public $name;
2926

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AttributesBundle/AnnotatedEntity/Person.php

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

18-
/**
19-
* @Entity
20-
*/
2118
#[Entity]
2219
class Person
2320
{
24-
/** @Id @Column(type="integer") */
2521
#[Id, Column(type: 'integer')]
2622
protected $id;
2723

28-
/** @Column(type="string") */
2924
#[Column(type: 'string')]
3025
public $name;
3126

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/FullEmbeddableAnnotationsBundle/Entity/Address.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,15 @@
1414
use Doctrine\ORM\Mapping\Column;
1515
use Doctrine\ORM\Mapping\Embeddable;
1616

17-
/**
18-
* @Embeddable
19-
*/
2017
#[Embeddable]
2118
class Address
2219
{
23-
24-
/** @Column(type="string") */
2520
#[Column(type: 'string')]
2621
public $street;
2722

28-
/** @Column(type="string") */
2923
#[Column(type: 'string')]
3024
public $zipCode;
3125

32-
/** @Column(type="string") */
3326
#[Column(type: 'string')]
3427
public $city;
3528

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy