Merged KeyAware into MapperAware and similarly for MapperAwareTrait.

Author: Paul

src/MapperAware.php

@@ -1,7 +1,7 @@
 <?php
 namespace ScriptFUSION\Mapper;
 
-interface MapperAware
+interface MapperAware extends KeyAware
 {
     /**
      * Sets the mapper to the specified mapper instance.

src/MapperAwareTrait.php

@@ -3,18 +3,22 @@
 
 trait MapperAwareTrait
 {
-    /** @var Mapper */
+    use KeyAwareTrait;
+
+    /**
+     * @var Mapper
+     */
     private $mapper;
 
+    protected function getMapper()
+    {
+        return $this->mapper;
+    }
+
     public function setMapper(Mapper $mapper)
     {
         $this->mapper = $mapper;
 
         return $this;
     }
-
-    protected function getMapper()
-    {
-        return $this->mapper;
-    }
 }

src/Strategy/Delegate.php

@@ -1,15 +1,13 @@
 <?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, KeyAware
+abstract class Delegate implements Strategy, MapperAware
 {
-    use MapperAwareTrait, KeyAwareTrait;
+    use MapperAwareTrait;
 
     private $expression;