Merge branch 'feature/5711' into develop

weierophinney · weierophinney · commit e1fb28e576fa · 2014-03-04T15:20:16.000-06:00
Close zendframework/zendframework#5711
diff --git a/src/Adapter/AbstractAdapter.php b/src/Adapter/AbstractAdapter.php
@@ -288,6 +288,7 @@ public function writeBox(
      * @param int      $y       Block Y coordinate (row)
      * @param null|int $color   (optional) Text color
      * @param null|int $bgColor (optional) Text background color
+     * @throws Exception\InvalidArgumentException
      */
     public function writeTextBlock(
         $text,
@@ -298,6 +299,43 @@ public function writeTextBlock(
         $color = null,
         $bgColor = null
     ) {
+        if ($x < 0 || $y < 0) {
+            throw new Exception\InvalidArgumentException('Supplied X,Y coordinates are invalid.');
+        }
+
+        if ($width < 1) {
+            throw new Exception\InvalidArgumentException('Invalid width supplied.');
+        }
+
+        if (null !== $height && $height < 1) {
+            throw new Exception\InvalidArgumentException('Invalid height supplied.');
+        }
+
+        // ensure the text is not wider than the width
+        if (strlen($text) <= $width) {
+            // just write the line at the spec'd position
+            $this->setPos($x, $y);
+            $this->write($text, $color, $bgColor);
+            return;
+        }
+
+        $text = wordwrap($text, $width, PHP_EOL, true);
+
+        // convert to array of lines
+        $lines = explode(PHP_EOL, $text);
+
+        // truncate if height was specified
+        if (null !== $height && count($lines) > $height) {
+            $lines = array_slice($lines, 0, $height);
+        }
+
+        // write each line
+        $curY = $y;
+        foreach ($lines as $line) {
+            $this->setPos($x, $curY);
+            $this->write($line, $color, $bgColor);
+            $curY++;//next line
+        }
     }
 
     /**
diff --git a/src/Adapter/Posix.php b/src/Adapter/Posix.php
@@ -373,6 +373,7 @@ protected function setTTYMode($mode)
      * Get the final color code and throw exception on error
      *
      * @param  null|int|Xterm256 $color
+     * @param  string            $type  (optional) Foreground 'fg' or background 'bg'.
      * @throws Exception\BadMethodCallException
      * @return string
      */
diff --git a/test/Adapter/AbstractAdapterTest.php b/test/Adapter/AbstractAdapterTest.php
@@ -144,4 +144,72 @@ public function testEncodeText()
         $encodedText = $this->adapter->encodeText(utf8_decode($text));
         $this->assertEquals(utf8_decode($text),$encodedText);
     }
+
+    public function testWriteTextBlockSameAsWidth()
+    {
+        //set some text that's the same size as the width
+        $text = 'hello there, I am short!';
+        $width = strlen($text);
+
+        ob_start();
+        $this->adapter->writeTextBlock($text, $width);
+        $this->assertSame($text, ob_get_clean());
+    }
+
+    public function testTextBlockLongUnbreakableWord()
+    {
+        $text = 'thisisaverylongwordthatwontbreakproperlysothereyouhaveit and here is some more text';
+        $expected = array('thisisaver', 'ylongwordt', 'hatwontbre', 'akproperly'
+           , 'sothereyou', 'haveit and', 'here is', 'some more'
+           , 'text');
+
+        ob_start();
+        $this->adapter->writeTextBlock($text, 10);
+        $this->assertSame($expected, $this->adapter->writtenData);
+
+        //just get rid of the data in ob
+        ob_get_clean();
+    }
+    public function testTextBlockLongerThanHeight()
+    {
+        $text = 'thisisaverylongwordthatwontbreakproperlysothereyouhaveit and here is some more text';
+        $expected = array('thisisaver', 'ylongwordt', 'hatwontbre');
+
+        //reset tracking of written data
+        $this->adapter->writtenData = array();
+
+        ob_start();
+        $this->adapter->writeTextBlock($text, 10, 3);
+        $this->assertSame($expected, $this->adapter->writtenData);
+
+        //just get rid of the data in ob
+        ob_get_clean();
+    }
+
+    /**
+     * @expectedException \Zend\Console\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Supplied X,Y coordinates are invalid.
+     */
+    public function testInvalidCoords()
+    {
+        $this->adapter->writeTextBlock('', 1, 1, -1, -9);
+    }
+
+    /**
+     * @expectedException \Zend\Console\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid width supplied.
+     */
+    public function testInvalidWidth()
+    {
+        $this->adapter->writeTextBlock('', 0);
+    }
+
+    /**
+     * @expectedException \Zend\Console\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid height supplied.
+     */
+    public function testInvalidHeight()
+    {
+        $this->adapter->writeTextBlock('', 80, 0, 2, 2);
+    }
 }
diff --git a/test/TestAssets/ConsoleAdapter.php b/test/TestAssets/ConsoleAdapter.php
@@ -24,6 +24,8 @@ class ConsoleAdapter extends AbstractAdapter
 
     public $testIsUtf8 = true;
 
+    public $writtenData = array();
+
     /**
      * Read a single line from the console input
      *
@@ -86,4 +88,16 @@ public function getWidth()
     {
         return $this->testWidth;
     }
+
+    /**
+     * Tracks exactly what data has been written
+     * @param string $text
+     * @param null $color
+     * @param null $bgColor
+     */
+    public function write($text, $color = null, $bgColor = null)
+    {
+        $this->writtenData[] = $text;
+        parent::write($text, $color, $bgColor);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -373,6 +373,7 @@ protected function setTTYMode($mode)`
`373`	`373`	`* Get the final color code and throw exception on error`
`374`	`374`	`*`
`375`	`375`	`* @param null\|int\|Xterm256 $color`
	`376`	`+ * @param string $type (optional) Foreground 'fg' or background 'bg'.`
`376`	`377`	`* @throws Exception\BadMethodCallException`
`377`	`378`	`* @return string`
`378`	`379`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ class ConsoleAdapter extends AbstractAdapter`
`24`	`24`
`25`	`25`	`public $testIsUtf8 = true;`
`26`	`26`
	`27`	`+ public $writtenData = array();`
	`28`	`+`
`27`	`29`	`/**`
`28`	`30`	`* Read a single line from the console input`
`29`	`31`	`*`
`@@ -86,4 +88,16 @@ public function getWidth()`
`86`	`88`	`{`
`87`	`89`	`return $this->testWidth;`
`88`	`90`	`}`
	`91`	`+`
	`92`	`+ /**`
	`93`	`+ * Tracks exactly what data has been written`
	`94`	`+ * @param string $text`
	`95`	`+ * @param null $color`
	`96`	`+ * @param null $bgColor`
	`97`	`+ */`
	`98`	`+ public function write($text, $color = null, $bgColor = null)`
	`99`	`+ {`
	`100`	`+ $this->writtenData[] = $text;`
	`101`	`+ parent::write($text, $color, $bgColor);`
	`102`	`+ }`
`89`	`103`	`}`