Merge branch 'hotfix/7476'

Close zendframework/zendframework#7476
zendframework · May 4, 2015 · 3de1e33 · 3de1e33
2 parents 64f974b + 0c5c31a
commit 3de1e33
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 28 deletions.
diff --git a/test/Formatter/XmlTest.php b/test/Formatter/XmlTest.php
@@ -93,7 +93,7 @@ public function testHtmlSpecialCharsInMessageGetEscapedForValidXml()
         $line = $f->format(array('message' => '&key1=value1&key2=value2', 'priority' => 42));
 
         $this->assertContains("&amp;", $line);
-        $this->assertTrue(substr_count($line, "&amp;") == 2);
+        $this->assertEquals(2, substr_count($line, "&amp;"));
     }
 
     /**

diff --git a/test/LoggerTest.php b/test/LoggerTest.php
@@ -105,9 +105,9 @@ public function testSetWriters()
         $writers = $this->logger->getWriters();
         $this->assertInstanceOf('Zend\Stdlib\SplPriorityQueue', $writers);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Noop);
+        $this->assertInstanceOf('Zend\Log\Writer\Noop', $writer);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Mock);
+        $this->assertInstanceOf('Zend\Log\Writer\Mock', $writer);
     }
 
     public function testAddWriterWithPriority()
@@ -120,9 +120,9 @@ public function testAddWriterWithPriority()
 
         $this->assertInstanceOf('Zend\Stdlib\SplPriorityQueue', $writers);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Noop);
+        $this->assertInstanceOf('Zend\Log\Writer\Noop', $writer);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Mock);
+        $this->assertInstanceOf('Zend\Log\Writer\Mock', $writer);
     }
 
     public function testAddWithSamePriority()
@@ -135,9 +135,9 @@ public function testAddWithSamePriority()
 
         $this->assertInstanceOf('Zend\Stdlib\SplPriorityQueue', $writers);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Mock);
+        $this->assertInstanceOf('Zend\Log\Writer\Mock', $writer);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Noop);
+        $this->assertInstanceOf('Zend\Log\Writer\Noop', $writer);
     }
 
     public function testLogging()
@@ -260,7 +260,7 @@ public function testRegisterErrorHandler()
 
         $previous = Logger::registerErrorHandler($this->logger);
         $this->assertNotNull($previous);
-        $this->assertTrue(false !== $previous);
+        $this->assertNotFalse($previous);
 
         // check for single error handler instance
         $this->assertFalse(Logger::registerErrorHandler($this->logger));

diff --git a/test/Writer/AbstractTest.php b/test/Writer/AbstractTest.php
@@ -44,13 +44,13 @@ public function testAddFilter()
     public function testAddMockFilterByName()
     {
         $instance = $this->_writer->addFilter('mock');
-        $this->assertTrue($instance instanceof ConcreteWriter);
+        $this->assertInstanceOf('ZendTest\Log\TestAsset\ConcreteWriter', $instance);
     }
 
     public function testAddRegexFilterWithParamsByName()
     {
         $instance = $this->_writer->addFilter('regex', array( 'regex' => '/mess/' ));
-        $this->assertTrue($instance instanceof ConcreteWriter);
+        $this->assertInstanceOf('ZendTest\Log\TestAsset\ConcreteWriter', $instance);
     }
 
     /**
@@ -61,7 +61,7 @@ public function testFluentInterface()
         $instance = $this->_writer->addFilter(1)
                                   ->setFormatter(new SimpleFormatter());
 
-        $this->assertTrue($instance instanceof ConcreteWriter);
+        $this->assertInstanceOf('ZendTest\Log\TestAsset\ConcreteWriter', $instance);
     }
 
     public function testConvertErrorsToException()

diff --git a/test/Writer/ChromePhpTest.php b/test/Writer/ChromePhpTest.php
@@ -31,7 +31,7 @@ public function setUp()
     public function testGetChromePhp()
     {
         $writer = new ChromePhp($this->chromephp);
-        $this->assertTrue($writer->getChromePhp() instanceof ChromePhpInterface);
+        $this->assertInstanceOf('Zend\Log\Writer\ChromePhp\ChromePhpInterface', $writer->getChromePhp());
     }
 
     public function testSetChromePhp()
@@ -40,7 +40,7 @@ public function testSetChromePhp()
         $chromephp2 = new MockChromePhp();
 
         $writer->setChromePhp($chromephp2);
-        $this->assertTrue($writer->getChromePhp() instanceof ChromePhpInterface);
+        $this->assertInstanceOf('Zend\Log\Writer\ChromePhp\ChromePhpInterface', $writer->getChromePhp());
         $this->assertEquals($chromephp2, $writer->getChromePhp());
     }
 
@@ -62,7 +62,7 @@ public function testWriteDisabled()
             'message' => 'my msg',
             'priority' => Logger::DEBUG
         ));
-        $this->assertTrue(empty($this->chromephp->calls));
+        $this->assertEmpty($this->chromephp->calls);
     }
 
     public function testConstructWithOptions()
@@ -74,7 +74,7 @@ public function testConstructWithOptions()
             'formatter' => $formatter,
             'instance'  => $this->chromephp,
         ));
-        $this->assertTrue($writer->getChromePhp() instanceof ChromePhpInterface);
+        $this->assertInstanceOf('Zend\Log\Writer\ChromePhp\ChromePhpInterface', $writer->getChromePhp());
         $this->assertAttributeInstanceOf('Zend\Log\Formatter\ChromePhp', 'formatter', $writer);
 
         $filters = self::readAttribute($writer, 'filters');

diff --git a/test/Writer/DbTest.php b/test/Writer/DbTest.php
@@ -336,10 +336,9 @@ public function testMapEventIntoColumnMustReturnScalarValues()
         $data = $method->invoke($this->writer, $event, $columnMap);
 
         foreach ($data as $field => $value) {
-            $this->assertTrue(is_scalar($value), sprintf(
-                'Value of column "%s" should be scalar, %s given',
-                $field,
-                gettype($value)
+            $this->assertInternalType('scalar', $value, sprintf(
+                'Value of column "%s" should be scalar',
+                $field
             ));
         }
     }
@@ -370,10 +369,9 @@ public function testEventIntoColumnMustReturnScalarValues()
         $data = $method->invoke($this->writer, $event);
 
         foreach ($data as $field => $value) {
-            $this->assertTrue(is_scalar($value), sprintf(
-                'Value of column "%s" should be scalar, %s given',
-                $field,
-                gettype($value)
+            $this->assertInternalType('scalar', $value, sprintf(
+                'Value of column "%s" should be scalar',
+                $field
             ));
         }
     }

diff --git a/test/Writer/FirePhpTest.php b/test/Writer/FirePhpTest.php
@@ -33,7 +33,7 @@ public function setUp()
     public function testGetFirePhp()
     {
         $writer = new FirePhp($this->firephp);
-        $this->assertTrue($writer->getFirePhp() instanceof FirePhpInterface);
+        $this->assertInstanceOf('Zend\Log\Writer\FirePhp\FirePhpInterface', $writer->getFirePhp());
     }
     /**
      * Test set firephp
@@ -44,7 +44,7 @@ public function testSetFirePhp()
         $firephp2 = new MockFirePhp();
 
         $writer->setFirePhp($firephp2);
-        $this->assertTrue($writer->getFirePhp() instanceof FirePhpInterface);
+        $this->assertInstanceOf('Zend\Log\Writer\FirePhp\FirePhpInterface', $writer->getFirePhp());
         $this->assertEquals($firephp2, $writer->getFirePhp());
     }
     /**
@@ -70,7 +70,7 @@ public function testWriteDisabled()
             'message' => 'my msg',
             'priority' => Logger::DEBUG
         ));
-        $this->assertTrue(empty($this->firephp->calls));
+        $this->assertEmpty($this->firephp->calls);
     }
 
     public function testConstructWithOptions()
@@ -82,7 +82,7 @@ public function testConstructWithOptions()
                 'formatter' => $formatter,
                 'instance'  => $this->firephp,
         ));
-        $this->assertTrue($writer->getFirePhp() instanceof FirePhpInterface);
+        $this->assertInstanceOf('Zend\Log\Writer\FirePhp\FirePhpInterface', $writer->getFirePhp());
         $this->assertAttributeInstanceOf('Zend\Log\Formatter\FirePhp', 'formatter', $writer);
 
         $filters = self::readAttribute($writer, 'filters');

diff --git a/test/Writer/SyslogTest.php b/test/Writer/SyslogTest.php
@@ -61,7 +61,7 @@ public function testFluentInterface()
         $instance = $writer->setFacility(LOG_USER)
                            ->setApplicationName('my_app');
 
-        $this->assertTrue($instance instanceof SyslogWriter);
+        $this->assertInstanceOf('Zend\Log\Writer\Syslog', $instance);
     }
 
     /**