added the IteratorAggregate interface

patrickschur · Jan 9, 2017 · c4092a9 · c4092a9
1 parent be0c538
commit c4092a9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/src/LanguageDetection/LanguageResult.php b/src/LanguageDetection/LanguageResult.php
@@ -10,7 +10,7 @@
  * @author Patrick Schur <patrick_schur@outlook.de>
  * @package LanguageDetection
  */
-class LanguageResult implements \JsonSerializable
+class LanguageResult implements \JsonSerializable, \IteratorAggregate
 {
     private $result = [];
 
@@ -60,11 +60,19 @@ public function blacklist(string ...$blacklist): LanguageResult
     /**
      * @return array
      */
-    public function all(): array
+    public function close(): array
     {
         return $this->result;
     }
 
+    /**
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->result);
+    }
+
     /**
      * @param int $offset
      * @param int|null $length

diff --git a/tests/LanguageResultTest.php b/tests/LanguageResultTest.php
@@ -20,11 +20,11 @@ public function testLimit()
 
         $count = (new \GlobIterator(__DIR__ . '/../etc/[^_]*'))->count();
 
-        $sample = $l->detect("Example");
+        $sample = $l->detect('Example');
 
         for ($i = 0; $i < $count; $i++)
         {
-            $this->assertEquals($i, count($sample->limit(0, $i)->all()));
+            $this->assertEquals($i, count($sample->limit(0, $i)->close()));
         }
     }
 
@@ -37,7 +37,7 @@ public function testWhitelist(string $expected, string $sample)
     {
         $l = new Language();
 
-        $this->assertArrayHasKey($expected, $l->detect($sample)->whitelist($expected)->all());
+        $this->assertArrayHasKey($expected, $l->detect($sample)->whitelist($expected)->close());
     }
 
     /**
@@ -49,7 +49,7 @@ public function testBlacklist(string $expected, string $sample)
     {
         $l = new Language();
 
-        $this->assertArrayNotHasKey($expected, $l->detect($sample)->blacklist($expected)->all());
+        $this->assertArrayNotHasKey($expected, $l->detect($sample)->blacklist($expected)->close());
     }
 
     /**
@@ -68,11 +68,24 @@ public function testJsonSerialize()
     {
         $l = new Language();
 
-        $expected = $l->detect("Example");
+        $expected = $l->detect('Example');
 
         $serialized = json_encode($expected);
 
-        $this->assertEquals($expected->all(), json_decode($serialized, true));
+        $this->assertEquals($expected->close(), json_decode($serialized, true));
+    }
+
+    public function testArrayIterator()
+    {
+        $l = new Language();
+
+        $actual = $expected = $l->detect('Example');
+        $actual = $actual->close();
+
+        foreach ($expected as $key => $value)
+        {
+            $this->assertEquals($value, $actual[$key]);
+        }
     }
 
     /**