Bugfix/windows bin

bin/commonmark

@@ -57,8 +57,11 @@ if (isset($src)) {
     $markdown = file_get_contents($src);
 } else {
     $stdin = fopen('php://stdin', 'r');
-    stream_set_blocking($stdin, false);
-    $markdown = stream_get_contents($stdin);
+
+    if (stream_set_blocking($stdin, false)) {
+        $markdown = stream_get_contents($stdin);
+    }
+
     fclose($stdin);
 
     if (empty($markdown)) {
@@ -76,6 +79,30 @@ echo $converter->convertToHtml($markdown);
  */
 function getHelpText()
 {
+    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+        return <<<WINDOWSHELP
+CommonMark - Markdown done right
+
+Usage: commonmark [OPTIONS] [FILE]
+
+    -h, --help  Shows help and usage information
+
+    (Reading data from STDIN is not currently supported on Windows)
+
+Examples:
+
+    Converting a file named document.md:
+
+        commonmark document.md
+
+    Converting a file and saving its output:
+
+        commonmark document.md > output.html
+
+Full documentation can be found at http://commonmark.thephpleague.com/
+WINDOWSHELP;
+    }
+
     return <<<HELP
 CommonMark - Markdown done right
 

tests/functional/BinTest.php

@@ -16,7 +16,10 @@ public function testNoArgsOrStdin()
 
         $this->assertEquals(1, $cmd->getExitCode());
         $this->assertEmpty($cmd->getOutput());
-        $this->assertContains('Usage:', $cmd->getError());
+
+        if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+            $this->assertContains('Usage:', $cmd->getError());
+        }
     }
 
     /**
@@ -55,7 +58,10 @@ public function testUnknownOption()
         $cmd->execute();
 
         $this->assertEquals(1, $cmd->getExitCode());
-        $this->assertContains('Unknown option', $cmd->getError());
+
+        if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+            $this->assertContains('Unknown option', $cmd->getError());
+        }
     }
 
     /**
@@ -77,6 +83,10 @@ public function testFileArgument()
      */
     public function testStdin()
     {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $this->markTestSkipped('Test skipped: STDIN is not supported on Windows');
+        }
+
         $cmd = new Command(sprintf('cat %s | %s ', $this->getPathToData('atx_header.md'), $this->getPathToCommonmark()));
         $cmd->execute();
 
@@ -92,7 +102,13 @@ public function testStdin()
      */
     protected function getPathToCommonmark()
     {
-        return realpath(__DIR__ . '/../../bin/commonmark');
+        $path = realpath(__DIR__ . '/../../bin/commonmark');
+
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $path = 'php ' . $path;
+        }
+
+        return $path;
     }
 
     /**

tests/functional/EmphasisTest.php

@@ -13,7 +13,13 @@ class EmphasisTest extends \PHPUnit_Framework_TestCase
      */
     protected function getPathToCommonmark()
     {
-        return realpath(__DIR__ . '/../../bin/commonmark');
+        $path = realpath(__DIR__ . '/../../bin/commonmark');
+
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $path = 'php ' . $path;
+        }
+
+        return $path;
     }
 
     /**