Merge 2.12.x into 2.13.x (doctrine#9684)

derrabus · Apr 26, 2022 · 5fbe5eb · 5fbe5eb
2 parents f4585b9 + d9508e9
commit 5fbe5eb
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.5.0",
+        "phpstan/phpstan": "~1.4.10 || 1.6.0",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.6.2",

diff --git a/phpstan-dbal2.neon b/phpstan-dbal2.neon
@@ -55,3 +55,8 @@ parameters:
         -
             message: '#^Call to method injectObjectManager\(\) on an unknown class Doctrine\\Persistence\\ObjectManagerAware\.$#'
             path: lib/Doctrine/ORM/UnitOfWork.php
+
+        # See https://github.com/phpstan/phpstan/issues/7096
+        -
+            message: '#^Method Doctrine\\ORM\\Mapping\\ReflectionEnumProperty\:\:initializeEnumValue\(\) should return BackedEnum but returns static\.$#'
+            path: lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php
diff --git a/phpstan-persistence2.neon b/phpstan-persistence2.neon
@@ -52,3 +52,8 @@ parameters:
         -
             message: "#^Return type \\(Doctrine\\\\ORM\\\\Mapping\\\\Driver\\\\AttributeReader\\) of method Doctrine\\\\ORM\\\\Mapping\\\\Driver\\\\AttributeDriver\\:\\:getReader\\(\\) should be compatible with return type \\(Doctrine\\\\Common\\\\Annotations\\\\Reader\\) of method Doctrine\\\\Persistence\\\\Mapping\\\\Driver\\\\AnnotationDriver\\:\\:getReader\\(\\)$#"
             path: lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php
+
+        # See https://github.com/phpstan/phpstan/issues/7096
+        -
+            message: '#^Method Doctrine\\ORM\\Mapping\\ReflectionEnumProperty\:\:initializeEnumValue\(\) should return BackedEnum but returns static\.$#'
+            path: lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -52,3 +52,8 @@ parameters:
         -
             message: '#^Call to method injectObjectManager\(\) on an unknown class Doctrine\\Persistence\\ObjectManagerAware\.$#'
             path: lib/Doctrine/ORM/UnitOfWork.php
+
+        # See https://github.com/phpstan/phpstan/issues/7096
+        -
+            message: '#^Method Doctrine\\ORM\\Mapping\\ReflectionEnumProperty\:\:initializeEnumValue\(\) should return BackedEnum but returns static\.$#'
+            path: lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php
diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php
@@ -51,9 +51,6 @@ public function __construct(array $params = [], ?Driver $driver = null, ?Configu
         $this->_platformMock = new DatabasePlatformMock();
 
         parent::__construct($params, $driver ?? new DriverMock(), $config, $eventManager);
-
-        // Override possible assignment of platform to database platform mock
-        $this->_platform = $this->_platformMock;
     }
 
     public function getDatabase(): string

diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
@@ -1209,7 +1209,7 @@ public function testFlushSingleAndNoCascade(): void
         $article1         = new CmsArticle();
         $article1->topic  = 'Foo';
         $article1->text   = 'Foo Text';
-        $article1->author = $user;
+        $article1->user   = $user;
         $user->articles[] = $article1;
 
         $this->expectException(InvalidArgumentException::class);

diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
@@ -23,8 +23,6 @@ protected function setUp(): void
     {
         $this->useModelSet('cms');
         parent::setUp();
-
-        $this->handles = [];
     }
 
     /**

diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
@@ -5,7 +5,6 @@
 namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\Common\Util\ClassUtils;
-use Doctrine\ORM\Proxy\ProxyFactory;
 use Doctrine\Persistence\Proxy;
 use Doctrine\Tests\Models\Company\CompanyAuction;
 use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
@@ -31,12 +30,6 @@ protected function setUp(): void
         $this->useModelSet('ecommerce');
         $this->useModelSet('company');
         parent::setUp();
-        $this->_factory = new ProxyFactory(
-            $this->_em,
-            __DIR__ . '/../../Proxies',
-            'Doctrine\Tests\Proxies',
-            true
-        );
     }
 
     public function createProduct(): int

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php
@@ -16,6 +16,9 @@
 
 class DBAL483Test extends OrmFunctionalTestCase
 {
+    /** @var Tools\SchemaTool */
+    private $schemaTool;
+
     protected function setUp(): void
     {
         parent::setUp();

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php
@@ -26,6 +26,12 @@
  */
 class DDC1163Test extends OrmFunctionalTestCase
 {
+    /** @var int|null */
+    private $productId;
+
+    /** @var int|null */
+    private $proxyHolderId;
+
     protected function setUp(): void
     {
         parent::setUp();

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php
@@ -38,16 +38,12 @@ public function testIssue(): void
         $account = new DDC1193Account();
 
         $person->account = $account;
-        $person->company = $company;
-
         $company->member = $person;
 
         $this->_em->persist($company);
-
         $this->_em->flush();
 
         $companyId = $company->id;
-        $accountId = $account->id;
         $this->_em->clear();
 
         $company = $this->_em->find(get_class($company), $companyId);

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php
@@ -90,17 +90,14 @@ public function loadFixture(): void
         $user1           = new Models\Legacy\LegacyUser();
         $user1->username = 'beberlei';
         $user1->name     = 'Benjamin';
-        $user1->_status  = 'active';
 
         $user2           = new Models\Legacy\LegacyUser();
         $user2->username = 'jwage';
         $user2->name     = 'Jonathan';
-        $user2->_status  = 'active';
 
         $user3           = new Models\Legacy\LegacyUser();
         $user3->username = 'romanb';
         $user3->name     = 'Roman';
-        $user3->_status  = 'active';
 
         $this->_em->persist($user1);
         $this->_em->persist($user2);

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
@@ -25,7 +25,6 @@ protected function setUp(): void
 
         $user           = new User();
         $user->name     = 'FabioBatSilva';
-        $user->email    = 'fabio.bat.silva@gmail.com';
         $user->groups[] = new Group('G 1');
         $user->groups[] = new Group('G 2');
         $this->user     = $user;

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2519Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2519Test.php
@@ -60,17 +60,14 @@ public function loadFixture(): void
         $user1           = new LegacyUser();
         $user1->username = 'FabioBatSilva';
         $user1->name     = 'Fabio B. Silva';
-        $user1->_status  = 'active';
 
         $user2           = new LegacyUser();
         $user2->username = 'doctrinebot';
         $user2->name     = 'Doctrine Bot';
-        $user2->_status  = 'active';
 
         $user3           = new LegacyUser();
         $user3->username = 'test';
         $user3->name     = 'Tester';
-        $user3->_status  = 'active';
 
         $this->_em->persist($user1);
         $this->_em->persist($user2);

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php
@@ -77,7 +77,6 @@ public function testJoinColumnWithSameNameAsAssociationField(): void
     public function testJoinColumnWithNullSameNameAssociationField(): void
     {
         $fkCust       = new DDC522ForeignKeyTest();
-        $fkCust->name = 'name';
         $fkCust->cart = null;
 
         $this->_em->persist($fkCust);
@@ -153,13 +152,13 @@ class DDC522ForeignKeyTest
     public $id;
 
     /**
-     * @var int
+     * @var int|null
      * @Column(type="integer", name="cart_id", nullable=true)
      */
     public $cartId;
 
     /**
-     * @var DDC522Cart
+     * @var DDC522Cart|null
      * @OneToOne(targetEntity="DDC522Cart")
      * @JoinColumn(name="cart_id", referencedColumnName="id")
      */

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC69Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC69Test.php
@@ -135,7 +135,6 @@ class Lemma
 
     public function __construct()
     {
-        $this->types     = new ArrayCollection();
         $this->relations = new ArrayCollection();
     }
 

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php
@@ -20,8 +20,6 @@ protected function setUp(): void
         $this->_schemaTool->createSchema([
             $this->_em->getClassMetadata(Ticket2481Product::class),
         ]);
-
-        $this->_conn = $this->_em->getConnection();
     }
 
     public function testEmptyInsert(): void

diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php
@@ -21,6 +21,9 @@
  */
 abstract class AbstractDriverTest extends TestCase
 {
+    /** @var string */
+    private $dir;
+
     public function testFindMappingFile(): void
     {
         $driver = $this->getDriver(

diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -734,8 +734,8 @@ public function testNewAssociatedEntityPersistenceOfNewEntitiesThroughCascadedAs
         // the cascading association not set. Having the "cascading path" involve
         // a non-new object is important to show that the ORM should be considering
         // cascades across entity changesets in subsequent flushes.
-        $cascading->cascaded    = $cascadePersisted;
-        $nonCascading->cascaded = $cascadePersisted;
+        $cascading->cascaded       = $cascadePersisted;
+        $nonCascading->nonCascaded = $cascadePersisted;
 
         $this->_unitOfWork->persist($cascading);
         $this->_unitOfWork->persist($nonCascading);
@@ -1115,7 +1115,7 @@ class EntityWithCascadingAssociation
     private $id;
 
     /**
-     * @var CascadePersistedEntity
+     * @var CascadePersistedEntity|null
      * @ManyToOne(targetEntity=CascadePersistedEntity::class, cascade={"persist"})
      */
     public $cascaded;
@@ -1138,7 +1138,7 @@ class EntityWithNonCascadingAssociation
     private $id;
 
     /**
-     * @var CascadePersistedEntity
+     * @var CascadePersistedEntity|null
      * @ManyToOne(targetEntity=CascadePersistedEntity::class)
      */
     public $nonCascaded;