Added missing objects to MappedRecords and FilteredRecords.

Author: Bilge

src/Collection/CountableMappedRecords.php

@@ -1,6 +1,8 @@
 <?php
 namespace ScriptFUSION\Porter\Collection;
 
+use ScriptFUSION\Mapper\Mapping;
+
 class CountableMappedRecords extends MappedRecords implements \Countable
 {
     use CountableRecordsTrait;
@@ -10,9 +12,9 @@ class CountableMappedRecords extends MappedRecords implements \Countable
      * @param int $count
      * @param RecordCollection $previousCollection
      */
-    public function __construct(\Iterator $records, $count, RecordCollection $previousCollection)
+    public function __construct(\Iterator $records, $count, RecordCollection $previousCollection, Mapping $mapping)
     {
-        parent::__construct($records, $previousCollection);
+        parent::__construct($records, $previousCollection, $mapping);
 
         $this->setCount($count);
     }

src/Collection/FilteredRecords.php

@@ -3,5 +3,21 @@
 
 class FilteredRecords extends RecordCollection
 {
-    // Intentionally empty.
+    /** @var callable */
+    private $filter;
+
+    public function __construct(\Iterator $records, RecordCollection $previousCollection, callable $filter)
+    {
+        parent::__construct($records, $previousCollection);
+
+        $this->filter = $filter;
+    }
+
+    /**
+     * @return callable
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
 }

src/Collection/MappedRecords.php

@@ -1,7 +1,25 @@
 <?php
 namespace ScriptFUSION\Porter\Collection;
 
+use ScriptFUSION\Mapper\Mapping;
+
 class MappedRecords extends RecordCollection
 {
-    // Intentionally empty.
+    /** @var Mapping */
+    private $mapping;
+
+    public function __construct(\Iterator $records, RecordCollection $previousCollection, Mapping $mapping)
+    {
+        parent::__construct($records, $previousCollection);
+
+        $this->mapping = $mapping;
+    }
+
+    /**
+     * @return Mapping
+     */
+    public function getMapping()
+    {
+        return $this->mapping;
+    }
 }

src/Porter.php

@@ -140,24 +140,25 @@ private function filter(ProviderRecords $records, callable $predicate, $context)
             }
         };
 
-        return new FilteredRecords($filter(), $records);
+        return new FilteredRecords($filter(), $records, $filter);
     }
 
     private function map(RecordCollection $records, Mapping $mapping, $context)
     {
         return $this->createMappedRecords(
             $this->getOrCreateMapper()->mapCollection($records, $mapping, $context),
-            $records
+            $records,
+            $mapping
         );
     }
 
-    private function createMappedRecords(\Iterator $records, RecordCollection $previous)
+    private function createMappedRecords(\Iterator $records, RecordCollection $previous, Mapping $mapping)
     {
         if ($previous instanceof \Countable) {
-            return new CountableMappedRecords($records, count($previous), $previous);
+            return new CountableMappedRecords($records, count($previous), $previous, $mapping);
         }
 
-        return new MappedRecords($records, $previous);
+        return new MappedRecords($records, $previous, $mapping);
     }
 
     private function applyCacheAdvice(Provider $provider, CacheAdvice $cacheAdvice)

test/Integration/Porter/PorterTest.php

@@ -251,24 +251,30 @@ public function testFilter()
         );
 
         self::assertInstanceOf(PorterRecords::class, $records);
-        self::assertInstanceOf(FilteredRecords::class, $records->getPreviousCollection());
         self::assertSame([1, 3, 5, 7, 9], iterator_to_array($records));
+
+        /** @var FilteredRecords $previous */
+        self::assertInstanceOf(FilteredRecords::class, $previous = $records->getPreviousCollection());
+        self::assertNotSame($previous->getFilter(), $this->specification->getFilter(), 'Filter was not cloned.');
     }
 
     public function testMap()
     {
         $records = $this->porter->setMapper(
             \Mockery::mock(CollectionMapper::class)
                 ->shouldReceive('mapCollection')
-                ->with(\Mockery::type(\Iterator::class), \Mockery::type(Mapping::class), \Mockery::any())
+                ->with(\Mockery::type(\Iterator::class), $mapping = \Mockery::type(Mapping::class), \Mockery::any())
                 ->once()
                 ->andReturn(new \ArrayIterator($result = ['foo' => 'bar']))
                 ->getMock()
         )->import($this->specification->setMapping(\Mockery::mock(Mapping::class)));
 
         self::assertInstanceOf(PorterRecords::class, $records);
-        self::assertInstanceOf(MappedRecords::class, $records->getPreviousCollection());
         self::assertSame($result, iterator_to_array($records));
+
+        /** @var MappedRecords $previous */
+        self::assertInstanceOf(MappedRecords::class, $previous = $records->getPreviousCollection());
+        self::assertNotSame($mapping, $previous->getMapping(), 'Mapping was not cloned.');
     }
 
     public function testApplyCacheAdvice()