Added CountableRecordsTrait for existing Countable*Records.

ScriptFUSION · Aug 9, 2016 · 6585ae4 · 6585ae4
1 parent b90b2d5
commit 6585ae4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/src/Porter/Collection/CountableMappedRecords.php b/src/Porter/Collection/CountableMappedRecords.php
@@ -3,7 +3,7 @@
 
 class CountableMappedRecords extends MappedRecords implements \Countable
 {
-    private $count;
+    use CountableRecordsTrait;
 
     /**
      * @param \Iterator $records
@@ -14,11 +14,6 @@ public function __construct(\Iterator $records, $count, RecordCollection $previo
     {
         parent::__construct($records, $previousCollection);
 
-        $this->count = $count|0;
-    }
-
-    public function count()
-    {
-        return $this->count;
+        $this->setCount($count);
     }
 }
diff --git a/src/Porter/Collection/CountablePorterRecords.php b/src/Porter/Collection/CountablePorterRecords.php
@@ -5,7 +5,7 @@
 
 class CountablePorterRecords extends PorterRecords implements \Countable
 {
-    private $count;
+    use CountableRecordsTrait;
 
     /**
      * @param RecordCollection $records
@@ -16,11 +16,6 @@ public function __construct(RecordCollection $records, $count, ImportSpecificati
     {
         parent::__construct($records, $specification);
 
-        $this->count = $count|0;
-    }
-
-    public function count()
-    {
-        return $this->count;
+        $this->setCount($count);
     }
 }
diff --git a/src/Porter/Collection/CountableProviderRecords.php b/src/Porter/Collection/CountableProviderRecords.php
@@ -5,7 +5,7 @@
 
 class CountableProviderRecords extends ProviderRecords implements \Countable
 {
-    private $count;
+    use CountableRecordsTrait;
 
     /**
      * @param \Iterator $providerRecords
@@ -16,11 +16,6 @@ public function __construct(\Iterator $providerRecords, $count, ProviderDataSour
     {
         parent::__construct($providerRecords, $dataSource);
 
-        $this->count = $count|0;
-    }
-
-    public function count()
-    {
-        return $this->count;
+        $this->setCount($count);
     }
 }
diff --git a/src/Porter/Collection/CountableRecordsTrait.php b/src/Porter/Collection/CountableRecordsTrait.php
@@ -0,0 +1,18 @@
+<?php
+namespace ScriptFUSION\Porter\Collection;
+
+trait CountableRecordsTrait
+{
+    /** @var int */
+    private $count;
+
+    public function count()
+    {
+        return $this->count;
+    }
+
+    private function setCount($count)
+    {
+        $this->count = $count|0;
+    }
+}
diff --git a/test/Integration/Porter/PorterTest.php b/test/Integration/Porter/PorterTest.php
@@ -133,7 +133,7 @@ public function testImportAndFilterCountableRecords()
         );
 
         // Innermost collection.
-        self::assertInstanceOf(\Countable::class, $first = $records->findFirstCollection());
+        self::assertInstanceOf(\Countable::class, $records->findFirstCollection());
 
         // Outermost collection.
         self::assertNotInstanceOf(\Countable::class, $records);