Fix resolve current with range references (#955)

nelmio · Sep 27, 2018 · 9c730ed · 9c730ed
1 parent c37dcd0
commit 9c730ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Generator/Resolver/Value/Chainable/EvaluatedValueResolver.php b/src/Generator/Resolver/Value/Chainable/EvaluatedValueResolver.php
@@ -58,6 +58,10 @@ public function resolve(
         $_scope = $scope;
         try {
             $_scope['current'] = $fixture->getValueForCurrent();
+
+            if ($_scope['current'] instanceof FixtureInterface) {
+                $_scope['current'] = $fixtureSet->getObjects()->get($_scope['current'])->getInstance();
+            }
         } catch (NoValueForCurrentException $exception) {
             // Continue
         }

diff --git a/tests/Loader/LoaderIntegrationTest.php b/tests/Loader/LoaderIntegrationTest.php
@@ -677,7 +677,7 @@ public function testLoadReferenceRange()
                 ],
                 'userdetail_single_{@user1}' => [
                     'email' => '<email()>',
-                    'user'  => '<current()>',
+                    'user'  => '<($current)>',
                 ],
             ],
         ];