Merge pull request #43 from greg0ire/use-generators

Use generators
doctrine · Apr 18, 2020 · cb57b3f · cb57b3f
2 parents dc2af26 + 8d80a27
commit cb57b3f
Showing 1 changed file with 24 additions and 73 deletions.
diff --git a/tests/SqlFormatterTest.php b/tests/SqlFormatterTest.php
@@ -9,6 +9,7 @@
 use Doctrine\SqlFormatter\NullHighlighter;
 use Doctrine\SqlFormatter\SqlFormatter;
 use Doctrine\SqlFormatter\Tokenizer;
+use Generator;
 use PHPUnit\Framework\TestCase;
 use function assert;
 use function defined;
@@ -123,108 +124,58 @@ public function testUsePre() : void
     }
 
     /**
-     * @return mixed[][]
+     * @return Generator<mixed[]>
      */
-    public function formatHighlightData() : array
+    private function fileDataProvider(string $file) : Generator
     {
-        $contents = file_get_contents(__DIR__ . '/format-highlight.html');
+        $contents = file_get_contents(__DIR__ . '/' . $file);
         assert($contents !== false);
         $formatHighlightData = explode("\n\n", $contents);
         $sqlData             = $this->sqlData();
 
-        $return = [];
         foreach ($formatHighlightData as $i => $data) {
-            $return[] = [
-                $sqlData[$i],
-                $data,
-            ];
+            yield [$sqlData[$i], $data];
         }
-
-        return $return;
     }
 
     /**
-     * @return mixed[][]
+     * @return Generator<mixed[]>
      */
-    public function highlightCliData() : array
+    public function formatHighlightData() : Generator
     {
-        $contents = file_get_contents(__DIR__ . '/clihighlight.html');
-        assert($contents !== false);
-        $clidata = explode("\n\n", $contents);
-        $sqlData = $this->sqlData();
-
-        $return = [];
-        foreach ($clidata as $i => $data) {
-            $return[] = [
-                $sqlData[$i],
-                $data,
-            ];
-        }
-
-        return $return;
+        return $this->fileDataProvider('format-highlight.html');
     }
 
     /**
-     * @return mixed[][]
+     * @return Generator<mixed[]>
      */
-    public function formatData() : array
+    public function highlightCliData() : Generator
     {
-        $contents = file_get_contents(__DIR__ . '/format.html');
-        assert($contents !== false);
-        $formatData = explode("\n\n", $contents);
-        $sqlData    = $this->sqlData();
-
-        $return = [];
-        foreach ($formatData as $i => $data) {
-            $return[] = [
-                $sqlData[$i],
-                $data,
-            ];
-        }
-
-        return $return;
+        return $this->fileDataProvider('clihighlight.html');
     }
 
     /**
-     * @return mixed[][]
+     * @return Generator<mixed[]>
      */
-    public function compressData() : array
+    public function formatData() : Generator
     {
-        $contents = file_get_contents(__DIR__ . '/compress.html');
-        assert($contents !== false);
-        $compressData = explode("\n\n", $contents);
-        $sqlData      = $this->sqlData();
-
-        $return = [];
-        foreach ($compressData as $i => $data) {
-            $return[] = [
-                $sqlData[$i],
-                $data,
-            ];
-        }
-
-        return $return;
+        return $this->fileDataProvider('format.html');
     }
 
     /**
-     * @return mixed[][]
+     * @return Generator<mixed[]>
      */
-    public function highlightData() : array
+    public function compressData() : Generator
     {
-        $contents = file_get_contents(__DIR__ . '/highlight.html');
-        assert($contents !== false);
-        $highlightData = explode("\n\n", $contents);
-        $sqlData       = $this->sqlData();
-
-        $return = [];
-        foreach ($highlightData as $i => $data) {
-            $return[] = [
-                $sqlData[$i],
-                $data,
-            ];
-        }
+        return $this->fileDataProvider('compress.html');
+    }
 
-        return $return;
+    /**
+     * @return Generator<mixed[]>
+     */
+    public function highlightData() : Generator
+    {
+        return $this->fileDataProvider('highlight.html');
     }
 
     /**