constrain is now not relation specific (!)

cycle · Mar 28, 2019 · 268b050 · 268b050
1 parent de7bf7d
commit 268b050
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/Promise/PromiseOne.php b/src/Promise/PromiseOne.php
@@ -69,10 +69,15 @@ public function __scope(): array
     public function __resolve()
     {
         if (!is_null($this->orm)) {
-            $key = key($this->scope);
-            $value = $this->scope[$key];
+            if (count($this->scope) !== 1) {
+                $this->resolved = $this->orm->getRepository($this->target)->findOne($this->scope);
+            } else {
+                $key = key($this->scope);
+                $value = $this->scope[$key];
+
+                $this->resolved = $this->orm->get($this->target, $key, $value, true);
+            }
 
-            $this->resolved = $this->orm->get($this->target, $key, $value, true);
             $this->orm = null;
         }
 

diff --git a/src/Relation/Pivoted/PivotedPromise.php b/src/Relation/Pivoted/PivotedPromise.php
@@ -36,9 +36,6 @@ class PivotedPromise implements PromiseInterface
     /** @var mixed */
     private $innerKey;
 
-    /** @var Select\ConstrainInterface|null */
-    private $constrain;
-
     /** @var null|PivotedStorage */
     private $resolved;
 
@@ -56,14 +53,6 @@ public function __construct(ORMInterface $orm, string $target, array $relationSc
         $this->innerKey = $innerKey;
     }
 
-    /**
-     * @param Select\ConstrainInterface $constrain
-     */
-    public function setConstrain(?Select\ConstrainInterface $constrain)
-    {
-        $this->constrain = $constrain;
-    }
-
     /**
      * @inheritdoc
      */
@@ -114,7 +103,7 @@ public function __resolve()
 
         /** @var ManyToManyLoader $loader */
         $loader = $loader->withContext($loader, [
-            'constrain' => $this->constrain,
+            'constrain' => $this->orm->getSource($this->target)->getConstrain(),
             'as'        => $table,
             'method'    => JoinableLoader::POSTLOAD
         ]);

diff --git a/tests/ORM/Morphed/MorphedHasOnePromiseTest.php b/tests/ORM/Morphed/MorphedHasOnePromiseTest.php
@@ -8,8 +8,8 @@
 
 namespace Cycle\ORM\Tests\Morphed;
 
-use Cycle\ORM\Mapper\Mapper;
 use Cycle\ORM\Heap\Heap;
+use Cycle\ORM\Mapper\Mapper;
 use Cycle\ORM\Promise\PromiseInterface;
 use Cycle\ORM\Relation;
 use Cycle\ORM\Schema;