Merge branch 'feature/133' into develop

Close #133

Author: weierophinney

CHANGELOG.md

@@ -11,7 +11,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
-- Nothing.
+- [#133](https://github.com/zendframework/zend-view/pull/133) modifies the
+  behavior the `placeholder()` helper to no longer render a prefix or postfix if
+  no items are available in the container.
 
 ### Deprecated
 

src/Helper/Placeholder/Container/AbstractContainer.php

@@ -113,9 +113,14 @@ public function __toString()
      */
     public function toString($indent = null)
     {
-        $indent = ($indent !== null)
-            ? $this->getWhitespace($indent)
-            : $this->getIndent();
+        // If we don't have items - do not show prefix and postfix
+        if (! count($this)) {
+            return '';
+        }
+
+        $indent = ($indent === null)
+            ? $this->getIndent()
+            : $this->getWhitespace($indent);
 
         $items  = $this->getArrayCopy();
         $return = $indent

test/Helper/Placeholder/ContainerTest.php

@@ -432,4 +432,20 @@ public function testIndentationIsHonored()
         $this->assertContains("    <ul>\n", $string, $string);
         $this->assertContains("\n    </ul>", $string, $string);
     }
+
+    /**
+     * @see https://github.com/zendframework/zend-view/pull/133
+     */
+    public function testNoPrefixOrPostfixAreRenderedIfNoItemsArePresentInTheContainer()
+    {
+        $this->container
+            ->setPrefix("<h1>")
+            ->setPostfix("</h1>");
+        $string = $this->container->toString();
+        $this->assertEquals('', $string);
+
+        $this->container->set('');
+        $string = $this->container->toString();
+        $this->assertEquals('<h1></h1>', $string);
+    }
 }