Revert to normal properties

The order is not the same as in the constructor, and that seems to matter.
doctrine · Jun 2, 2022 · 4117209 · 4117209
1 parent a870290
commit 4117209
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/tests/Doctrine/Tests/Models/Navigation/NavPointOfInterest.php b/tests/Doctrine/Tests/Models/Navigation/NavPointOfInterest.php
@@ -21,6 +21,18 @@
  */
 class NavPointOfInterest
 {
+    /**
+     * @Id
+     * @Column(type="integer", name="nav_long")
+     */
+    private int $long;
+
+    /**
+     * @Id
+     * @Column(type="integer", name="nav_lat")
+     */
+    private int $lat;
+
     /**
      * @psalm-var Collection<int, NavUser>
      * @ManyToMany(targetEntity="NavUser", cascade={"persist"})
@@ -35,16 +47,8 @@ class NavPointOfInterest
     private $visitors;
 
     public function __construct(
-        /**
-         * @Id
-         * @Column(type="integer", name="nav_lat")
-         */
-        private int $lat,
-        /**
-         * @Id
-         * @Column(type="integer", name="nav_long")
-         */
-        private int $long,
+        int $lat,
+        int $long,
         /**
          * @Column(type="string", length=255)
          */
@@ -54,6 +58,8 @@ public function __construct(
          */
         private NavCountry $country
     ) {
+        $this->lat      = $lat;
+        $this->long     = $long;
         $this->visitors = new ArrayCollection();
     }
 

diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
@@ -155,7 +155,7 @@ public function testCompositeCollectionMemberExpression(): void
     public function testSpecifyUnknownIdentifierPrimaryKeyFails(): void
     {
         $this->expectException(MissingIdentifierField::class);
-        $this->expectExceptionMessage('The identifier lat is missing for a query of Doctrine\Tests\Models\Navigation\NavPointOfInterest');
+        $this->expectExceptionMessage('The identifier long is missing for a query of Doctrine\Tests\Models\Navigation\NavPointOfInterest');
 
         $poi = $this->_em->find(NavPointOfInterest::class, ['key1' => 100]);
     }