Merge branch 'hotfix/7476'

Close zendframework/zendframework#7476
zendframework · May 4, 2015 · 24a6cea · 24a6cea
2 parents ac95d66 + 33f924f
commit 24a6cea
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 53 deletions.
diff --git a/test/Helper/CycleTest.php b/test/Helper/CycleTest.php
@@ -49,7 +49,7 @@ public function tearDown()
     public function testCycleMethodReturnsObjectInstance()
     {
         $cycle = $this->helper->__invoke();
-        $this->assertTrue($cycle instanceof Helper\Cycle);
+        $this->assertInstanceOf('Zend\View\Helper\Cycle', $cycle);
     }
 
     public function testAssignAndGetValues()

diff --git a/test/Helper/DoctypeTest.php b/test/Helper/DoctypeTest.php
@@ -55,7 +55,7 @@ public function tearDown()
     public function testDoctypeMethodReturnsObjectInstance()
     {
         $doctype = $this->helper->__invoke();
-        $this->assertTrue($doctype instanceof Helper\Doctype);
+        $this->assertInstanceOf('Zend\View\Helper\Doctype', $doctype);
     }
 
     public function testPassingDoctypeSetsDoctype()

diff --git a/test/Helper/EscapeCssTest.php b/test/Helper/EscapeCssTest.php
@@ -51,7 +51,7 @@ public function testGetEscaperCreatesDefaultInstanceWithCorrectEncoding()
     {
         $this->helper->setEncoding('BIG5-HKSCS');
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 
@@ -60,7 +60,7 @@ public function testSettingEscaperObjectAlsoSetsEncoding()
         $escaper = new \Zend\Escaper\Escaper('big5-hkscs');
         $this->helper->setEscaper($escaper);
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 

diff --git a/test/Helper/EscapeHtmlAttrTest.php b/test/Helper/EscapeHtmlAttrTest.php
@@ -51,7 +51,7 @@ public function testGetEscaperCreatesDefaultInstanceWithCorrectEncoding()
     {
         $this->helper->setEncoding('BIG5-HKSCS');
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 
@@ -60,7 +60,7 @@ public function testSettingEscaperObjectAlsoSetsEncoding()
         $escaper = new \Zend\Escaper\Escaper('big5-hkscs');
         $this->helper->setEscaper($escaper);
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 

diff --git a/test/Helper/EscapeHtmlTest.php b/test/Helper/EscapeHtmlTest.php
@@ -51,7 +51,7 @@ public function testGetEscaperCreatesDefaultInstanceWithCorrectEncoding()
     {
         $this->helper->setEncoding('BIG5-HKSCS');
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 
@@ -60,7 +60,7 @@ public function testSettingEscaperObjectAlsoSetsEncoding()
         $escaper = new \Zend\Escaper\Escaper('big5-hkscs');
         $this->helper->setEscaper($escaper);
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 

diff --git a/test/Helper/EscapeJsTest.php b/test/Helper/EscapeJsTest.php
@@ -51,7 +51,7 @@ public function testGetEscaperCreatesDefaultInstanceWithCorrectEncoding()
     {
         $this->helper->setEncoding('BIG5-HKSCS');
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 
@@ -60,7 +60,7 @@ public function testSettingEscaperObjectAlsoSetsEncoding()
         $escaper = new \Zend\Escaper\Escaper('big5-hkscs');
         $this->helper->setEscaper($escaper);
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 

diff --git a/test/Helper/EscapeUrlTest.php b/test/Helper/EscapeUrlTest.php
@@ -51,7 +51,7 @@ public function testGetEscaperCreatesDefaultInstanceWithCorrectEncoding()
     {
         $this->helper->setEncoding('BIG5-HKSCS');
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 
@@ -60,7 +60,7 @@ public function testSettingEscaperObjectAlsoSetsEncoding()
         $escaper = new \Zend\Escaper\Escaper('big5-hkscs');
         $this->helper->setEscaper($escaper);
         $escaper = $this->helper->getEscaper();
-        $this->assertTrue($escaper instanceof \Zend\Escaper\Escaper);
+        $this->assertInstanceOf('Zend\Escaper\Escaper', $escaper);
         $this->assertEquals('big5-hkscs', $escaper->getEncoding());
     }
 

diff --git a/test/Helper/FlashMessengerTest.php b/test/Helper/FlashMessengerTest.php
@@ -86,11 +86,11 @@ public function testCanRetrieveMessages()
 
         $this->seedMessages();
 
-        $this->assertTrue(count($helper('default')) > 0);
-        $this->assertTrue(count($helper('info')) > 0);
-        $this->assertTrue(count($helper('success')) > 0);
-        $this->assertTrue(count($helper('warning')) > 0);
-        $this->assertTrue(count($helper('error')) > 0);
+        $this->assertNotEmpty($helper('default'));
+        $this->assertNotEmpty($helper('info'));
+        $this->assertNotEmpty($helper('success'));
+        $this->assertNotEmpty($helper('warning'));
+        $this->assertNotEmpty($helper('error'));
 
         $this->assertTrue($this->plugin->hasMessages());
         $this->assertTrue($this->plugin->hasInfoMessages());
@@ -110,10 +110,10 @@ public function testCanRetrieveCurrentMessages()
 
         $this->seedCurrentMessages();
 
-        $this->assertTrue(count($helper('default')) > 0);
-        $this->assertTrue(count($helper('info')) > 0);
-        $this->assertTrue(count($helper('success')) > 0);
-        $this->assertTrue(count($helper('error')) > 0);
+        $this->assertNotEmpty($helper('default'));
+        $this->assertNotEmpty($helper('info'));
+        $this->assertNotEmpty($helper('success'));
+        $this->assertNotEmpty($helper('error'));
 
         $this->assertFalse($this->plugin->hasCurrentMessages());
         $this->assertFalse($this->plugin->hasCurrentInfoMessages());

diff --git a/test/Helper/HeadLinkTest.php b/test/Helper/HeadLinkTest.php
@@ -60,7 +60,7 @@ public function tearDown()
     public function testHeadLinkReturnsObjectInstance()
     {
         $placeholder = $this->helper->__invoke();
-        $this->assertTrue($placeholder instanceof Helper\HeadLink);
+        $this->assertInstanceOf('Zend\View\Helper\HeadLink', $placeholder);
     }
 
     public function testPrependThrowsExceptionWithoutArrayArgument()

diff --git a/test/Helper/HeadMetaTest.php b/test/Helper/HeadMetaTest.php
@@ -67,7 +67,7 @@ public function handleErrors($errno, $errstr)
     public function testHeadMetaReturnsObjectInstance()
     {
         $placeholder = $this->helper->__invoke();
-        $this->assertTrue($placeholder instanceof Helper\HeadMeta);
+        $this->assertInstanceOf('Zend\View\Helper\HeadMeta', $placeholder);
     }
 
     public function testAppendPrependAndSetThrowExceptionsWhenNonMetaValueProvided()
@@ -213,9 +213,9 @@ public function testCanBuildMetaTagsWithAttributes()
 
         $this->assertObjectHasAttribute('modifiers', $value);
         $modifiers = $value->modifiers;
-        $this->assertTrue(array_key_exists('lang', $modifiers));
+        $this->assertArrayHasKey('lang', $modifiers);
         $this->assertEquals('us_en', $modifiers['lang']);
-        $this->assertTrue(array_key_exists('scheme', $modifiers));
+        $this->assertArrayHasKey('scheme', $modifiers);
         $this->assertEquals('foo', $modifiers['scheme']);
     }
 
@@ -253,7 +253,7 @@ public function testToStringWhenInvalidKeyProvidedShouldConvertThrownException()
         set_error_handler(array($this, 'handleErrors'));
         $string = @$this->helper->toString();
         $this->assertEquals('', $string);
-        $this->assertTrue(is_string($this->error));
+        $this->assertInternalType('string', $this->error);
     }
 
     public function testHeadMetaHelperCreatesItemEntry()
@@ -272,7 +272,7 @@ public function testOverloadingOffsetInsertsAtOffset()
         $this->helper->offsetSetName(100, 'keywords', 'foo');
         $values = $this->helper->getArrayCopy();
         $this->assertEquals(1, count($values));
-        $this->assertTrue(array_key_exists(100, $values));
+        $this->assertArrayHasKey(100, $values);
         $item = $values[100];
         $this->assertEquals('foo', $item->content);
         $this->assertEquals('name', $item->type);

diff --git a/test/Helper/HeadScriptTest.php b/test/Helper/HeadScriptTest.php
@@ -57,7 +57,7 @@ public function tearDown()
     public function testHeadScriptReturnsObjectInstance()
     {
         $placeholder = $this->helper->__invoke();
-        $this->assertTrue($placeholder instanceof Helper\HeadScript);
+        $this->assertInstanceOf('Zend\View\Helper\HeadScript', $placeholder);
     }
 
     public function testSetPrependAppendAndOffsetSetThrowExceptionsOnInvalidItems()
@@ -272,7 +272,7 @@ public function testToStringRendersValidHtml()
 
         $doc = new \DOMDocument;
         $dom = $doc->loadHtml($string);
-        $this->assertTrue($dom !== false);
+        $this->assertTrue($dom);
     }
 
     public function testCapturingCapturesToObject()

diff --git a/test/Helper/HeadStyleTest.php b/test/Helper/HeadStyleTest.php
@@ -56,7 +56,7 @@ public function tearDown()
     public function testHeadStyleReturnsObjectInstance()
     {
         $placeholder = $this->helper->__invoke();
-        $this->assertTrue($placeholder instanceof Helper\HeadStyle);
+        $this->assertInstanceOf('Zend\View\Helper\HeadStyle', $placeholder);
     }
 
     public function testAppendPrependAndSetThrowExceptionsWhenNonStyleValueProvided()
@@ -93,7 +93,7 @@ public function testOverloadAppendStyleAppendsStyleToStack()
             $this->assertEquals($i + 1, count($values));
             $item = $values[$i];
 
-            $this->assertTrue($item instanceof \stdClass);
+            $this->assertInstanceOf('stdClass', $item);
             $this->assertObjectHasAttribute('content', $item);
             $this->assertObjectHasAttribute('attributes', $item);
             $this->assertEquals($string, $item->content);
@@ -110,7 +110,7 @@ public function testOverloadPrependStylePrependsStyleToStack()
             $this->assertEquals($i + 1, count($values));
             $item = array_shift($values);
 
-            $this->assertTrue($item instanceof \stdClass);
+            $this->assertInstanceOf('stdClass', $item);
             $this->assertObjectHasAttribute('content', $item);
             $this->assertObjectHasAttribute('attributes', $item);
             $this->assertEquals($string, $item->content);
@@ -129,7 +129,7 @@ public function testOverloadSetOversitesStack()
         $this->assertEquals(1, count($values));
         $item = array_shift($values);
 
-        $this->assertTrue($item instanceof \stdClass);
+        $this->assertInstanceOf('stdClass', $item);
         $this->assertObjectHasAttribute('content', $item);
         $this->assertObjectHasAttribute('attributes', $item);
         $this->assertEquals($string, $item->content);
@@ -204,9 +204,9 @@ public function testHeadStyleProxiesProperly()
                      ->__invoke($style3, 'APPEND');
         $this->assertEquals(3, count($this->helper));
         $values = $this->helper->getArrayCopy();
-        $this->assertTrue((bool) strstr($values[0]->content, $style2));
-        $this->assertTrue((bool) strstr($values[1]->content, $style1));
-        $this->assertTrue((bool) strstr($values[2]->content, $style3));
+        $this->assertContains($values[0]->content, $style2);
+        $this->assertContains($values[1]->content, $style1);
+        $this->assertContains($values[2]->content, $style3);
     }
 
     public function testToStyleGeneratesValidHtml()
@@ -221,7 +221,7 @@ public function testToStyleGeneratesValidHtml()
         $html = $this->helper->toString();
         $doc  = new \DOMDocument;
         $dom  = $doc->loadHtml($html);
-        $this->assertTrue(($dom !== false));
+        $this->assertTrue($dom);
 
         $styles = substr_count($html, '<style type="text/css"');
         $this->assertEquals(3, $styles);

diff --git a/test/Helper/HeadTitleTest.php b/test/Helper/HeadTitleTest.php
@@ -56,7 +56,7 @@ public function tearDown()
     public function testHeadTitleReturnsObjectInstance()
     {
         $placeholder = $this->helper->__invoke();
-        $this->assertTrue($placeholder instanceof Helper\HeadTitle);
+        $this->assertInstanceOf('Zend\View\Helper\HeadTitle', $placeholder);
     }
 
     public function testCanSetTitleViaHeadTitle()
@@ -218,7 +218,7 @@ public function testCanPrependTitlesUsingDefaultAttachOrder()
      */
     public function testReturnTypeDefaultAttachOrder()
     {
-        $this->assertTrue($this->helper->setDefaultAttachOrder('PREPEND') instanceof Helper\HeadTitle);
+        $this->assertInstanceOf('Zend\View\Helper\HeadTitle', $this->helper->setDefaultAttachOrder('PREPEND'));
         $this->assertEquals('PREPEND', $this->helper->getDefaultAttachOrder());
     }
 }
diff --git a/test/Helper/InlineScriptTest.php b/test/Helper/InlineScriptTest.php
@@ -56,6 +56,6 @@ public function tearDown()
     public function testInlineScriptReturnsObjectInstance()
     {
         $placeholder = $this->helper->__invoke();
-        $this->assertTrue($placeholder instanceof Helper\InlineScript);
+        $this->assertInstanceOf('Zend\View\Helper\InlineScript', $placeholder);
     }
 }
diff --git a/test/Helper/JsonTest.php b/test/Helper/JsonTest.php
@@ -52,7 +52,7 @@ public function testJsonHelperSetsResponseHeader()
     public function testJsonHelperReturnsJsonEncodedString()
     {
         $data = $this->helper->__invoke('foobar');
-        $this->assertTrue(is_string($data));
+        $this->assertInternalType('string', $data);
         $this->assertEquals('foobar', JsonFormatter::decode($data));
     }
 }
diff --git a/test/Helper/Navigation/NavigationTest.php b/test/Helper/Navigation/NavigationTest.php
@@ -442,13 +442,13 @@ public function testRenderInvisibleItem()
 
         $render = $this->_helper->menu()->render($container);
 
-        $this->assertFalse(strpos($render, 'p2'));
+        $this->assertNotContains('p2', $render);
 
         $this->_helper->menu()->setRenderInvisible();
 
         $render = $this->_helper->menu()->render($container);
 
-        $this->assertTrue(strpos($render, 'p2') !== false);
+        $this->assertContains('p2', $render);
     }
 
     public function testMultipleNavigations()

diff --git a/test/Helper/Placeholder/ContainerTest.php b/test/Helper/Placeholder/ContainerTest.php
@@ -427,7 +427,7 @@ public function testIndentationIsHonored()
 
         $lis = substr_count($string, "\n        <li>");
         $this->assertEquals(3, $lis);
-        $this->assertTrue((bool) strstr($string, "    <ul>\n"), $string);
-        $this->assertTrue((bool) strstr($string, "\n    </ul>"));
+        $this->assertContains("    <ul>\n", $string, $string);
+        $this->assertContains("\n    </ul>", $string, $string);
     }
 }
diff --git a/test/Helper/Placeholder/RegistryTest.php b/test/Helper/Placeholder/RegistryTest.php
@@ -66,7 +66,7 @@ public function testCreateContainerCreatesDefaultContainerClass()
     {
         $this->assertFalse($this->registry->containerExists('foo'));
         $container = $this->registry->createContainer('foo');
-        $this->assertTrue($container instanceof Container);
+        $this->assertInstanceOf('Zend\View\Helper\Placeholder\Container', $container);
     }
 
     /**
@@ -76,7 +76,7 @@ public function testGetContainerCreatesContainerIfNonExistent()
     {
         $this->assertFalse($this->registry->containerExists('foo'));
         $container = $this->registry->getContainer('foo');
-        $this->assertTrue($container instanceof Container\AbstractContainer);
+        $this->assertInstanceOf('Zend\View\Helper\Placeholder\Container\AbstractContainer', $container);
         $this->assertTrue($this->registry->containerExists('foo'));
     }
 
@@ -135,7 +135,7 @@ public function testUsingCustomContainerClassCreatesContainersOfCustomClass()
     {
         $this->registry->setContainerClass('ZendTest\View\Helper\Placeholder\MockContainer');
         $container = $this->registry->createContainer('foo');
-        $this->assertTrue($container instanceof MockContainer);
+        $this->assertInstanceOf('ZendTest\View\Helper\Placeholder\MockContainer', $container);
     }
 
     /**

diff --git a/test/Model/ViewModelTest.php b/test/Model/ViewModelTest.php
@@ -232,7 +232,7 @@ public function testTemplateIsEmptyByDefault()
     {
         $model    = new ViewModel();
         $template = $model->getTemplate();
-        $this->assertTrue(empty($template));
+        $this->assertEmpty($template);
     }
 
     public function testTemplateIsMutable()

diff --git a/test/PhpRendererTest.php b/test/PhpRendererTest.php
@@ -173,7 +173,7 @@ public function testCanSpecifyArrayForVarsAndGetAlwaysArrayObject()
     {
         $vars = array('foo' => 'bar');
         $this->renderer->setVars($vars);
-        $this->assertTrue($this->renderer->vars() instanceof Variables);
+        $this->assertInstanceOf('Zend\View\Variables', $this->renderer->vars());
     }
 
     /**

diff --git a/test/Strategy/FeedStrategyTest.php b/test/Strategy/FeedStrategyTest.php
@@ -83,7 +83,7 @@ protected function assertResponseNotInjected()
     {
         $content = $this->response->getContent();
         $headers = $this->response->getHeaders();
-        $this->assertTrue(empty($content));
+        $this->assertEmpty($content);
         $this->assertFalse($headers->has('content-type'));
     }
 

diff --git a/test/Strategy/JsonStrategyTest.php b/test/Strategy/JsonStrategyTest.php
@@ -87,7 +87,7 @@ protected function assertResponseNotInjected()
     {
         $content = $this->response->getContent();
         $headers = $this->response->getHeaders();
-        $this->assertTrue(empty($content));
+        $this->assertEmpty($content);
         $this->assertFalse($headers->has('content-type'));
     }
 

diff --git a/test/Strategy/PhpRendererStrategyTest.php b/test/Strategy/PhpRendererStrategyTest.php
@@ -36,7 +36,7 @@ protected function assertResponseNotInjected()
     {
         $content = $this->response->getContent();
         $headers = $this->response->getHeaders();
-        $this->assertTrue(empty($content));
+        $this->assertEmpty($content);
         $this->assertFalse($headers->has('content-type'));
     }