Use Console InvalidArgumentException, test the exception

chalasr · chalasr · commit 2d3e78b7937d · 2016-05-27T13:38:13.000+02:00
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Helper\ProgressBar;
@@ -398,7 +399,7 @@ public function newLine($count = 1)
     public function setInputStream($stream)
     {
         if (!is_resource($stream)) {
-            throw new \InvalidArgumentException(sprintf('The stream must be a valid resource, %s given'), gettype($stream));
+            throw new InvalidArgumentException(sprintf('Input stream must be a valid resource, %s given', gettype($stream)));
         }
 
         $this->inputStream = $stream;
diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -80,15 +80,29 @@ public function testSetInputStream()
         rewind($stream);
 
         $command->setCode(function ($input, $output) use ($command, $stream) {
-            $io = new SymfonyStyle($input, $output);
+            $sfStyle = new SymfonyStyle($input, $output);
 
-            $io->setInputStream($stream);
-            $io->ask('What\'s your name?');
+            $sfStyle->setInputStream($stream);
+            $sfStyle->ask('What\'s your name?');
         });
 
         $this->tester->execute(array());
         $this->assertSame(0, $this->tester->getStatusCode());
     }
+
+    /**
+     * @expectedException \Symfony\Component\Console\Exception\InvalidArgumentException
+     * @expectedMessage   Input stream must be a valid resource, string given
+     */
+    public function testSetInputStreamWithWrongResource()
+    {
+        $this->command->setCode(function ($input, $output) {
+            $sfStyle = new SymfonyStyle($input, $output);
+            $sfStyle->setInputStream('invalid type');
+        });
+
+        $this->tester->execute(array());
+    }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Console\Application;`
`15`	`15`	`use Symfony\Component\Console\Exception\RuntimeException;`
	`16`	`+use Symfony\Component\Console\Exception\InvalidArgumentException;`
`16`	`17`	`use Symfony\Component\Console\Formatter\OutputFormatter;`
`17`	`18`	`use Symfony\Component\Console\Helper\Helper;`
`18`	`19`	`use Symfony\Component\Console\Helper\ProgressBar;`
`@@ -398,7 +399,7 @@ public function newLine($count = 1)`
`398`	`399`	`public function setInputStream($stream)`
`399`	`400`	`{`
`400`	`401`	`if (!is_resource($stream)) {`
`401`		`- throw new \InvalidArgumentException(sprintf('The stream must be a valid resource, %s given'), gettype($stream));`
	`402`	`+ throw new InvalidArgumentException(sprintf('Input stream must be a valid resource, %s given', gettype($stream)));`
`402`	`403`	`}`
`403`	`404`
`404`	`405`	`$this->inputStream = $stream;`