Fixed Walk not evaluating path in current record context.

Author: Paul

src/Strategy/Walk.php

@@ -1,18 +1,14 @@
 <?php
 namespace ScriptFUSION\Mapper\Strategy;
 
-use ScriptFUSION\Mapper\Mapper;
 use ScriptFUSION\Mapper\Mapping;
 
 /**
  * Walks a nested structure to the specified element in the same manner as Copy.
  */
 class Walk extends Delegate
 {
-    /**
-     * @var Copy
-     */
-    private $copy;
+    private $path;
 
     /**
      * @param Strategy|Mapping|array|mixed $expression Expression to walk.
@@ -23,18 +19,13 @@ public function __construct($expression, $path)
     {
         parent::__construct($expression);
 
-        $this->copy = new Copy($path);
+        $this->path = $path;
     }
 
     public function __invoke($data, $context = null)
     {
-        return call_user_func($this->copy, parent::__invoke($data, $context), $context);
-    }
-
-    public function setMapper(Mapper $mapper)
-    {
-        $this->copy->setMapper($mapper);
+        $copy = (new Copy($this->delegate($this->path, $data, $context)))->setMapper($this->getMapper());
 
-        return parent::setMapper($mapper);
+        return $copy(parent::__invoke($data, $context), $context);
     }
 }

test/Integration/Mapper/Strategy/WalkTest.php

@@ -2,17 +2,24 @@
 namespace ScriptFUSIONTest\Integration\Mapper\Strategy;
 
 use ScriptFUSION\Mapper\Mapper;
+use ScriptFUSION\Mapper\Strategy\Copy;
 use ScriptFUSION\Mapper\Strategy\Walk;
 
 final class WalkTest extends \PHPUnit_Framework_TestCase
 {
-    public function testWalk()
+    public function testWalkFixedPath()
     {
-        /** @var Walk $walk */
         $walk = (new Walk(['foo' => ['bar' => 'baz']], 'foo->bar'))
-            ->setMapper(new Mapper)
-        ;
+            ->setMapper(new Mapper);
 
         self::assertSame('baz', $walk([]));
     }
+
+    public function testWalkStrategyPath()
+    {
+        $walk = (new Walk(['bar' => 'baz'], new Copy('foo')))
+            ->setMapper(new Mapper);
+
+        self::assertSame('baz', $walk(['foo' => 'bar']));
+    }
 }