Fixed key context propagation for delegate strategies.

N.B. Key propagation is still broken for Copy* strategies until they implement KeyAware.

README.md

@@ -812,7 +812,7 @@ Limitations
 Testing
 -------
 
-Mapper is fully unit tested. Run the tests with `bin/test` from a shell. All examples
+Mapper is fully unit tested. Run the tests with the `composer test` command. All examples
 in this document can be found in `DocumentationTest`.
 
 

src/Strategy/Copy.php

@@ -15,7 +15,7 @@ class Copy implements Strategy
     /**
      * Initializes this instance with the specified path.
      *
-     * @param array|string $path Array of path components or string of  `->`-delimited components.
+     * @param array|string $path Array of path components or string of `->`-delimited components.
      */
     public function __construct($path)
     {

src/Strategy/CopyContext.php

@@ -11,13 +11,13 @@ class CopyContext extends Copy
     /**
      * {@inheritdoc}
      *
-     * @param array|string $path Array of path components or string of  `->`-delimited components.
+     * @param array|string $path Array of path components or string of `->`-delimited components.
      */
     public function __construct($path = null)
     {
         parent::__construct($path);
 
-        $this->walk = !!$path;
+        $this->walk = (bool)$path;
     }
 
     public function __invoke($data, $context = null)

src/Strategy/Delegate.php

@@ -1,13 +1,15 @@
 <?php
 namespace ScriptFUSION\Mapper\Strategy;
 
+use ScriptFUSION\Mapper\KeyAware;
+use ScriptFUSION\Mapper\KeyAwareTrait;
 use ScriptFUSION\Mapper\MapperAware;
 use ScriptFUSION\Mapper\MapperAwareTrait;
 use ScriptFUSION\Mapper\Mapping;
 
-abstract class Delegate implements Strategy, MapperAware
+abstract class Delegate implements Strategy, MapperAware, KeyAware
 {
-    use MapperAwareTrait;
+    use MapperAwareTrait, KeyAwareTrait;
 
     private $expression;
 
@@ -26,6 +28,6 @@ public function __invoke($data, $context = null)
 
     protected function delegate($strategy, $data, $context, $key = null)
     {
-        return $this->mapper->map($data, $strategy, $context, $key);
+        return $this->mapper->map($data, $strategy, $context, $key !== null ? $key : $this->key);
     }
 }

src/Strategy/Walk.php

@@ -16,7 +16,7 @@ class Walk extends Copy implements MapperAware
 
     /**
      * @param Strategy|Mapping|array|mixed $expression Expression.
-     * @param array|string $path Array of path components or string of  `->`-delimited components.
+     * @param array|string $path Array of path components or string of `->`-delimited components.
      */
     public function __construct($expression, $path)
     {

test/Functional/KeyPropagationTest.php

@@ -0,0 +1,52 @@
+<?php
+namespace ScriptFUSIONTest\Functional;
+
+use ScriptFUSION\Mapper\Mapper;
+use ScriptFUSION\Mapper\Strategy\Collection;
+use ScriptFUSION\Mapper\Strategy\Context;
+use ScriptFUSION\Mapper\Strategy\Copy;
+use ScriptFUSION\Mapper\Strategy\CopyContext;
+use ScriptFUSION\Mapper\Strategy\CopyKey;
+
+/**
+ * Tests that the key context is correctly propagated through different expression types.
+ */
+final class KeyPropagationTest extends \PHPUnit_Framework_TestCase
+{
+    public function testFragmentPropagation()
+    {
+        $mapped = (new Mapper)->map(
+            [
+                'foo' => [
+                    'bar' => [],
+                ],
+            ],
+            new Collection(
+                new Copy('foo'),
+                ['foo' => new CopyKey]
+            )
+        );
+
+        self::assertSame(['bar' => ['foo' => 'bar']], $mapped);
+    }
+
+    public function testStrategyPropagation()
+    {
+        $mapped = (new Mapper)->map(
+            [
+                'foo' => [
+                    'bar' => [],
+                ],
+            ],
+            new Collection(
+                new Copy('foo'),
+                new Context(
+                    new CopyContext,
+                    new CopyKey
+                )
+            )
+        );
+
+        self::assertSame(['bar' => 'bar'], $mapped);
+    }
+}

test/Unit/Mapper/Strategy/CopyKeyTest.php

@@ -5,6 +5,12 @@
 
 final class CopyKeyTest extends \PHPUnit_Framework_TestCase
 {
+    public function testDefault()
+    {
+        $copyKey = new CopyKey;
+        self::assertNull($copyKey([]));
+    }
+
     public function testRoundTrip()
     {
         $copyKey = new CopyKey;