Merge pull request #239 from staabm/stdin

Support reading from stdin

Author: ibennetch

src/Utils/CLI.php

@@ -77,6 +77,11 @@ public function runHighlight()
 
             return 0;
         }
+        if (!isset($params['q'])) {
+            if ($stdIn = $this->readStdin()) {
+                $params['q'] = $stdIn;
+            }
+        }
         if (isset($params['q'])) {
             echo Formatter::format(
                 $params['q'],
@@ -127,6 +132,11 @@ public function runLint()
         if (isset($params['c'])) {
             Context::load($params['c']);
         }
+        if (!isset($params['q'])) {
+            if ($stdIn = $this->readStdin()) {
+                $params['q'] = $stdIn;
+            }
+        }
         if (isset($params['q'])) {
             $lexer = new Lexer($params['q'], false);
             $parser = new Parser($lexer->list);
@@ -177,6 +187,11 @@ public function runTokenize()
 
             return 0;
         }
+        if (!isset($params['q'])) {
+            if ($stdIn = $this->readStdin()) {
+                $params['q'] = $stdIn;
+            }
+        }
         if (isset($params['q'])) {
             $lexer = new Lexer($params['q'], false);
             foreach ($lexer->list->tokens as $idx => $token) {
@@ -199,4 +214,12 @@ public function runTokenize()
 
         return 1;
     }
+
+    private function readStdin() {
+        stream_set_blocking(STDIN, false);
+        $stdin = stream_get_contents(STDIN);
+        // restore-default block-mode setting
+        stream_set_blocking(STDIN, true);
+        return $stdin;
+    }
 }

tests/Utils/CLITest.php

@@ -205,4 +205,30 @@ public function tokenizeParams()
             ],
         ];
     }
+
+    /**
+     * @dataProvider stdinParams
+     *
+     * @param string $cmd
+     * @param int $result
+     */
+    public function testStdinPipe($cmd, $result)
+    {
+        exec ($cmd, $out, $ret);
+        $this->assertSame($result, $ret);
+    }
+
+    public function stdinParams()
+    {
+        $binPath = PHP_BINARY .' '. dirname(__DIR__,2 ). '/bin/';
+
+        return [
+            ['echo "SELECT 1" | '. $binPath .'highlight-query', 0],
+            ['echo "invalid query" | '. $binPath .'highlight-query', 0],
+            ['echo "SELECT 1" | '. $binPath .'lint-query', 0],
+            ['echo "invalid query" | '. $binPath .'lint-query', 10],
+            ['echo "SELECT 1" | '. $binPath .'tokenize-query', 0],
+            ['echo "invalid query" | '. $binPath .'tokenize-query', 0],
+        ];
+    }
 }