make Join::${weak, reverse} props public

Author: mvorisek

src/Model/Join.php

@@ -44,7 +44,7 @@ abstract class Join
     protected $kind;
 
     /** Weak join does not update foreign table. */
-    protected bool $weak = false;
+    public bool $weak = false;
 
     /**
      * Normally the foreign table is saved first, then it's ID is used in the
@@ -59,7 +59,7 @@ abstract class Join
      * of saving and delete needs to be reversed. In this case $reverse
      * will be set to `true`. You can specify value of this property.
      */
-    protected bool $reverse = false;
+    public bool $reverse = false;
 
     /**
      * Field to be used for matching inside master table.

src/Schema/Migrator.php

@@ -372,8 +372,7 @@ protected function resolveRelationDirection(object $relation): array
         } elseif ($relation instanceof Join) {
             $localField = $relation->getMasterField();
             $foreignField = $relation->getForeignModel()->getField($relation->foreignField);
-
-            if ($localField->shortName === 'id') { // TODO quick hack, detect direction based on kind/reverse here
+            if ($relation->reverse) {
                 [$localField, $foreignField] = [$foreignField, $localField];
             }
         } else {

tests/JoinArrayTest.php

@@ -36,23 +36,23 @@ public function testDirection(): void
         $m = new Model($db, ['table' => 'user']);
 
         $j = $m->join('contact');
-        self::assertFalse($this->getProtected($j, 'reverse'));
+        self::assertFalse($j->reverse);
         self::assertSame('contact_id', $this->getProtected($j, 'masterField'));
         self::assertSame('id', $this->getProtected($j, 'foreignField'));
 
         $j = $m->join('contact2.test_id');
-        self::assertTrue($this->getProtected($j, 'reverse'));
+        self::assertTrue($j->reverse);
         self::assertSame('id', $this->getProtected($j, 'masterField'));
         self::assertSame('test_id', $this->getProtected($j, 'foreignField'));
 
         $j = $m->join('contact3', ['masterField' => 'test_id']);
-        self::assertFalse($this->getProtected($j, 'reverse'));
+        self::assertFalse($j->reverse);
         self::assertSame('test_id', $this->getProtected($j, 'masterField'));
         self::assertSame('id', $this->getProtected($j, 'foreignField'));
 
         $this->expectException(Exception::class); // TODO not implemented yet, see https://github.com/atk4/data/issues/803
         $j = $m->join('contact4.foo_id', ['masterField' => 'test_id', 'reverse' => true]);
-        // self::assertTrue($this->getProtected($j, 'reverse'));
+        // self::assertTrue($j->reverse);
         // self::assertSame('test_id', $this->getProtected($j, 'masterField'));
         // self::assertSame('foo_id', $this->getProtected($j, 'foreignField'));
     }
@@ -414,12 +414,12 @@ public function testForeignFieldNameGuessTableWithSchema(): void
 
         $m = new Model($db, ['table' => 'db.user']);
         $j = $m->join('contact');
-        self::assertFalse($this->getProtected($j, 'reverse'));
+        self::assertFalse($j->reverse);
         self::assertSame('contact_id', $this->getProtected($j, 'masterField'));
         self::assertSame('id', $this->getProtected($j, 'foreignField'));
 
         $j = $m->join('contact2', ['reverse' => true]);
-        self::assertTrue($this->getProtected($j, 'reverse'));
+        self::assertTrue($j->reverse);
         self::assertSame('id', $this->getProtected($j, 'masterField'));
         self::assertSame('user_id', $this->getProtected($j, 'foreignField'));
     }

tests/JoinSqlTest.php

@@ -51,17 +51,17 @@ public function testDirection(): void
         $m = new Model($this->db, ['table' => 'user']);
 
         $j1 = $m->join('contact');
-        self::assertFalse($this->getProtected($j1, 'reverse'));
+        self::assertFalse($j1->reverse);
         self::assertSame('contact_id', $this->getProtected($j1, 'masterField'));
         self::assertSame('id', $this->getProtected($j1, 'foreignField'));
 
         $j2 = $m->join('contact2.test_id');
-        self::assertTrue($this->getProtected($j2, 'reverse'));
+        self::assertTrue($j2->reverse);
         self::assertSame('id', $this->getProtected($j2, 'masterField'));
         self::assertSame('test_id', $this->getProtected($j2, 'foreignField'));
 
         $j3 = $m->join('contact3', ['masterField' => 'test_id']);
-        self::assertFalse($this->getProtected($j3, 'reverse'));
+        self::assertFalse($j3->reverse);
         self::assertSame('test_id', $this->getProtected($j3, 'masterField'));
         self::assertSame('id', $this->getProtected($j3, 'foreignField'));
 
@@ -78,7 +78,7 @@ public function testDirection(): void
         $this->expectException(Exception::class);
         $this->expectExceptionMessage('Joining tables on non-id fields is not implemented yet'); // https://github.com/atk4/data/issues/803
         $j4 = $m->join('contact4.foo_id', ['masterField' => 'test_id', 'reverse' => true]);
-        // self::assertTrue($this->getProtected($j4, 'reverse'));
+        // self::assertTrue($j4->reverse);
         // self::assertSame('test_id', $this->getProtected($j4, 'masterField'));
         // self::assertSame('foo_id', $this->getProtected($j4, 'foreignField'));
     }