Changed Mapper::map to only pass scalars through; foreign objects are now rejected.

Author: Bilge

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptfusion/mapper",
-  "description": "Maps data from one format to another using a DSL.",
+  "description": "Maps data from one format to another using an object composition DSL.",
   "authors": [
     {
       "name": "Bilge",

src/Mapper/InvalidMapperTypeException.php

@@ -0,0 +1,10 @@
+<?php
+namespace ScriptFUSION\Mapper;
+
+/**
+ * The exception that is thrown when an invalid mapper type is specified.
+ */
+class InvalidMapperTypeException extends \RuntimeException
+{
+    // Intentionally empty.
+}

src/Mapper/Mapper.php

@@ -15,7 +15,7 @@ class Mapper
      *
      * @return mixed
      *
-     * @throws \Exception
+     * @throws InvalidMapperTypeException An invalid strategy or mapping object was specified.
      */
     public function map(array $record, $strategyOrMapping, $context = null)
     {
@@ -28,10 +28,12 @@ public function map(array $record, $strategyOrMapping, $context = null)
         } /* Mapping fragment. */
         elseif (is_array($strategyOrMapping)) {
             return $this->mapFragment($record, $strategyOrMapping, $context);
+        } /* Scalar values. */
+        elseif (is_scalar($strategyOrMapping)) {
+            return $strategyOrMapping;
         }
 
-        // Pass unidentified object through.
-        return $strategyOrMapping;
+        throw new InvalidMapperTypeException('Invalid strategy or mapping: "' . get_class($strategyOrMapping) . '".');
     }
 
     /**

test/Integration/Mapper/MapperTest.php

@@ -3,6 +3,7 @@
 
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use ScriptFUSION\Mapper\AnonymousMapping;
+use ScriptFUSION\Mapper\InvalidMapperTypeException;
 use ScriptFUSION\Mapper\Mapper;
 use ScriptFUSION\Mapper\MapperAware;
 use ScriptFUSION\Mapper\Strategy\Copy;
@@ -41,6 +42,37 @@ public function testMapFragment()
         self::assertSame(['bar' => 'foo'], $mapped);
     }
 
+    /**
+     * @dataProvider provideScalars
+     */
+    public function testMapScalars($scalar)
+    {
+        $mapped = $this->mapper->map([], $scalar);
+
+        self::assertSame($scalar, $mapped);
+    }
+
+    public function provideScalars()
+    {
+        return [
+            'string empty' => [''],
+            'string non-empty' => ['foo'],
+            'integer zero' => [0],
+            'integer non-zero' => [-1],
+            'float zero' => [0.],
+            'float non-zero' => [-1.],
+            'bool true' => [true],
+            'bool false' => [false],
+        ];
+    }
+
+    public function testMapInvalidObject()
+    {
+        $this->setExpectedException(InvalidMapperTypeException::class);
+
+        $this->mapper->map([], (object)[]);
+    }
+
     public function testInjectDependencies()
     {
         $this->mapper->map(