Remove assertType from Unit tests

tests/Zend/Acl/AclTest.php

@@ -75,7 +75,7 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
     {
         $role = $this->_acl->addRole('area')
                           ->getRole('area');
-        $this->assertType('Zend_Acl_Role', $role);
+        $this->assertTrue($role instanceof Zend_Acl_Role);
         $this->assertEquals('area', $role->getRoleId());
     }
 
@@ -279,7 +279,7 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
     {
         $resource = $this->_acl->addResource('area')
                           ->get('area');
-        $this->assertType('Zend_Acl_Resource', $resource);
+        $this->assertTrue($resource instanceof Zend_Acl_Resource);
         $this->assertEquals('area', $resource->getResourceId());
     }
 
@@ -1158,8 +1158,8 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($acl->isAllowed($user, $blogPost, 'modify'), 'Assertion should return false');
 
         // check to see if the last assertion has the proper objets
-        $this->assertType('Zend_Acl_UseCase1_User', $assertion->lastAssertRole, 'Assertion did not recieve proper role object');
-        $this->assertType('Zend_Acl_UseCase1_BlogPost', $assertion->lastAssertResource, 'Assertion did not recieve proper resource object');
+        $this->assertTrue($assertion->lastAssertRole instanceof Zend_Acl_UseCase1_User, 'Assertion did not recieve proper role object');
+        $this->assertTrue($assertion->lastAssertResource instanceof Zend_Acl_UseCase1_BlogPost, 'Assertion did not recieve proper resource object');
 
     }
 

tests/Zend/Application/Resource/DbTest.php

@@ -162,7 +162,7 @@ class Zend_Application_Resource_DbTest extends PHPUnit_Framework_TestCase
         );
         $resource = new Zend_Application_Resource_Db($config);
         $resource->init();
-        $this->assertType('Zend_Cache_Core', Zend_Db_Table::getDefaultMetadataCache());
+        $this->assertTrue(Zend_Db_Table::getDefaultMetadataCache() instanceof Zend_Cache_Core);
     }
 
     /**
@@ -196,7 +196,7 @@ class Zend_Application_Resource_DbTest extends PHPUnit_Framework_TestCase
         );
         $resource = new Zend_Application_Resource_Db($config);
         $resource->init();
-        $this->assertType('Zend_Cache_Core', Zend_Db_Table::getDefaultMetadataCache());
+        $this->assertTrue(Zend_Db_Table::getDefaultMetadataCache() instanceof Zend_Cache_Core);
     }
 
     /**

tests/Zend/Application/Resource/LocaleTest.php

@@ -147,7 +147,7 @@ class Zend_Application_Resource_LocaleTest extends PHPUnit_Framework_TestCase
         $resource = new Zend_Application_Resource_Locale($config);
         $resource->init();
         $backend = Zend_Locale::getCache()->getBackend();
-        $this->assertType('Zend_Cache_Backend_BlackHole', $backend);
+        $this->assertTrue($backend instanceof Zend_Cache_Backend_BlackHole);
         Zend_Locale::removeCache();
     }
 

tests/Zend/Application/Resource/LogTest.php

@@ -174,7 +174,7 @@ class Zend_Application_Resource_LogTest extends PHPUnit_Framework_TestCase
         $resource->setBootstrap($this->bootstrap);
         $log = $resource->init();
 
-        $this->assertType('Zend_Log', $log);
+        $this->assertTrue($log instanceof Zend_Log);
 
         $log->log($message, Zend_Log::INFO);
         rewind($stream);

tests/Zend/Application/Resource/ModulesTest.php

@@ -197,7 +197,7 @@ class Zend_Application_Resource_ModulesTest extends PHPUnit_Framework_TestCase
         $resource->setBootstrap($this->bootstrap);
         $resource->init();
         $bootstraps = $resource->getExecutedBootstraps();
-        $this->assertType('ArrayObject', $bootstraps);
+        $this->assertTrue($bootstraps instanceof ArrayObject);
     }
 }
 

tests/Zend/Application/Resource/MultidbTest.php

@@ -211,7 +211,7 @@ class Zend_Application_Resource_MultidbTest extends PHPUnit_Framework_TestCase
         $options['defaultMetadataCache'] = $cache;
         $resource = new Zend_Application_Resource_Multidb($options);
         $resource->init();
-        $this->assertType('Zend_Cache_Core', Zend_Db_Table::getDefaultMetadataCache());
+        $this->assertTrue(Zend_Db_Table::getDefaultMetadataCache() instanceof Zend_Cache_Core);
     }
 
     /**
@@ -240,7 +240,7 @@ class Zend_Application_Resource_MultidbTest extends PHPUnit_Framework_TestCase
         $resource = new Zend_Application_Resource_Multidb($options);
         $resource->setBootstrap($this->bootstrap);
         $resource->init();
-        $this->assertType('Zend_Cache_Core', Zend_Db_Table::getDefaultMetadataCache());
+        $this->assertTrue(Zend_Db_Table::getDefaultMetadataCache() instanceof Zend_Cache_Core);
     }
 }
 

tests/Zend/Application/Resource/SessionTest.php

@@ -58,7 +58,7 @@ class Zend_Application_Resource_SessionTest extends PHPUnit_Framework_TestCase
 
         $this->resource->setSaveHandler($saveHandlerClassName);
 
-        $this->assertType($saveHandlerClassName, $this->resource->getSaveHandler());
+        $this->assertTrue($this->resource->getSaveHandler() instanceof $saveHandlerClassName);
     }
 
     public function testSetSaveHandlerArray()
@@ -68,7 +68,7 @@ class Zend_Application_Resource_SessionTest extends PHPUnit_Framework_TestCase
 
         $this->resource->setSaveHandler(array('class' => $saveHandlerClassName));
 
-        $this->assertType($saveHandlerClassName, $this->resource->getSaveHandler());
+        $this->assertTrue($this->resource->getSaveHandler() instanceof $saveHandlerClassName);
     }
 
     public function testSetOptions()

tests/Zend/Application/Resource/TranslateTest.php

@@ -120,7 +120,7 @@ class Zend_Application_Resource_TranslateTest extends PHPUnit_Framework_TestCase
             $resource->getTranslate();
             $this->fail('Expected Zend_Application_Resource_Exception');
         } catch (Zend_Application_Resource_Exception $e) {
-            $this->assertType('Zend_Application_Resource_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Application_Resource_Exception);
         }
     }
 
@@ -171,7 +171,7 @@ class Zend_Application_Resource_TranslateTest extends PHPUnit_Framework_TestCase
         $resource->setBootstrap($this->bootstrap);
         $resource->init();
 
-        $this->assertType('Zend_Cache_Core', Zend_Translate::getCache());
+        $this->assertTrue(Zend_Translate::getCache() instanceof Zend_Cache_Core);
         Zend_Translate::removeCache();
     }
 

tests/Zend/Application/Resource/UseragentTest.php

@@ -101,7 +101,7 @@ class Zend_Application_Resource_UseragentTest extends PHPUnit_Framework_TestCase
         $resource->init();
         $ua      = $resource->getUserAgent();
         $storage = $ua->getStorage();
-        $this->assertType('Zend_Http_UserAgent_Storage_NonPersistent', $storage);
+        $this->assertTrue($storage instanceof Zend_Http_UserAgent_Storage_NonPersistent);
     }
 
     public function testInjectsUserAgentIntoViewHelperWhenViewResourcePresent()

tests/Zend/Auth/Adapter/Http/AuthTest.php

@@ -170,7 +170,7 @@ class Zend_Auth_Adapter_Http_AuthTest extends PHPUnit_Framework_TestCase
         $digest = $this->_digestChallenge();
 
         // Make sure the result is false
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertFalse($result->isValid());
 
         // Verify the status code and the presence of both challenges
@@ -445,7 +445,7 @@ class Zend_Auth_Adapter_Http_AuthTest extends PHPUnit_Framework_TestCase
         extract($data); // $result, $status, $headers
 
         // Make sure the result is false
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertFalse($result->isValid());
 
         // Verify the status code and the presence of the challenge
@@ -467,7 +467,7 @@ class Zend_Auth_Adapter_Http_AuthTest extends PHPUnit_Framework_TestCase
         extract($data); // $result, $status, $headers
 
         // Make sure the result is true
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertTrue($result->isValid());
 
         // Verify we got a 200 response
@@ -485,7 +485,7 @@ class Zend_Auth_Adapter_Http_AuthTest extends PHPUnit_Framework_TestCase
         extract($data); // $result, $status, $headers
 
         // Make sure the result is false
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertFalse($result->isValid());
 
         // Make sure it set the right HTTP code

tests/Zend/Auth/Adapter/Http/ObjectTest.php

@@ -142,7 +142,7 @@ class Zend_Auth_Adapter_Http_ObjectTest extends PHPUnit_Framework_TestCase
             $this->fail('Valid config deemed invalid');
         }
         $this->assertFalse(empty($t));
-        $this->assertType('Zend_Auth_Adapter_Http', $t);
+        $this->assertTrue($t instanceof Zend_Auth_Adapter_Http);
         unset($t);
 
         try {
@@ -151,7 +151,7 @@ class Zend_Auth_Adapter_Http_ObjectTest extends PHPUnit_Framework_TestCase
             $this->fail('Valid config deemed invalid');
         }
         $this->assertFalse(empty($t));
-        $this->assertType('Zend_Auth_Adapter_Http', $t);
+        $this->assertTrue($t instanceof Zend_Auth_Adapter_Http);
         unset($t);
 
         try {
@@ -160,7 +160,7 @@ class Zend_Auth_Adapter_Http_ObjectTest extends PHPUnit_Framework_TestCase
             $this->fail('Valid config deemed invalid');
         }
         $this->assertFalse(empty($t));
-        $this->assertType('Zend_Auth_Adapter_Http', $t);
+        $this->assertTrue($t instanceof Zend_Auth_Adapter_Http);
         unset($t);
     }
 

tests/Zend/Auth/Adapter/Http/ProxyTest.php

@@ -167,7 +167,7 @@ class Zend_Auth_Adapter_Http_ProxyTest extends PHPUnit_Framework_TestCase
         $digest = $this->_digestChallenge();
 
         // Make sure the result is false
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertFalse($result->isValid());
 
         // Verify the status code and the presence of both challenges
@@ -431,7 +431,7 @@ class Zend_Auth_Adapter_Http_ProxyTest extends PHPUnit_Framework_TestCase
         extract($data); // $result, $status, $headers
 
         // Make sure the result is false
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertFalse($result->isValid());
 
         // Verify the status code and the presence of the challenge
@@ -453,7 +453,7 @@ class Zend_Auth_Adapter_Http_ProxyTest extends PHPUnit_Framework_TestCase
         extract($data); // $result, $status, $headers
 
         // Make sure the result is true
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertTrue($result->isValid());
 
         // Verify we got a 200 response
@@ -471,7 +471,7 @@ class Zend_Auth_Adapter_Http_ProxyTest extends PHPUnit_Framework_TestCase
         extract($data); // $result, $status, $headers
 
         // Make sure the result is false
-        $this->assertType('Zend_Auth_Result', $result);
+        $this->assertTrue($result instanceof Zend_Auth_Result);
         $this->assertFalse($result->isValid());
 
         // Make sure it set the right HTTP code

tests/Zend/Auth/Adapter/Ldap/OfflineTest.php

@@ -65,7 +65,7 @@ class Zend_Auth_Adapter_Ldap_OfflineTest extends PHPUnit_Framework_TestCase
             $this->markTestSkipped('LDAP is not enabled');
         }
         $this->_adapter->setLdap(new Zend_Ldap());
-        $this->assertType('Zend_Ldap', $this->_adapter->getLdap());
+        $this->assertTrue($this->_adapter->getLdap() instanceof Zend_Ldap);
     }
 
     public function testUsernameIsNullIfNotSet()

tests/Zend/Auth/Adapter/Ldap/OnlineTest.php

@@ -186,7 +186,7 @@ class Zend_Auth_Adapter_Ldap_OnlineTest extends PHPUnit_Framework_TestCase
         $account = $adapter->getAccountObject();
 
         $this->assertTrue($result->isValid());
-        $this->assertType('stdClass', $account);
+        $this->assertTrue($account instanceof stdClass);
         $this->assertEquals(TESTS_ZEND_LDAP_ALT_DN, $account->dn);
     }
 
@@ -201,7 +201,7 @@ class Zend_Auth_Adapter_Ldap_OnlineTest extends PHPUnit_Framework_TestCase
         $result = $adapter->authenticate();
         $account = $adapter->getAccountObject(array(), array('userPassword'));
 
-        $this->assertType('stdClass', $account);
+        $this->assertTrue($account instanceof stdClass);
         $this->assertFalse(isset($account->userpassword));
     }
 }

tests/Zend/Cache/CoreTest.php

@@ -120,7 +120,7 @@ class Zend_Cache_CoreTest extends PHPUnit_Framework_TestCase
         $this->_instance->setBackend($backend);
         $log = $backend->getLastLog();
         $this->assertEquals('setDirectives', $log['methodName']);
-        $this->assertType('array', $log['args'][0]);
+        $this->assertTrue(is_array($log['args'][0]));
     }
 
     public function testSetOptionCorrectCall()
@@ -527,7 +527,7 @@ class Zend_Cache_CoreTest extends PHPUnit_Framework_TestCase
         $this->_instance->setBackend($this->_backend);
 
         $logger = $this->_instance->getOption('logger');
-        $this->assertType('Zend_Log', $logger);
+        $this->assertTrue($logger instanceof Zend_Log);
     }
 
     /**

tests/Zend/Cache/ManagerTest.php

@@ -63,7 +63,7 @@ class Zend_Cache_ManagerTest extends PHPUnit_Framework_TestCase
         $manager = new Zend_Cache_Manager();
         $caches  = $manager->getCaches();
 
-        $this->assertType('array', $caches);
+        $this->assertTrue(is_array($caches));
         $this->assertArrayHasKey('default', $caches);
     }
 

tests/Zend/Cloud/Infrastructure/Adapter/Ec2Test.php

@@ -136,7 +136,9 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2Test extends PHPUnit_Framework_TestCa
      */
     public function testGetAdapter()
     {
-        $this->assertType('Zend_Service_Amazon_Ec2_Instance',$this->infrastructure->getAdapter());
+        $this->assertTrue(
+            $this->infrastructure->getAdapter() instanceof Zend_Service_Amazon_Ec2_Instance
+        );
     }
 
     /**

tests/Zend/Cloud/Infrastructure/Adapter/RackspaceTest.php

@@ -136,7 +136,9 @@ class Zend_Cloud_Infrastructure_Adapter_RackspaceTest extends PHPUnit_Framework_
      */
     public function testGetAdapter()
     {
-        $this->assertType('Zend_Service_Rackspace_Servers',$this->infrastructure->getAdapter());
+        $this->assertTrue(
+            $this->infrastructure->getAdapter() instanceof Zend_Service_Rackspace_Servers
+        );
     }
     /**
      * Test create an instance

tests/Zend/Cloud/QueueService/TestCase.php

@@ -200,12 +200,12 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
             $this->_commonQueue->sendMessage($queueURL, $message);
             $this->_wait();
             $receivedMessages = $this->_commonQueue->receiveMessages($queueURL);
-            $this->assertType('Zend_Cloud_QueueService_MessageSet', $receivedMessages);
+            $this->assertTrue($receivedMessages instanceof Zend_Cloud_QueueService_MessageSet);
             $this->assertEquals(1, count($receivedMessages));
             foreach ($receivedMessages as $m) {
                 $this->assertEquals($message, $m->getBody());
             }
-		  $this->_commonQueue->deleteQueue($queueURL);
+            $this->_commonQueue->deleteQueue($queueURL);
         } catch (Exception $e) {
             if(isset($queueURL)) $this->_commonQueue->deleteQueue($queueURL);
             throw $e;
@@ -229,10 +229,10 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
 
             // receive one message
             $receivedMessages1 = $this->_commonQueue->receiveMessages($queueURL);
-            $this->assertType('Zend_Cloud_QueueService_MessageSet', $receivedMessages1);
+            $this->assertTrue($receivedMessages1 instanceof Zend_Cloud_QueueService_MessageSet);
             $this->assertEquals(1, count($receivedMessages1));
             foreach ($receivedMessages1 as $receivedMessage1) {
-                $this->assertType('Zend_Cloud_QueueService_Message', $receivedMessage1);
+                $this->assertTrue($receivedMessage1 instanceof Zend_Cloud_QueueService_Message);
             }
 
             // cleanup the queue
@@ -252,7 +252,7 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
 
             // receive both messages
             $receivedMessages2 = $this->_commonQueue->receiveMessages($queueURL, 2);
-            $this->assertType('Zend_Cloud_QueueService_MessageSet', $receivedMessages2);
+            $this->assertTrue($receivedMessages2 instanceof Zend_Cloud_QueueService_MessageSet);
             $this->assertEquals(2, count($receivedMessages2));
 
             $tests = array();
@@ -286,7 +286,7 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
             $receivedMessages1 = $this->_commonQueue->receiveMessages($queueURL);
 
             // should receive one $message1
-            $this->assertType('Zend_Cloud_QueueService_MessageSet', $receivedMessages1);
+            $this->assertTrue($receivedMessages1 instanceof Zend_Cloud_QueueService_MessageSet);
             $this->assertEquals(1, count($receivedMessages1));
             foreach ($receivedMessages1 as $receivedMessage1) {
                 $this->assertEquals($message1, $receivedMessage1->getBody());
@@ -297,10 +297,10 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
 
             // now there should be no messages left
             $receivedMessages2 = $this->_commonQueue->receiveMessages($queueURL);
-            $this->assertType('Zend_Cloud_QueueService_MessageSet', $receivedMessages2);
-		    $this->assertEquals(0, count($receivedMessages2));
+            $this->assertTrue($receivedMessages2 instanceof Zend_Cloud_QueueService_MessageSet);
+            $this->assertEquals(0, count($receivedMessages2));
 
-		    $this->_commonQueue->deleteQueue($queueURL);
+            $this->_commonQueue->deleteQueue($queueURL);
         } catch (Exception $e) {
             if(isset($queueURL)) $this->_commonQueue->deleteQueue($queueURL);
             throw $e;

tests/Zend/Config/IniTest.php

@@ -76,9 +76,9 @@ class Zend_Config_IniTest extends PHPUnit_Framework_TestCase
     {
         $config = new Zend_Config_Ini($this->_iniFileConfig, 'debug');
 
-        $this->assertType('string', $config->debug);
+        $this->assertTrue(is_string($config->debug));
         $this->assertEquals('1', $config->debug);
-        $this->assertType('string', $config->values->changed);
+        $this->assertTrue(is_string($config->values->changed));
         $this->assertEquals('1', $config->values->changed);
     }
 
@@ -86,11 +86,11 @@ class Zend_Config_IniTest extends PHPUnit_Framework_TestCase
     {
         $config = new Zend_Config_Ini($this->_iniFileConfig, 'debug');
 
-        $this->assertType('string', $config->special->no);
+        $this->assertTrue(is_string($config->special->no));
         $this->assertEquals('', $config->special->no);
-        $this->assertType('string', $config->special->null);
+        $this->assertTrue(is_string($config->special->null));
         $this->assertEquals('', $config->special->null);
-        $this->assertType('string', $config->special->false);
+        $this->assertTrue(is_string($config->special->false));
         $this->assertEquals('', $config->special->false);
     }
 

tests/Zend/Config/JsonTest.php

@@ -81,7 +81,7 @@ class Zend_Config_JsonTest extends PHPUnit_Framework_TestCase
     {
         $config = new Zend_Config_Json($this->_iniFileConfig, 'debug');
 
-        $this->assertType('string', $config->special->no);
+        $this->assertTrue(is_string($config->special->no));
         $this->assertEquals('no', $config->special->no);
         $this->assertNull($config->special->null);
         $this->assertFalse($config->special->false);

tests/Zend/Config/YamlTest.php

@@ -78,9 +78,9 @@ class Zend_Config_YamlTest extends PHPUnit_Framework_TestCase
     {
         $config = new Zend_Config_Yaml($this->_iniFileConfig, 'debug');
 
-        $this->assertType('string', $config->debug);
+        $this->assertTrue(is_string($config->debug));
         $this->assertEquals('1', $config->debug);
-        $this->assertType('string', $config->values->changed);
+        $this->assertTrue(is_string($config->values->changed));
         $this->assertEquals('1', $config->values->changed);
     }
 
@@ -88,13 +88,13 @@ class Zend_Config_YamlTest extends PHPUnit_Framework_TestCase
     {
         $config = new Zend_Config_Yaml($this->_iniFileConfig, 'debug');
 
-        $this->assertType('string', $config->special->no);
+        $this->assertTrue(is_string($config->special->no));
         $this->assertEquals('', $config->special->no);
-        $this->assertType('string', $config->special->null);
+        $this->assertTrue(is_string($config->special->null));
         $this->assertEquals('', $config->special->null);
-        $this->assertType('string', $config->special->false);
+        $this->assertTrue(is_string($config->special->false));
         $this->assertEquals('', $config->special->false);
-        $this->assertType('string', $config->special->zero);
+        $this->assertTrue(is_string($config->special->zero));
         $this->assertEquals('0', $config->special->zero);
     }
 
@@ -338,11 +338,10 @@ class Zend_Config_YamlTest extends PHPUnit_Framework_TestCase
     public function testAllowsInlineCommentsInValuesUsingHash()
     {
         $config = new Zend_Config_Yaml($this->_yamlInlineCommentsConfig, null);
-        $this->assertType('Zend_Config', $config->resources);
-        $this->assertType('Zend_Config', $config->resources->frontController);
-        $this->assertType(
-            'string', 
-            $config->resources->frontController->controllerDirectory
+        $this->assertTrue($config->resources instanceof Zend_Config);
+        $this->assertTrue($config->resources->frontController instanceof Zend_Config);
+        $this->assertTrue(
+            is_string($config->resources->frontController->controllerDirectory)
         );
         $this->assertSame(
             'APPLICATION_PATH/controllers',
@@ -356,11 +355,10 @@ class Zend_Config_YamlTest extends PHPUnit_Framework_TestCase
     public function testAllowsIndentedCommentsUsingHash()
     {
         $config = new Zend_Config_Yaml($this->_yamlIndentedCommentsConfig, null);
-        $this->assertType('Zend_Config', $config->resources);
-        $this->assertType('Zend_Config', $config->resources->frontController);
-        $this->assertType(
-            'string', 
-            $config->resources->frontController->controllerDirectory
+        $this->assertTrue($config->resources instanceof Zend_Config);
+        $this->assertTrue($config->resources->frontController instanceof Zend_Config);
+        $this->assertTrue(
+            is_string($config->resources->frontController->controllerDirectory)
         );
         $this->assertSame(
             'APPLICATION_PATH/controllers',

tests/Zend/ConfigTest.php

@@ -356,9 +356,9 @@ class Zend_ConfigTest extends PHPUnit_Framework_TestCase
             );
         $config = new Zend_Config($configData);
         $this->assertEquals($config->toArray(), $configData);
-        $this->assertType('stdClass', $config->a);
-        $this->assertType('stdClass', $config->b->c);
-        $this->assertType('stdClass', $config->b->d);
+        $this->assertTrue($config->a instanceof stdClass);
+        $this->assertTrue($config->b->c instanceof stdClass);
+        $this->assertTrue($config->b->d instanceof stdClass);
     }
 
     /**

tests/Zend/Console/GetoptTest.php

@@ -114,7 +114,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts = new Zend_Console_Getopt(array('|a'=>'Apple option'));
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(),
                 'Blank flag not allowed in rule "|a".');
@@ -128,7 +128,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
                 array('apple|apple'=>'apple-option'));
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(),
                 'Option "--apple" is being defined more than once.');
@@ -139,7 +139,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
                 array('a'=>'Apple option', 'apple|a'=>'Apple option'));
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(),
                 'Option "-a" is being defined more than once.');
@@ -158,7 +158,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->parse();
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Option "pear" is not recognized.');
         }
@@ -178,7 +178,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->parse();
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Option "apple" requires a parameter.');
         }
@@ -279,7 +279,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->setArguments('-a');
             $this->fail('Expected to catch a Zend_Console_Getopt_Exception');
         } catch(Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '. get_class($e));
             $this->assertEquals("Parameter #1 to setArguments should be an array",
                 $e->getMessage());
@@ -289,7 +289,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->addArguments('-b');
             $this->fail('Expected to catch a Zend_Console_Getopt_Exception');
         } catch(Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '. get_class($e));
             $this->assertEquals("Parameter #1 to addArguments should be an array",
                 $e->getMessage());
@@ -321,7 +321,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->parse();
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Option "fakeflag" is not recognized.');
         }
@@ -355,7 +355,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->parse();
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $message = preg_replace('/Usage: .* \[ options \]/',
                 'Usage: <progname> [ options ]',
@@ -390,7 +390,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->setAliases(array('b' => 'apple'));
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Option "--apple" is being defined more than once.');
         }
@@ -405,7 +405,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->parse();
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals('Option "c" is not recognized.', $e->getMessage());
         }
@@ -462,7 +462,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->parse();
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Option "apple" requires an integer parameter, but was given "noninteger".');
         }
@@ -475,7 +475,7 @@ class Zend_Console_GetoptTest extends PHPUnit_Framework_TestCase
             $opts->parse();
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Console_Getopt_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
                 'Expected Zend_Console_Getopt_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Option "banana" requires a single-word parameter, but was given "two words".');
         }

tests/Zend/Crypt/Rsa/RsaTest.php

@@ -139,13 +139,13 @@ CERT;
     public function testSetPemStringParsesPemForPrivateKey()
     {
         $rsa = new Zend_Crypt_Rsa(array('pemString'=>$this->_testPemString));
-        $this->assertType('Zend_Crypt_Rsa_Key_Private', $rsa->getPrivateKey());
+        $this->assertTrue($rsa->getPrivateKey() instanceof Zend_Crypt_Rsa_Key_Private);
     }
 
     public function testSetPemStringParsesPemForPublicKey()
     {
         $rsa = new Zend_Crypt_Rsa(array('pemString'=>$this->_testPemString));
-        $this->assertType('Zend_Crypt_Rsa_Key_Public', $rsa->getPublicKey());
+        $this->assertTrue($rsa->getPublicKey() instanceof Zend_Crypt_Rsa_Key_Public);
     }
 
     public function testSetCertificateStringParsesCertificateForNullPrivateKey()
@@ -157,7 +157,7 @@ CERT;
     public function testSetCertificateStringParsesCertificateForPublicKey()
     {
         $rsa = new Zend_Crypt_Rsa(array('certificateString'=>$this->_testCertificateString));
-        $this->assertType('Zend_Crypt_Rsa_Key_Public', $rsa->getPublicKey());
+        $this->assertTrue($rsa->getPublicKey() instanceof Zend_Crypt_Rsa_Key_Public);
     }
 
     public function testSignGeneratesExpectedBinarySignature()
@@ -274,7 +274,7 @@ CERT;
         }
 
         $keys = $rsa->generateKeys(array('private_key_bits'=>512));
-        $this->assertType('ArrayObject', $keys);
+        $this->assertTrue($keys instanceof ArrayObject);
     }
 
     public function testKeyGenerationCreatesPrivateKeyInArrayObject()
@@ -287,7 +287,7 @@ CERT;
         }
 
         $keys = $rsa->generateKeys(array('private_key_bits'=>512));
-        $this->assertType('Zend_Crypt_Rsa_Key_Private', $keys->privateKey);
+        $this->assertTrue($keys->privateKey instanceof Zend_Crypt_Rsa_Key_Private);
     }
 
     public function testKeyGenerationCreatesPublicKeyInArrayObject()
@@ -300,7 +300,7 @@ CERT;
         }
 
         $keys = $rsa->generateKeys(array('privateKeyBits'=>512));
-        $this->assertType('Zend_Crypt_Rsa_Key_Public', $keys->publicKey);
+        $this->assertTrue($keys->publicKey instanceof Zend_Crypt_Rsa_Key_Public);
     }
 
     public function testKeyGenerationCreatesPassphrasedPrivateKey()

tests/Zend/Db/Adapter/OracleTest.php

@@ -104,7 +104,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
         // Test associative array
         $result = $this->_db->fetchAll("SELECT * FROM $products WHERE $product_id > :id ORDER BY $product_id ASC", array(":id"=>1), Zend_Db::FETCH_ASSOC);
         $this->assertEquals(2, count($result));
-        $this->assertType('array', $result[0]);
+        $this->assertTrue(is_array($result[0]));
         $this->assertEquals(2, count($result[0])); // count columns
         $this->assertEquals(2, $result[0][$col_name]);
 
@@ -114,7 +114,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
         // Ensure original fetch mode has been retained
         $result = $this->_db->fetchAll("SELECT * FROM $products WHERE $product_id > :id ORDER BY $product_id", array(":id"=>1));
         $this->assertEquals(2, count($result));
-        $this->assertType('object', $result[0]);
+        $this->assertTrue(is_object($result[0]));
         $this->assertEquals(2, $result[0]->$col_name);
     }
 
@@ -145,7 +145,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
 
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $result = $this->_db->fetchAssoc("SELECT * FROM $products WHERE $product_id > :id ORDER BY $product_id DESC", array(":id"=>1));
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(array('product_id', 'product_name'), array_keys(current($result)));
     }
 
@@ -175,7 +175,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
 
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $result = $this->_db->fetchCol("SELECT * FROM $products WHERE $product_id > :id ORDER BY $product_id ASC", array(":id"=>1));
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(2, count($result)); // count rows
         $this->assertEquals(2, $result[0]);
         $this->assertEquals(3, $result[1]);
@@ -210,7 +210,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $prod = 'Linux';
         $result = $this->_db->fetchOne("SELECT $product_name FROM $products WHERE $product_id > :id ORDER BY $product_id", array(":id"=>1));
-        $this->assertType('string', $result);
+        $this->assertTrue(is_string($result));
         $this->assertEquals($prod, $result);
     }
 
@@ -242,7 +242,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $prod = 'Linux';
         $result = $this->_db->fetchPairs("SELECT $product_id, $product_name FROM $products WHERE $product_id > :id ORDER BY $product_id ASC", array(":id"=>1));
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(2, count($result)); // count rows
         $this->assertEquals($prod, $result[2]);
     }
@@ -275,7 +275,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
 
         // Test associative array
         $result = $this->_db->fetchRow("SELECT * FROM $products WHERE $product_id > :id ORDER BY $product_id", array(":id"=>1), Zend_Db::FETCH_ASSOC);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(2, count($result)); // count columns
         $this->assertEquals(2, $result['product_id']);
 
@@ -284,7 +284,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
 
         // Ensure original fetch mode has been retained
         $result = $this->_db->fetchRow("SELECT * FROM $products WHERE $product_id > :id ORDER BY $product_id", array(":id"=>1));
-        $this->assertType('object', $result);
+        $this->assertTrue(is_object($result));
         $this->assertEquals(2, $result->$col_name);
     }
 
@@ -327,7 +327,7 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
             ->from('zfproducts')
             ->where("$product_id = 4");
         $result = $this->_db->fetchAll($select);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals('SOLARIS', $result[0]['product_name']);
     }
 
@@ -427,7 +427,8 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
         $documents = $this->_db->quoteIdentifier('zfdocuments');
         $document_id = $this->_db->quoteIdentifier('doc_id');
         $value = $this->_db->fetchRow("SELECT * FROM $documents WHERE $document_id = 1");
-        $this->assertType('OCI-Lob', $value['doc_clob']);
+        $class = 'OCI-Lob';
+        $this->assertTrue($value['doc_clob'] instanceof $class);
         $expected = 'this is the clob that never ends...'.
                     'this is the clob that never ends...'.
                     'this is the clob that never ends...';
@@ -452,7 +453,8 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
         $documents = $this->_db->quoteIdentifier('zfdocuments');
         $document_id = $this->_db->quoteIdentifier('doc_id');
         $value = $this->_db->fetchAssoc("SELECT * FROM $documents WHERE $document_id = 1");
-        $this->assertType('OCI-Lob', $value[1]['doc_clob']);
+        $class = 'OCI-Lob';
+        $this->assertTrue($value[1]['doc_clob'] instanceof $class);
         $expected = 'this is the clob that never ends...'.
                     'this is the clob that never ends...'.
                     'this is the clob that never ends...';
@@ -478,7 +480,8 @@ class Zend_Db_Adapter_OracleTest extends Zend_Db_Adapter_TestCommon
         $document_id = $this->_db->quoteIdentifier('doc_id');
         $document_clob = $this->_db->quoteIdentifier('doc_clob');
         $value = $this->_db->fetchOne("SELECT $document_clob FROM $documents WHERE $document_id = 1");
-        $this->assertType('OCI-Lob', $value);
+        $class = 'OCI-Lob';
+        $this->assertTrue($value instanceof $class);
         $expected = 'this is the clob that never ends...'.
                     'this is the clob that never ends...'.
                     'this is the clob that never ends...';

tests/Zend/Db/Adapter/Pdo/IbmTest.php

@@ -85,7 +85,7 @@ class Zend_Db_Adapter_Pdo_IbmTest extends Zend_Db_Adapter_Db2Test
             $sql = $this->_db->limit("SELECT * FROM $products", 1, -1);
             $this->fail('Expected to catch Zend_Db_Adapter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting object of type Zend_Db_Adapter_Exception, got '.get_class($e));
         }
     }

tests/Zend/Db/Adapter/Pdo/MssqlTest.php

@@ -313,7 +313,7 @@ class Zend_Db_Adapter_Pdo_MssqlTest extends Zend_Db_Adapter_Pdo_TestCommon
         $rowsAffected = $this->_db->insert('zfbugs', $row);
         $this->assertEquals(1, $rowsAffected);
         $lastInsertId = $this->_db->lastInsertId();
-        $this->assertType('integer', $lastInsertId);
+        $this->assertTrue(is_int($lastInsertId));
         $this->assertEquals('5', (string) $lastInsertId,
             'Expected new id to be 5');
     }

tests/Zend/Db/Adapter/Pdo/MysqlTest.php

@@ -94,7 +94,7 @@ class Zend_Db_Adapter_Pdo_MysqlTest extends Zend_Db_Adapter_Pdo_TestCommon
             $stmt = $this->_db->query($select);
             $result2 = $stmt->fetchAll();
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->fail('Unexpected exception '.get_class($e).' received: '.$e->getMessage());
         }

tests/Zend/Db/Adapter/Pdo/OciTest.php

@@ -76,8 +76,8 @@ class Zend_Db_Adapter_Pdo_OciTest extends Zend_Db_Adapter_Pdo_TestCommon
         $this->assertEquals(1, $rowsAffected);
         $lastInsertId = $this->_db->lastInsertId('zfproducts', null); // implies 'products_seq'
         $lastSequenceId = $this->_db->lastSequenceId('zfproducts_seq');
-        $this->assertType('string', $lastInsertId);
-        $this->assertType('string', $lastSequenceId);
+        $this->assertTrue(is_string($lastInsertId));
+        $this->assertTrue(is_string($lastSequenceId));
         $this->assertEquals('4', (string) $lastInsertId, 'Expected new id to be 4');
         $this->assertEquals('4', (string) $lastSequenceId, 'Expected new id to be 4');
     }
@@ -95,7 +95,7 @@ class Zend_Db_Adapter_Pdo_OciTest extends Zend_Db_Adapter_Pdo_TestCommon
             ->from('zfproducts')
             ->where("$product_id = 4");
         $result = $this->_db->fetchAll($select);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals('SOLARIS', $result[0]['product_name']);
     }
 

tests/Zend/Db/Adapter/Pdo/SqliteTest.php

@@ -77,7 +77,7 @@ class Zend_Db_Adapter_Pdo_SqliteTest extends Zend_Db_Adapter_Pdo_TestCommon
             $stmt = $this->_db->query($select);
             $result2 = $stmt->fetchAll();
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->fail('Unexpected exception '.get_class($e).' received: '.$e->getMessage());
         }

tests/Zend/Db/Adapter/Pdo/TestCommon.php

@@ -57,7 +57,7 @@ abstract class Zend_Db_Adapter_Pdo_TestCommon extends Zend_Db_Adapter_TestCommon
             $this->_db->exec('Bogus query');
             $this->fail('Expected exception not thrown');
         } catch (Zend_Db_Adapter_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting object of type Zend_Db_Adapter_Exception, got ' . get_class($e));
         }
     }
@@ -73,7 +73,7 @@ abstract class Zend_Db_Adapter_Pdo_TestCommon extends Zend_Db_Adapter_TestCommon
             $this->_db->exec('DELETE FROM BogusTable');
             $this->fail('Expected exception not thrown');
         } catch (Zend_Db_Adapter_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting object of type Zend_Db_Adapter_Exception, got ' . get_class($e));
         }
     }

tests/Zend/Db/Adapter/SqlsrvTest.php

@@ -98,7 +98,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
         $this->assertEquals(1, $rowsAffected);
 
         $lastInsertId = $this->_db->lastInsertId();
-        $this->assertType('string', $lastInsertId);
+        $this->assertTrue(is_string($lastInsertId));
         $this->assertEquals('5', (string) $lastInsertId,
             'Expected new id to be 5');
 

tests/Zend/Db/Adapter/StaticTest.php

@@ -53,7 +53,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
     public function testDbConstructor()
     {
         $db = new Zend_Db_Adapter_Static( array('dbname' => 'dummy') );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract);
         $this->assertEquals('dummy', $db->config['dbname']);
     }
 
@@ -82,16 +82,16 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
         );
         $config1 = new Zend_Config($configData1);
         $db = new Zend_Db_Adapter_Static($config1->params);
-        $this->assertType('Zend_Db_Adapter_Abstract', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract);
         $this->assertEquals('dummy', $db->config['dbname']);
     }
 
     public function testDbFactory()
     {
         $db = Zend_Db::factory('Static', array('dbname' => 'dummy') );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract);
         $this->assertTrue(class_exists('Zend_Db_Adapter_Static'));
-        $this->assertType('Zend_Db_Adapter_Static', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Static);
         $this->assertEquals('dummy', $db->config['dbname']);
     }
 
@@ -112,11 +112,11 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
 
         set_include_path($ip);
 
-        $this->assertType('Zend_Db_Adapter_Abstract', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract);
         $this->assertTrue(class_exists('Zend_Db_Adapter_Static'));
-        $this->assertType('Zend_Db_Adapter_Static', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Static);
         $this->assertTrue(class_exists('TestNamespace_Static'));
-        $this->assertType('TestNamespace_Static', $db);
+        $this->assertTrue($db instanceof TestNamespace_Static);
     }
 
     public function testDbFactoryAlternateNamespaceExceptionInvalidAdapter()
@@ -132,7 +132,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
             $this->fail('Expected to catch Zend_Db_Exception');
         } catch (Zend_Exception $e) {
             set_include_path($ip);
-            $this->assertType('Zend_Db_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Exception,
                 'Expected exception of type Zend_Db_Exception, got '.get_class($e));
             $this->assertEquals("Adapter class 'Zend_Version' does not extend Zend_Db_Adapter_Abstract", $e->getMessage());
         }
@@ -144,7 +144,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
             $db = Zend_Db::factory(null);
             $this->fail('Expected to catch Zend_Db_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Exception,
                 'Expected exception of type Zend_Db_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Adapter name must be specified in a string');
         }
@@ -186,7 +186,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
             $db = Zend_Db::factory('Static', array());
             $this->fail('Expected to catch Zend_Db_Adapter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expected exception of type Zend_Db_Adapter_Exception, got '.get_class($e));
             $this->assertEquals("Configuration must have a key for 'dbname' that names the database instance", $e->getMessage());
         }
@@ -202,7 +202,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
         );
         $config1 = new Zend_Config($configData1);
         $db = Zend_Db::factory($config1);
-        $this->assertType('Zend_Db_Adapter_Static', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Static);
         $this->assertEquals('dummy', $db->config['dbname']);
     }
 
@@ -218,7 +218,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
             $db = Zend_Db::factory($config1);
             $this->fail('Expected to catch Zend_Db_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Exception,
                 'Expected exception of type Zend_Db_Exception, got '.get_class($e));
             $this->assertEquals($e->getMessage(), 'Adapter name must be specified in a string');
         }
@@ -237,7 +237,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
         );
         $config1 = new Zend_Config($configData1);
         $db = Zend_Db::factory($config1, $configData2);
-        $this->assertType('Zend_Db_Adapter_Static', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Static);
         // second arg should be ignored
         $this->assertEquals('dummy', $db->config['dbname']);
     }
@@ -256,7 +256,7 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
         $config1 = new Zend_Config($configData1);
         $config2 = new Zend_Config($configData2);
         $db = Zend_Db::factory($config1, $config2);
-        $this->assertType('Zend_Db_Adapter_Static', $db);
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Static);
         // second arg should be ignored
         $this->assertEquals('dummy', $db->config['dbname']);
     }
@@ -265,14 +265,14 @@ class Zend_Db_Adapter_StaticTest extends PHPUnit_Framework_TestCase
     {
         $db = Zend_Db::factory('Static', array('dbname' => 'dummy'));
         $conn = $db->getConnection();
-        $this->assertType('Zend_Db_Adapter_Static', $conn);
+        $this->assertTrue($conn instanceof Zend_Db_Adapter_Static);
     }
 
     public function testDbGetFetchMode()
     {
         $db = Zend_Db::factory('Static', array('dbname' => 'dummy'));
         $mode = $db->getFetchMode();
-        $this->assertType('integer', $mode);
+        $this->assertTrue(is_int($mode));
     }
 
     /**

tests/Zend/Db/Adapter/TestCommon.php

@@ -117,7 +117,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $result = $stmt->fetchAll();
             $this->fail('Expected exception not thrown');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
     }
@@ -211,7 +211,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $db->getConnection(); // force a connection
             $this->fail("Expected to catch $exceptionClass");
         } catch (Zend_Exception $e) {
-            $this->assertType($exceptionClass, $e, "Expected to catch $exceptionClass, got ".get_class($e));
+            $this->assertTrue($e instanceof $exceptionClass, "Expected to catch $exceptionClass, got ".get_class($e));
             $this->assertContains("Configuration array must have a key for '$param'", $e->getMessage());
         }
     }
@@ -459,14 +459,14 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         // Test associative array
         $result = $this->_db->fetchAll("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id ASC", 1, Zend_Db::FETCH_ASSOC);
         $this->assertEquals(2, count($result));
-        $this->assertType('array', $result[0]);
+        $this->assertTrue(is_array($result[0]));
         $this->assertEquals(2, count($result[0])); // count columns
         $this->assertEquals(2, $result[0][$col_name]);
 
         // Test numeric and associative array
         $result = $this->_db->fetchAll("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id ASC", 1, Zend_Db::FETCH_BOTH);
         $this->assertEquals(2, count($result));
-        $this->assertType('array', $result[0]);
+        $this->assertTrue(is_array($result[0]));
         $this->assertEquals(4, count($result[0])); // count columns
         $this->assertEquals(2, $result[0][$col_name]);
         $this->assertEquals(2, $result[0][0]);
@@ -474,7 +474,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         // Ensure original fetch mode has been retained
         $result = $this->_db->fetchAll("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id", 1);
         $this->assertEquals(2, count($result));
-        $this->assertType('object', $result[0]);
+        $this->assertTrue(is_object($result[0]));
         $this->assertEquals(2, $result[0]->$col_name);
     }
 
@@ -503,7 +503,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
 
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $result = $this->_db->fetchAssoc("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id DESC", 1);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(array('product_id', 'product_name'), array_keys(current($result)));
     }
 
@@ -516,7 +516,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         $product_id = $this->_db->quoteIdentifier('product_id');
 
         $result = $this->_db->fetchCol("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id ASC", 1);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(2, count($result)); // count rows
         $this->assertEquals(2, $result[0]);
         $this->assertEquals(3, $result[1]);
@@ -533,7 +533,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
 
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $result = $this->_db->fetchCol("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id ASC", 1);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(2, count($result)); // count rows
         $this->assertEquals(2, $result[0]);
         $this->assertEquals(3, $result[1]);
@@ -566,7 +566,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $prod = 'Linux';
         $result = $this->_db->fetchOne("SELECT $product_name FROM $products WHERE $product_id > ? ORDER BY $product_id", 1);
-        $this->assertType('string', $result);
+        $this->assertTrue(is_string($result));
         $this->assertEquals($prod, $result);
     }
 
@@ -597,7 +597,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         $this->_db->setFetchMode(Zend_Db::FETCH_OBJ);
         $prod = 'Linux';
         $result = $this->_db->fetchPairs("SELECT $product_id, $product_name FROM $products WHERE $product_id > ? ORDER BY $product_id ASC", 1);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(2, count($result)); // count rows
         $this->assertEquals($prod, $result[2]);
     }
@@ -629,20 +629,20 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
 
         // Test associative array
         $result = $this->_db->fetchRow("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id", 1, Zend_Db::FETCH_ASSOC);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(2, count($result)); // count columns
         $this->assertEquals(2, $result['product_id']);
 
         // Test numeric and associative array
         $result = $this->_db->fetchRow("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id", 1, Zend_Db::FETCH_BOTH);
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(4, count($result)); // count columns
         $this->assertEquals(2, $result['product_id']);
         $this->assertEquals(2, $result[0]);
 
         // Ensure original fetch mode has been retained
         $result = $this->_db->fetchRow("SELECT * FROM $products WHERE $product_id > ? ORDER BY $product_id", 1);
-        $this->assertType('object', $result);
+        $this->assertTrue(is_object($result));
         $this->assertEquals(2, $result->$col_name);
     }
 
@@ -664,7 +664,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         $rowsAffected = $this->_db->insert('zfbugs', $row);
         $this->assertEquals(1, $rowsAffected);
         $lastInsertId = $this->_db->lastInsertId();
-        $this->assertType('string', $lastInsertId);
+        $this->assertTrue(is_string($lastInsertId));
         $this->assertEquals('5', (string) $lastInsertId,
             'Expected new id to be 5');
     }
@@ -679,8 +679,8 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         $this->assertEquals(1, $rowsAffected);
         $lastInsertId = $this->_db->lastInsertId('zfproducts');
         $lastSequenceId = $this->_db->lastSequenceId('zfproducts_seq');
-        $this->assertType('string', $lastInsertId);
-        $this->assertType('string', $lastSequenceId);
+        $this->assertTrue(is_string($lastInsertId));
+        $this->assertTrue(is_string($lastSequenceId));
         $this->assertEquals('4', (string) $lastInsertId, 'Expected new id to be 4');
     }
 
@@ -766,7 +766,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $sql = $this->_db->limit('SELECT * FROM zfproducts', 0);
             $this->fail('Expected to catch Zend_Db_Adapter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting object of type Zend_Db_Adapter_Exception, got '.get_class($e));
         }
 
@@ -774,7 +774,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $sql = $this->_db->limit('SELECT * FROM zfproducts', 1, -1);
             $this->fail('Expected to catch Zend_Db_Adapter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting object of type Zend_Db_Adapter_Exception, got '.get_class($e));
         }
     }
@@ -886,7 +886,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $lower = $this->_testAdapterOptionCaseFoldingCommon(-999);
             $this->fail('Expected exception not thrown');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting object of type Zend_Db_Adapter_Exception, got '.get_class($e));
             $this->assertEquals("Case must be one of the following constants: Zend_Db::CASE_NATURAL, Zend_Db::CASE_LOWER, Zend_Db::CASE_UPPER", $e->getMessage());
         }
@@ -923,7 +923,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $this->_db->query('Bogus query');
             $this->fail('Expected exception not thrown');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
     }
@@ -939,7 +939,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $this->_db->query('SELECT * FROM BogusTable');
             $this->fail('Expected exception not thrown');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
     }
@@ -957,7 +957,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         $this->assertTrue(is_object($stmt),
             'Expected query() to return object; got ' . gettype($stmt));
 
-        $this->assertType('Zend_Db_Statement_Interface', $stmt,
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface,
             'Expected query() to return Zend_Db_Statement or PDOStatement; got ' . get_class($stmt));
 
         $this->assertEquals(0, $count = count($stmt->fetchAll()),
@@ -1234,27 +1234,27 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
     public function testAdapterQuoteIntoType()
     {
         $value = $this->_db->quoteInto('foo = ?', 1234, Zend_Db::INT_TYPE);
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals('foo = 1234', $value,
             'Incorrect quoteInto() result for INT_TYPE');
 
         $value = $this->_db->quoteInto('foo = ?', 1234, Zend_Db::BIGINT_TYPE);
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals('foo = 1234', $value,
             'Incorrect quoteInto() result for BIGINT_TYPE');
 
         $value = $this->_db->quoteInto('foo = ?', 12.34, Zend_Db::FLOAT_TYPE);
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals('foo = 12.340000', $value,
             'Incorrect quoteInto() result for FLOAT_TYPE');
 
         $value = $this->_db->quoteInto('foo = ?', 1234, 'CHAR');
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals("foo = 1234", $value,
             'Incorrect quoteInto() result for CHAR');
 
         $value = $this->_db->quoteInto('foo = ?', '1234', 'CHAR');
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals("foo = '1234'", $value,
             'Incorrect quoteInto() result for CHAR');
     }
@@ -1262,7 +1262,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
     public function testAdapterQuoteIntoCount()
     {
         $value = $this->_db->quoteInto('foo = ? and bar = ?', 1234, null, 1);
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals('foo = 1234 and bar = ?', $value,
             'Incorrect quoteInto() result for count');
     }
@@ -1276,43 +1276,43 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
 
             // test int value
             $value = $this->_db->quote(1234, $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234', $value,
                 "Incorrect quote() INT_TYPE result for int");
 
             // test int string
             $value = $this->_db->quote('1234', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234', $value,
                 "Incorrect quote() INT_TYPE result for int string");
 
             // test int string with + sign
             $value = $this->_db->quote('+1234', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234', $value,
                 "Incorrect quote() INT_TYPE result for int string with + sign");
 
             // test int string with - sign
             $value = $this->_db->quote('-1234', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('-1234', $value,
                 "Incorrect quote() INT_TYPE result for int string with - sign");
 
             // test int string with non-digit text
             $value = $this->_db->quote('1234abcd', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234', $value,
                 "Incorrect quote() INT_TYPE result for int string with non-digit text");
 
             // test non-digit test; it should return 0
             $value = $this->_db->quote('abcd', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('0', $value,
                 "Incorrect quote() INT_TYPE result for non-digit string");
 
             // test Zend_Db_Expr is passed through literally
             $value = $this->_db->quote(new Zend_Db_Expr('1+2+3'), $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals("1+2+3", $value,
                 "Incorrect quote() INT_TYPE result for Zend_Db_Expr");
         }
@@ -1327,78 +1327,78 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
 
             // test int value
             $value = $this->_db->quote(1234, $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals(1234, $value,
                 "Incorrect quote() BIGINT_TYPE result for int");
 
             // test int string
             $value = $this->_db->quote('1234', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234', $value,
                 "Incorrect quote() BIGINT_TYPE result for int string");
 
             // test int string with + sign
             $value = $this->_db->quote('+1234', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('+1234', $value,
                 "Incorrect quote() BIGINT_TYPE result for int string");
 
             // test int string with - sign
             $value = $this->_db->quote('-1234', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('-1234', $value,
                 "Incorrect quote() BIGINT_TYPE result for int string");
 
             // test int string with positive exponent
             $value = $this->_db->quote('1234e15', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234e15', $value,
                 "Incorrect quote() BIGINT_TYPE result for int string");
 
             $value = $this->_db->quote('1234e+15', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234e+15', $value,
                 "Incorrect quote() BIGINT_TYPE result for int string");
 
             // test int value with negative exponent
             $value = $this->_db->quote('1234e-15', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('1234e-15', $value,
                 "Incorrect quote() BIGINT_TYPE result for int string");
 
             // test bigint value
             $value = $this->_db->quote('2200000000', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('2200000000', $value,
                 "Incorrect quote() BIGINT_TYPE result for big int string");
 
             // test octal value with leading zeroes
             $value = $this->_db->quote('020310253000', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('020310253000', $value,
                 "Incorrect quote() BIGINT_TYPE result for big octal int string with leading zeroes");
 
             // test decimal value with leading zeroes
             $value = $this->_db->quote('09091', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('09091', $value,
                 "Incorrect quote() BIGINT_TYPE result for decimal int string with leading zeroes");
 
             // test hex value with ODBC-style notation
             $value = $this->_db->quote('0x83215600', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('0x83215600', $value,
                 "Incorrect quote() BIGINT_TYPE result for big hex int string");
 
             // test non-numeric value; it should be zero
             $value = $this->_db->quote('abcd', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('0', $value,
                 "Incorrect quote() BIGINT_TYPE result for non-digt string");
 
             // test Zend_Db_Expr is passed through literally
             $value = $this->_db->quote(new Zend_Db_Expr('1+2+3'), $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals("1+2+3", $value,
                 "Incorrect quote() BIGINT_TYPE result for Zend_Db_Expr");
         }
@@ -1412,37 +1412,37 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             }
 
             $value = $this->_db->quote(12.34, $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('12.34', $value,
                 "Incorrect quote() FLOAT_TYPE result");
 
             $value = $this->_db->quote('12.34', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('12.34', $value,
                 "Incorrect quote() FLOAT_TYPE result");
 
             $value = $this->_db->quote('+12.34', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('12.34', $value,
                 "Incorrect quote() FLOAT_TYPE result");
 
             $value = $this->_db->quote('-12.34', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('-12.34', $value,
                 "Incorrect quote() FLOAT_TYPE result");
 
             $value = $this->_db->quote('12.34abcd', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('12.34', $value,
                 "Incorrect quote() FLOAT_TYPE result");
 
             $value = $this->_db->quote('abcd', $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals('0', $value,
                 "Incorrect quote() FLOAT_TYPE result");
 
             $value = $this->_db->quote(new Zend_Db_Expr('1+2+3'), $typeName);
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
             $this->assertEquals("1+2+3", $value,
                 "Incorrect quote() FLOAT_TYPE result");
         }
@@ -1451,28 +1451,28 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
     public function testAdapterQuoteTypeNonNumeric()
     {
         $value = $this->_db->quote(1234, 'CHAR');
-        $this->assertType('integer', $value);
+        $this->assertTrue(is_int($value));
         $this->assertEquals(1234, $value,
             "Incorrect quote() CHAR type result");
 
         $value = $this->_db->quote('1234', 'CHAR');
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals("'1234'", $value,
             "Incorrect quote() CHAR type result");
 
         $value = $this->_db->quote('1234abcd', 'CHAR');
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals("'1234abcd'", $value,
             "Incorrect quote() CHAR type result");
 
         $value = $this->_db->quote('1234abcd56', 'CHAR');
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals("'1234abcd56'", $value,
             "Incorrect quote() CHAR type result");
 
         // test Zend_Db_Expr is passed through literally
         $value = $this->_db->quote(new Zend_Db_Expr('1+2+3'), 'CHAR');
-        $this->assertType('string', $value);
+        $this->assertTrue(is_string($value));
         $this->assertEquals("1+2+3", $value,
             "Incorrect quote() CHAR type result for Zend_Db_Expr");
     }
@@ -1515,7 +1515,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $this->_db->setFetchMode(-999);
             $this->fail('Expected exception not thrown');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting object of type Zend_Db_Adapter_Exception, got '.get_class($e));
             $this->assertEquals("Invalid fetch mode '-999' specified", $e->getMessage());
         }
@@ -1845,7 +1845,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
 
         $stmt = $db->prepare("SELECT COUNT(*) FROM $bugs");
 
-        $this->assertType($stmtClass, $stmt,
+        $this->assertTrue($stmt instanceof $stmtClass,
             'Expecting object of type ' . $stmtClass . ', got ' . get_class($stmt));
     }
 
@@ -1861,7 +1861,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
             $this->_db->setProfiler($profilerOptions);
             $this->fail('Expected to catch Zend_Db_Profiler_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Profiler_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Profiler_Exception);
             $this->assertEquals('Class stdClass does not extend Zend_Db_Profiler', $e->getMessage());
         }
     }
@@ -1970,7 +1970,7 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
     public function testAdapterSerializationIsOkByDefault()
     {
         $serialized = serialize($this->_db);
-        $this->assertType('string', $serialized);
+        $this->assertTrue(is_string($serialized));
         $this->assertThat(unserialize($serialized), new PHPUnit_Framework_Constraint_IsInstanceOf('Zend_Db_Adapter_Abstract'));
     }
 
@@ -2109,6 +2109,6 @@ abstract class Zend_Db_Adapter_TestCommon extends Zend_Db_TestSetup
         $db = Zend_Db::factory($this->getDriver(), $params);
         $select = $db->select()->from('zfproducts');
         $row = $db->fetchRow($select);
-        $this->assertType('stdClass', $row);
+        $this->assertTrue($row instanceof stdClass);
     }
 }

tests/Zend/Db/Profiler/OracleTest.php

@@ -52,41 +52,41 @@ class Zend_Db_Profiler_OracleTest extends Zend_Db_Profiler_TestCommon
         // execute query a first time
         $stmt->execute(array(':bug_id' => 2));
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(2, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles(null, true);
-        $this->assertType('array', $profiles, 'Expected array, got '.gettype($profiles));
+        $this->assertTrue(is_array($profiles), 'Expected array, got '.gettype($profiles));
         $this->assertEquals(1, count($profiles), 'Expected to find 1 profile');
         $qp = $profiles[0];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // analyze query in the profile
         $sql = $qp->getQuery();
         $this->assertContains(" = :bug_id", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(':bug_id' => 2), $params);
 
         // execute query a second time
         $stmt->execute(array(':bug_id' => 3));
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(3, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles(null, true);
-        $this->assertType('array', $profiles, 'Expected array, got '.gettype($profiles));
+        $this->assertTrue(is_array($profiles), 'Expected array, got '.gettype($profiles));
         $this->assertEquals(2, count($profiles), 'Expected to find 2 profiles');
         $qp = $profiles[1];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // analyze query in the profile
         $sql = $qp->getQuery();
         $this->assertContains(" = :bug_id", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(':bug_id' => 3), $params);
     }
 
@@ -106,42 +106,42 @@ class Zend_Db_Profiler_OracleTest extends Zend_Db_Profiler_TestCommon
         $id = 2;
         $stmt->execute();
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(2, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles(null, true);
-        $this->assertType('array', $profiles);
+        $this->assertTrue(is_array($profiles));
         $this->assertEquals(1, count($profiles), 'Expected to find 1 profile');
         $qp = $profiles[0];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // analyze query in the profile
         $sql = $qp->getQuery();
         $this->assertContains(" = :bug_id", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(':bug_id' => 2), $params);
 
         // execute query a first time
         $id = 3;
         $stmt->execute();
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(3, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles(null, true);
-        $this->assertType('array', $profiles);
+        $this->assertTrue(is_array($profiles));
         $this->assertEquals(2, count($profiles), 'Expected to find 2 profiles');
         $qp = $profiles[1];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // analyze query in the profile
         $sql = $qp->getQuery();
         $this->assertContains(" = :bug_id", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(':bug_id' => 3), $params);
     }
 
@@ -168,7 +168,7 @@ class Zend_Db_Profiler_OracleTest extends Zend_Db_Profiler_TestCommon
         $this->_db->query("UPDATE $bugs SET $bug_status = :status", array(':status'=>'FIXED'));
 
         $qps = $prof->getQueryProfiles();
-        $this->assertType('array', $qps, 'Expecting some query profiles, got none');
+        $this->assertTrue(is_array($qps), 'Expecting some query profiles, got none');
         foreach ($qps as $qp) {
             $qtype = $qp->getQueryType();
             $this->assertEquals($queryType, $qtype,

tests/Zend/Db/Profiler/Pdo/OciTest.php

@@ -65,7 +65,7 @@ class Zend_Db_Profiler_Pdo_OciTest extends Zend_Db_Profiler_TestCommon
         $this->_db->query("UPDATE $bugs SET $bug_status = :status", array(':status'=>'FIXED'));
 
         $qps = $prof->getQueryProfiles();
-        $this->assertType('array', $qps, 'Expecting some query profiles, got none');
+        $this->assertTrue(is_array($qps), 'Expecting some query profiles, got none');
         foreach ($qps as $qp) {
             $qtype = $qp->getQueryType();
             $this->assertEquals($queryType, $qtype,

tests/Zend/Db/Profiler/StaticTest.php

@@ -50,10 +50,10 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 'profiler' => false
             )
         );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got '.get_class($db));
         $prof = $db->getProfiler();
-        $this->assertType('Zend_Db_Profiler', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler,
             'Expected object of type Zend_Db_Profiler, got '.get_class($prof));
         $this->assertFalse($prof->getEnabled());
     }
@@ -69,10 +69,10 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 'profiler' => true
             )
         );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got '.get_class($db));
         $prof = $db->getProfiler();
-        $this->assertType('Zend_Db_Profiler', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler,
             'Expected object of type Zend_Db_Profiler, got '.get_class($prof));
         $this->assertTrue($prof->getEnabled());
     }
@@ -98,10 +98,10 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                     'profiler' => $profilerString
                     )
                 );
-            $this->assertType('Zend_Db_Adapter_Abstract', $db,
+            $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
                 'Expected object of type Zend_Db_Adapter_Abstract, got ' . get_class($db));
             $prof = $db->getProfiler();
-            $this->assertType('Zend_Db_Profiler', $prof,
+            $this->assertTrue($prof instanceof Zend_Db_Profiler,
                 'Expected object of type Zend_Db_Profiler, got ' . get_class($prof));
             $this->assertTrue($prof->getEnabled());
         }
@@ -120,12 +120,12 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 'profiler' => $profiler
             )
         );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got ' . get_class($db));
         $prof = $db->getProfiler();
-        $this->assertType('Zend_Db_Profiler', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler,
             'Expected object of type Zend_Db_Profiler, got ' . get_class($prof));
-        $this->assertType('Zend_Db_Profiler_ProfilerCustom', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler_ProfilerCustom,
             'Expected object of type Zend_Db_Profiler_ProfilerCustom, got ' . get_class($prof));
         $this->assertFalse($prof->getEnabled());
     }
@@ -143,10 +143,10 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 )
             )
         );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got '.get_class($db));
         $prof = $db->getProfiler();
-        $this->assertType('Zend_Db_Profiler', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler,
             'Expected object of type Zend_Db_Profiler, got '.get_class($prof));
         $this->assertTrue($prof->getEnabled());
     }
@@ -164,12 +164,12 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 )
             )
         );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got '.get_class($db));
         $prof = $db->getProfiler();
-        $this->assertType('Zend_Db_Profiler', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler,
             'Expected object of type Zend_Db_Profiler, got '.get_class($prof));
-        $this->assertType('Zend_Db_Profiler_ProfilerCustom', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler_ProfilerCustom,
             'Expected object of type Zend_Db_Profiler_ProfilerCustom, got '.get_class($prof));
         $this->assertFalse($prof->getEnabled());
     }
@@ -189,12 +189,12 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 )
             )
         );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got '.get_class($db));
         $prof = $db->getProfiler();
-        $this->assertType('Zend_Db_Profiler', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler,
             'Expected object of type Zend_Db_Profiler, got '.get_class($prof));
-        $this->assertType('Zend_Db_Profiler_ProfilerCustom', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler_ProfilerCustom,
             'Expected object of type Zend_Db_Profiler_ProfilerCustom, got '.get_class($prof));
         $this->assertFalse($prof->getEnabled());
     }
@@ -214,12 +214,12 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 'profiler' => $config
             )
         );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got '.get_class($db));
         $prof = $db->getProfiler();
-        $this->assertType('Zend_Db_Profiler', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler,
             'Expected object of type Zend_Db_Profiler, got '.get_class($prof));
-        $this->assertType('Zend_Db_Profiler_ProfilerCustom', $prof,
+        $this->assertTrue($prof instanceof Zend_Db_Profiler_ProfilerCustom,
             'Expected object of type Zend_Db_Profiler_ProfilerCustom, got '.get_class($prof));
         $this->assertFalse($prof->getEnabled());
     }
@@ -240,7 +240,7 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 'profiler' => $profiler
                 )
             );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got ' . get_class($db));
         $profiler2 = $db->getProfiler();
         $this->assertSame($profiler, $profiler2);
@@ -287,7 +287,7 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                 'profiler' => $config
                 )
             );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got ' . get_class($db));
         $profiler2 = $db->getProfiler();
         $this->assertSame($profiler, $profiler2);
@@ -312,7 +312,7 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
                     )
                 )
             );
-        $this->assertType('Zend_Db_Adapter_Abstract', $db,
+        $this->assertTrue($db instanceof Zend_Db_Adapter_Abstract,
             'Expected object of type Zend_Db_Adapter_Abstract, got ' . get_class($db));
         $profiler2 = $db->getProfiler();
         $this->assertSame($profiler, $profiler2);
@@ -624,8 +624,9 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
 
         $queryId = $prof->queryStart('sql');
 
-        $this->assertType('Zend_Db_Profiler_Query',
-            $prof->getQueryProfile($queryId));
+        $this->assertTrue(
+            $prof->getQueryProfile($queryId) instanceof Zend_Db_Profiler_Query
+        );
     }
 
     /**
@@ -796,8 +797,8 @@ class Zend_Db_Profiler_StaticTest extends Zend_Db_TestSetup
 
         $prof->queryStart('sql 2');
 
-        $this->assertType('Zend_Db_Profiler_Query',
-            $queryProfile = $prof->getLastQueryProfile());
+        $queryProfile = $prof->getLastQueryProfile();
+        $this->assertTrue($queryProfile instanceof Zend_Db_Profiler_Query);
 
         $this->assertEquals('sql 2', $queryProfile->getQuery());
 

tests/Zend/Db/Profiler/TestCommon.php

@@ -69,28 +69,28 @@ abstract class Zend_Db_Profiler_TestCommon extends Zend_Db_TestSetup
         // execute query a first time
         $stmt->execute();
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(2, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles();
-        $this->assertType('array', $profiles);
+        $this->assertTrue(is_array($profiles));
         $this->assertEquals(1, count($profiles), 'Expected to find 1 profile');
         $qp = $profiles[0];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // execute query a second time
         $stmt->execute();
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(2, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles();
-        $this->assertType('array', $profiles);
+        $this->assertTrue(is_array($profiles));
         $this->assertEquals(2, count($profiles), 'Expected to find 2 profiles');
         $qp = $profiles[1];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         $this->assertNotSame($profiles[0], $profiles[1]);
         $this->assertEquals($profiles[0]->getQuery(), $profiles[1]->getQuery());
@@ -110,35 +110,35 @@ abstract class Zend_Db_Profiler_TestCommon extends Zend_Db_TestSetup
         // execute query a first time
         $stmt->execute(array(2, 'VERIFIED'));
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(2, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles();
-        $this->assertType('array', $profiles);
+        $this->assertTrue(is_array($profiles));
         $this->assertEquals(1, count($profiles), 'Expected to find 1 profile');
         $qp = $profiles[0];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // analyze query in the profile
         $sql = $qp->getQuery();
         $this->assertContains(" = ?", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(1 => 2, 2 => 'VERIFIED'), $params);
 
         // execute query a second time
         $stmt->execute(array(3, 'FIXED'));
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(3, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles();
-        $this->assertType('array', $profiles);
+        $this->assertTrue(is_array($profiles));
         $this->assertEquals(2, count($profiles), 'Expected to find 2 profiles');
         $qp = $profiles[1];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
         $this->assertNotSame($profiles[0], $profiles[1]);
         $this->assertEquals($profiles[0]->getQuery(), $profiles[1]->getQuery());
 
@@ -146,7 +146,7 @@ abstract class Zend_Db_Profiler_TestCommon extends Zend_Db_TestSetup
         $sql = $qp->getQuery();
         $this->assertContains(" = ?", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(1 => 3, 2 => 'FIXED'), $params);
 
         $this->assertNotSame($profiles[0], $profiles[1]);
@@ -173,21 +173,21 @@ abstract class Zend_Db_Profiler_TestCommon extends Zend_Db_TestSetup
         $status = 'VERIFIED';
         $stmt->execute();
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(2, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles();
-        $this->assertType('array', $profiles, 'Expected array, got '.gettype($profiles));
+        $this->assertTrue(is_array($profiles), 'Expected array, got '.gettype($profiles));
         $this->assertEquals(1, count($profiles), 'Expected to find 1 profile');
         $qp = $profiles[0];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // analyze query in the profile
         $sql = $qp->getQuery();
         $this->assertContains(" = ?", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(1 => 2, 2 => 'VERIFIED'), $params);
 
         // execute query a second time
@@ -195,21 +195,21 @@ abstract class Zend_Db_Profiler_TestCommon extends Zend_Db_TestSetup
         $status = 'FIXED';
         $stmt->execute();
         $results = $stmt->fetchAll();
-        $this->assertType('array', $results);
+        $this->assertTrue(is_array($results));
         $this->assertEquals(3, $results[0]['bug_id']);
 
         // analyze query profiles
         $profiles = $this->_db->getProfiler()->getQueryProfiles();
-        $this->assertType('array', $profiles, 'Expected array, got '.gettype($profiles));
+        $this->assertTrue(is_array($profiles), 'Expected array, got '.gettype($profiles));
         $this->assertEquals(2, count($profiles), 'Expected to find 2 profiles');
         $qp = $profiles[1];
-        $this->assertType('Zend_Db_Profiler_Query', $qp);
+        $this->assertTrue($qp instanceof Zend_Db_Profiler_Query);
 
         // analyze query in the profile
         $sql = $qp->getQuery();
         $this->assertContains(" = ?", $sql);
         $params = $qp->getQueryParams();
-        $this->assertType('array', $params);
+        $this->assertTrue(is_array($params));
         $this->assertEquals(array(1 => 3, 2 => 'FIXED'), $params);
     }
 
@@ -235,7 +235,7 @@ abstract class Zend_Db_Profiler_TestCommon extends Zend_Db_TestSetup
         $this->_db->query("UPDATE $bugs SET $bug_status = ?", array('FIXED'));
 
         $qps = $prof->getQueryProfiles();
-        $this->assertType('array', $qps, 'Expecting some query profiles, got none');
+        $this->assertTrue(is_array($qps), 'Expecting some query profiles, got none');
         foreach ($qps as $qp) {
             $qtype = $qp->getQueryType();
             $this->assertEquals($queryType, $qtype,

tests/Zend/Db/Select/StaticTest.php

@@ -62,7 +62,7 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
         $this->assertEquals('SELECT "zfproducts".* FROM "zfproducts"', $sql);
         $stmt = $select->query();
         Zend_Loader::loadClass('Zend_Db_Statement_Static');
-        $this->assertType('Zend_Db_Statement_Static', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Static);
     }
 
     /**
@@ -78,7 +78,7 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 
         $stmt = $select->query();
         Zend_Loader::loadClass('Zend_Db_Statement_Static');
-        $this->assertType('Zend_Db_Statement_Static', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Static);
     }
 
     /**

tests/Zend/Db/Select/TestCommon.php

@@ -54,7 +54,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
     public function testSelect()
     {
         $select = $this->_select();
-        $this->assertType('Zend_Db_Select', $select,
+        $this->assertTrue($select instanceof Zend_Db_Select,
             'Expecting object of type Zend_Db_Select, got '.get_class($select));
         $stmt = $this->_db->query($select);
         $row = $stmt->fetch();
@@ -75,7 +75,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
     public function testSelectQuery()
     {
         $select = $this->_select();
-        $this->assertType('Zend_Db_Select', $select,
+        $this->assertTrue($select instanceof Zend_Db_Select,
             'Expecting object of type Zend_Db_Select, got '.get_class($select));
         $stmt = $select->query();
         $row = $stmt->fetch();
@@ -95,7 +95,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
         $select = $this->_select()->where("$product_id = :product_id")
                                   ->bind(array(':product_id' => 1));
 
-        $this->assertType('Zend_Db_Select', $select,
+        $this->assertTrue($select instanceof Zend_Db_Select,
             'Expecting object of type Zend_Db_Select, got '.get_class($select));
         $stmt = $select->query();
         $row = $stmt->fetch();
@@ -342,7 +342,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
                    ->columns('product_id');
             $this->fail('Expected exception of type "Zend_Db_Select_Exception"');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Select_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Select_Exception,
                               'Expected exception of type "Zend_Db_Select_Exception", got ' . get_class($e));
             $this->assertEquals("No table has been specified for the FROM clause", $e->getMessage());
         }
@@ -630,7 +630,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
             $select->foo();
             $this->fail('Expected exception of type "Zend_Db_Select_Exception"');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Select_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Select_Exception,
                               'Expected exception of type "Zend_Db_Select_Exception", got ' . get_class($e));
             $this->assertEquals("Unrecognized method 'foo()'", $e->getMessage());
         }
@@ -676,7 +676,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
             $select->joinFooUsing();
             $this->fail('Expected exception of type "Zend_Db_Select_Exception"');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Select_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Select_Exception,
                               'Expected exception of type "Zend_Db_Select_Exception", got ' . get_class($e));
             $this->assertEquals("Unrecognized method 'joinFooUsing()'", $e->getMessage());
         }
@@ -702,7 +702,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
             $select->joinCrossUsing("zfbugs_products", "$product_id");
             $this->fail('Expected exception of type "Zend_Db_Select_Exception"');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Select_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Select_Exception,
                               'Expected exception of type "Zend_Db_Select_Exception", got ' . get_class($e));
             $this->assertEquals("Cannot perform a joinUsing with method 'joinCrossUsing()'", $e->getMessage());
         }
@@ -1695,7 +1695,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
         /* checks if the adapter has effectively gotten serialized,
            no exceptions are thrown here, so it's all right */
         $serialize = serialize($this->_select());
-        $this->assertType('string',$serialize);
+        $this->assertTrue(is_string($serialize));
     }
     
     /**

tests/Zend/Db/Statement/Db2Test.php

@@ -62,7 +62,7 @@ class Zend_Db_Statement_Db2Test extends Zend_Db_Statement_TestCommon
         $n = $stmt->columnCount();
         $stmt->closeCursor();
 
-        $this->assertType('integer', $n);
+        $this->assertTrue(is_int($n));
         $this->assertEquals(2, $n);
     }
 
@@ -88,7 +88,7 @@ class Zend_Db_Statement_Db2Test extends Zend_Db_Statement_TestCommon
             $this->assertTrue($stmt->bindParam('name', $productNameValue), 'Expected bindParam(\'name\') to return true');
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertEquals("Invalid bind-variable name ':id'", $e->getMessage());
         }
@@ -116,7 +116,7 @@ class Zend_Db_Statement_Db2Test extends Zend_Db_Statement_TestCommon
             $this->assertTrue($stmt->bindParam('name', $productNameValue), 'Expected bindParam(\'name\') to return true');
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertEquals("Invalid bind-variable name ':id'", $e->getMessage());
         }

tests/Zend/Db/Statement/MysqliTest.php

@@ -158,7 +158,7 @@ INPUT;
         $stmt = $this->_db->prepare("DELETE FROM $products WHERE $product_id = 1");
 
         $n = $stmt->rowCount();
-        $this->assertType('integer', $n);
+        $this->assertTrue(is_int($n));
         $this->assertEquals(-1, $n, 'Expecting row count to be -1 before executing query');
 
         $stmt->execute();
@@ -166,7 +166,7 @@ INPUT;
         $n = $stmt->rowCount();
         $stmt->closeCursor();
 
-        $this->assertType('integer', $n);
+        $this->assertTrue(is_int($n));
         $this->assertEquals(1, $n, 'Expected row count to be one after executing query');
     }
 
@@ -187,7 +187,7 @@ INPUT;
             $this->assertTrue($stmt->bindParam('name', $productNameValue), 'Expected bindParam(\'name\') to return true');
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertEquals("Invalid bind-variable name ':id'", $e->getMessage());
         }
@@ -210,7 +210,7 @@ INPUT;
             $this->assertTrue($stmt->bindParam('name', $productNameValue), 'Expected bindParam(\'name\') to return true');
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertEquals("Invalid bind-variable name ':id'", $e->getMessage());
         }
@@ -233,7 +233,7 @@ INPUT;
             $stmt = $this->_db->query($sql);
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('int', $e->getCode());
+            $this->assertTrue(is_int($e->getCode()));
         }
     }
 
@@ -243,7 +243,7 @@ INPUT;
     public function testStatementCanReturnDriverStatement()
     {
         $statement = parent::testStatementCanReturnDriverStatement();
-        $this->assertType('mysqli_stmt', $statement->getDriverStatement());
+        $this->assertTrue($statement->getDriverStatement() instanceof mysqli_stmt);
     }
 
     /**
@@ -293,7 +293,7 @@ INPUT;
         	$this->fail('Bounding params failed: ' . $e->getMessage());
         }
         $result = $stmt->fetch();
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals(5, count($result));
         $this->assertEquals(1, $result['object_id']);
         $this->assertEquals(1, $result['object_type']);

tests/Zend/Db/Statement/OracleTest.php

@@ -92,7 +92,7 @@ class Zend_Db_Statement_OracleTest extends Zend_Db_Statement_TestCommon
             $stmt->nextRowset();
             $this->fail('Expected to catch Zend_Db_Statement_Oracle_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Oracle_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Oracle_Exception,
                 'Expecting object of type Zend_Db_Statement_Oracle_Exception, got '.get_class($e));
             $this->assertEquals('HYC00 Optional feature not implemented', $e->getMessage());
         }

tests/Zend/Db/Statement/Pdo/IbmTest.php

@@ -76,7 +76,7 @@ class Zend_Db_Statement_Pdo_IbmTest extends Zend_Db_Statement_Pdo_TestCommon
         $n = $stmt->columnCount();
         $stmt->closeCursor();
 
-        $this->assertType('integer', $n);
+        $this->assertTrue(is_int($n));
         $this->assertEquals(2, $n);
     }
 

tests/Zend/Db/Statement/Pdo/MysqlTest.php

@@ -43,7 +43,7 @@ class Zend_Db_Statement_Pdo_MysqlTest extends Zend_Db_Statement_Pdo_TestCommon
         try {
             $stmt->nextRowset();
         } catch (Zend_Db_Statement_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertEquals('SQLSTATE[HYC00]: Optional feature not implemented', $e->getMessage());
         }
@@ -74,7 +74,7 @@ class Zend_Db_Statement_Pdo_MysqlTest extends Zend_Db_Statement_Pdo_TestCommon
     public function testStatementCanReturnDriverStatement()
     {
         $statement = parent::testStatementCanReturnDriverStatement();
-        $this->assertType('PDOStatement', $statement->getDriverStatement());
+        $this->assertTrue($statement->getDriverStatement() instanceof PDOStatement);
     }
 
     public function testStatementExceptionMessageContainsSqlQuery()

tests/Zend/Db/Statement/Pdo/SqliteTest.php

@@ -55,7 +55,7 @@ class Zend_Db_Statement_Pdo_SqliteTest extends Zend_Db_Statement_Pdo_TestCommon
     public function testStatementCanReturnDriverStatement()
     {
         $statement = parent::testStatementCanReturnDriverStatement();
-        $this->assertType('PDOStatement', $statement->getDriverStatement());
+        $this->assertTrue($statement->getDriverStatement() instanceof PDOStatement);
     }
 
     public function getDriver()

tests/Zend/Db/Statement/Pdo/TestCommon.php

@@ -41,7 +41,7 @@ abstract class Zend_Db_Statement_Pdo_TestCommon extends Zend_Db_Statement_TestCo
             ->from('zfproducts');
         $sql = $select->__toString();
         $stmt = new Zend_Db_Statement_Pdo($this->_db, $sql);
-        $this->assertType('Zend_Db_Statement_Pdo', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Pdo);
         $stmt->closeCursor();
     }
 
@@ -50,7 +50,7 @@ abstract class Zend_Db_Statement_Pdo_TestCommon extends Zend_Db_Statement_TestCo
         $select = $this->_db->select()
             ->from('zfproducts');
         $stmt = new Zend_Db_Statement_Pdo($this->_db, $select);
-        $this->assertType('Zend_Db_Statement_Interface', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface);
         $stmt->closeCursor();
     }
 
@@ -63,7 +63,7 @@ abstract class Zend_Db_Statement_Pdo_TestCommon extends Zend_Db_Statement_TestCo
             $stmt->nextRowset();
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertEquals('SQLSTATE[IM001]: Driver does not support this function: driver does not support multiple rowsets', $e->getMessage());
         }
@@ -81,7 +81,7 @@ abstract class Zend_Db_Statement_Pdo_TestCommon extends Zend_Db_Statement_TestCo
         foreach ($stmt as $test) {
             $this->assertTrue($test instanceof stdClass);
         }
-        $this->assertType('int', iterator_count($stmt));
+        $this->assertTrue(is_int(iterator_count($stmt)));
     }
 
     public function testStatementConstructExceptionBadSql()
@@ -91,10 +91,10 @@ abstract class Zend_Db_Statement_Pdo_TestCommon extends Zend_Db_Statement_TestCo
             $stmt = $this->_db->query($sql);
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertTrue($e->hasChainedException(), 'Missing Chained Exception');
-            $this->assertType('PDOException', $e->getChainedException(), 'Wrong type of Exception');
+            $this->assertTrue($e->getChainedException() instanceof PDOException, 'Wrong type of Exception');
         }
     }
 

tests/Zend/Db/Statement/SqlsrvTest.php

@@ -183,7 +183,7 @@ class Zend_Db_Statement_SqlsrvTest extends Zend_Db_Statement_TestCommon
         $errors = $stmt->errorInfo();
         $this->assertEquals(2, count($errors));
         $this->assertEquals($stmt->errorCode(), $errors[0]);
-        $this->assertType('string', $errors[1]);
+        $this->assertTrue(is_string($errors[1]));
     }
 
     public function getDriver()

tests/Zend/Db/Statement/TestCommon.php

@@ -48,7 +48,8 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             ->from('zfproducts');
         $sql = $select->__toString();
         $stmt = new $statementClass($this->_db, $sql);
-        $this->assertType('Zend_Db_Statement_Interface', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface);
         $stmt->closeCursor();
     }
 
@@ -59,7 +60,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $select = $this->_db->select()
             ->from('zfproducts');
         $stmt = new $statementClass($this->_db, $select);
-        $this->assertType('Zend_Db_Statement_Interface', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface);
         $stmt->closeCursor();
     }
 
@@ -68,7 +69,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $select = $this->_db->select()
             ->from('zfproducts');
         $stmt = $this->_db->prepare($select->__toString());
-        $this->assertType('Zend_Db_Statement_Interface', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface);
         $stmt->closeCursor();
     }
 
@@ -77,7 +78,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $select = $this->_db->select()
             ->from('zfproducts');
         $stmt = $this->_db->query($select);
-        $this->assertType('Zend_Db_Statement_Interface', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface);
         $stmt->closeCursor();
     }
 
@@ -86,7 +87,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $stmt = $this->_db->select()
             ->from('zfproducts')
             ->query();
-        $this->assertType('Zend_Db_Statement_Interface', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Interface);
         $stmt->closeCursor();
     }
 
@@ -97,7 +98,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             $stmt = $this->_db->query($sql);
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
     }
@@ -110,7 +111,8 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $stmt = $this->_db->prepare("DELETE FROM $products WHERE $product_id = 1");
 
         $n = $stmt->rowCount();
-        $this->assertType('integer', $n);
+        $this->assertTrue(is_int($n));
+        $this->assertTrue(is_int($n));
         $this->assertEquals(0, $n, 'Expecting row count to be 0 before executing query');
 
         $stmt->execute();
@@ -118,7 +120,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $n = $stmt->rowCount();
         $stmt->closeCursor();
 
-        $this->assertType('integer', $n);
+        $this->assertTrue(is_int($n));
         $this->assertEquals(1, $n, 'Expected row count to be one after executing query');
     }
 
@@ -137,7 +139,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $n = $stmt->columnCount();
         $stmt->closeCursor();
 
-        $this->assertType('integer', $n);
+        $this->assertTrue(is_int($n));
         $this->assertEquals(2, $n);
     }
 
@@ -190,7 +192,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             }
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
         $code = $stmt->errorCode();
@@ -212,7 +214,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             }
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
         $code = $stmt->errorCode();
@@ -306,7 +308,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetchAll();
 
         $this->assertEquals(2, count($result));
-        $this->assertType('stdClass', $result[0]);
+        $this->assertTrue($result[0] instanceof stdClass);
 
         // check for FETCH_OBJ entries
         $this->assertEquals(2, $result[0]->product_id);
@@ -324,7 +326,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             $stmt->setFetchMode(-999);
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertRegExp('#invalid fetch mode#i', $e->getMessage());
         }
@@ -398,7 +400,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetchAll(Zend_Db::FETCH_OBJ);
 
         $this->assertEquals(2, count($result));
-        $this->assertType('stdClass', $result[0]);
+        $this->assertTrue($result[0] instanceof stdClass);
         $this->assertEquals(2, $result[0]->product_id);
     }
 
@@ -424,7 +426,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetchAll(Zend_Db::FETCH_COLUMN, 1);
 
         $this->assertEquals(2, count($result));
-        $this->assertType('string', $result[0]);
+        $this->assertTrue(is_string($result[0]));
         $this->assertEquals('Linux', $result[0]);
         $this->assertEquals('OS X', $result[1]);
     }
@@ -439,7 +441,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             $result = $stmt->fetchAll(-99);
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
         $stmt->closeCursor();
@@ -498,7 +500,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetchObject();
         $stmt->closeCursor();
 
-        $this->assertType('stdClass', $result,
+        $this->assertTrue($result instanceof stdClass,
             'Expecting object of type stdClass, got '.get_class($result));
         $this->assertEquals('Linux', $result->product_name);
     }
@@ -525,7 +527,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetch(Zend_Db::FETCH_NUM);
         $stmt->closeCursor();
 
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals('Linux', $result[1]);
         $this->assertFalse(isset($result['product_name']));
     }
@@ -539,7 +541,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetch(Zend_Db::FETCH_ASSOC);
         $stmt->closeCursor();
 
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals('Linux', $result['product_name']);
         $this->assertFalse(isset($result[1]));
     }
@@ -553,7 +555,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetch(Zend_Db::FETCH_BOTH);
         $stmt->closeCursor();
 
-        $this->assertType('array', $result);
+        $this->assertTrue(is_array($result));
         $this->assertEquals('Linux', $result[1]);
         $this->assertEquals('Linux', $result['product_name']);
     }
@@ -567,7 +569,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $result = $stmt->fetch(Zend_Db::FETCH_OBJ);
         $stmt->closeCursor();
 
-        $this->assertType('stdClass', $result,
+        $this->assertTrue($result instanceof stdClass,
             'Expecting object of type stdClass, got '.get_class($result));
         $this->assertEquals('Linux', $result->product_name);
     }
@@ -582,7 +584,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             $result = $stmt->fetch(-99);
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
         }
         $stmt->closeCursor();
@@ -803,7 +805,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
         $stmt->execute();
         for ($i = 0; $i < $stmt->columnCount(); ++$i) {
             $meta = $stmt->getColumnMeta($i);
-            $this->assertType('array', $meta);
+            $this->assertTrue(is_array($meta));
             foreach ($this->_getColumnMetaKeys as $key) {
                 if ($key == 'table' && version_compare(PHP_VERSION, '5.2.0', '<')) {
                     continue;
@@ -822,7 +824,7 @@ abstract class Zend_Db_Statement_TestCommon extends Zend_Db_TestSetup
             $stmt->nextRowset();
             $this->fail('Expected to catch Zend_Db_Statement_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Statement_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertEquals('nextRowset() is not implemented', $e->getMessage());
         }

tests/Zend/Db/Table/Relationships/TestCommon.php

@@ -55,15 +55,15 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $table = $this->_table['bugs'];
 
         $childRows = $table->fetchAll("$bug_id = 1");
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $parentRow = $childRow1->findParentRow('My_ZendDbTable_TableAccounts');
-        $this->assertType('Zend_Db_Table_Row_Abstract', $parentRow,
+        $this->assertTrue($parentRow instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($parentRow));
 
         $this->assertEquals('goofy', $parentRow->$account_name);
@@ -79,15 +79,15 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $select = $table->select()->where($account_name_column . ' = ?', 'goofy');
 
         $childRows = $table->fetchAll("$bug_id = 1");
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $parentRow = $childRow1->findParentRow('My_ZendDbTable_TableAccounts', null, $select);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $parentRow,
+        $this->assertTrue($parentRow instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($parentRow));
 
         $this->assertEquals('goofy', $parentRow->$account_name);
@@ -101,15 +101,15 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $table = $this->_table['bugs'];
 
         $childRows = $table->fetchAll("$bug_id = 1");
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $parentRow = $childRow1->findParentMy_ZendDbTable_TableAccounts();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $parentRow,
+        $this->assertTrue($parentRow instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($parentRow));
 
         $this->assertEquals('goofy', $parentRow->$account_name);
@@ -125,15 +125,15 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $select = $table->select()->where($account_name_column . ' = ?', 'goofy');
 
         $childRows = $table->fetchAll("$bug_id = 1");
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $parentRow = $childRow1->findParentMy_ZendDbTable_TableAccounts($select);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $parentRow,
+        $this->assertTrue($parentRow instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($parentRow));
 
         $this->assertEquals('goofy', $parentRow->$account_name);
@@ -151,7 +151,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
             $result = $parentRow1->nonExistantMethod();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals("Unrecognized method 'nonExistantMethod()'", $e->getMessage());
         }
@@ -195,7 +195,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $originRow1 = $originRows->current();
 
         $destRows = $originRow1->findManyToManyRowset('My_ZendDbTable_TableProducts', 'My_ZendDbTable_TableBugsProducts');
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $destRows,
+        $this->assertTrue($destRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($destRows));
 
         $this->assertEquals(3, $destRows->count());
@@ -217,7 +217,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
 
         $destRows = $originRow1->findManyToManyRowset('My_ZendDbTable_TableProducts', 'My_ZendDbTable_TableBugsProducts',
                                                       null, null, $select);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $destRows,
+        $this->assertTrue($destRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($destRows));
 
         $this->assertEquals(2, $destRows->count());
@@ -234,7 +234,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $originRow1 = $originRows->current();
 
         $destRows = $originRow1->findMy_ZendDbTable_TableProductsViaMy_ZendDbTable_TableBugsProducts();
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $destRows,
+        $this->assertTrue($destRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($destRows));
 
         $this->assertEquals(3, $destRows->count());
@@ -255,7 +255,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $originRow1 = $originRows->current();
 
         $destRows = $originRow1->findMy_ZendDbTable_TableProductsViaMy_ZendDbTable_TableBugsProducts($select);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $destRows,
+        $this->assertTrue($destRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($destRows));
 
         $this->assertEquals(2, $destRows->count());
@@ -332,18 +332,18 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $product_id = $this->_db->foldCase('product_id');
 
         $parentRows = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $parentRows,
+        $this->assertTrue($parentRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($parentRows));
         $parentRow1 = $parentRows->current();
 
         $childRows = $parentRow1->findDependentRowset('My_ZendDbTable_TableBugsProducts');
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $this->assertEquals(3, $childRows->count());
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $this->assertEquals(1, $childRow1->$bug_id);
@@ -360,16 +360,16 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
                                   ->order($product_id . ' DESC');
 
         $parentRows = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $parentRows,
+        $this->assertTrue($parentRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($parentRows));
         $parentRow1 = $parentRows->current();
 
         $childRows = $parentRow1->findDependentRowset('My_ZendDbTable_TableBugsProducts', null, $select);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $this->assertEquals(1, $childRow1->$bug_id);
@@ -386,13 +386,13 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $parentRow1 = $parentRows->current();
 
         $childRows = $parentRow1->findMy_ZendDbTable_TableBugsProducts();
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $this->assertEquals(3, $childRows->count());
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $this->assertEquals(1, $childRow1->$bug_id);
@@ -411,13 +411,13 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $parentRow1 = $parentRows->current();
 
         $childRows = $parentRow1->findMy_ZendDbTable_TableBugsProducts($select);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $this->assertEquals(2, $childRows->count());
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $this->assertEquals(1, $childRow1->$bug_id);
@@ -685,7 +685,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
             $table->getReference('My_ZendDbTable_TableAccounts', 'Nonexistent');
             $this->fail('Expected to catch Zend_Db_Table_Exception for nonexistent reference rule');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception got '.get_class($e));
         }
 
@@ -693,7 +693,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
             $table->getReference('Nonexistent', 'Reporter');
             $this->fail('Expected to catch Zend_Db_Table_Exception for nonexistent rule tableClass');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception got '.get_class($e));
         }
 
@@ -701,7 +701,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
             $table->getReference('Nonexistent');
             $this->fail('Expected to catch Zend_Db_Table_Exception for nonexistent rule tableClass');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception got '.get_class($e));
         }
     }
@@ -725,7 +725,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
                         ->current()
                         ->findParentRow($this->_table['accounts']->setRowClass($myRowClass));
 
-        $this->assertType($myRowClass, $bug1Reporter,
+        $this->assertTrue($bug1Reporter instanceof $myRowClass,
             "Expecting object of type $myRowClass, got ".get_class($bug1Reporter));
     }
 
@@ -750,7 +750,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
                         ->current()
                         ->findParentRow(new My_ZendDbTable_TableAccountsCustom(array('db' => $this->_db)));
 
-        $this->assertType($myRowClass, $bug1Reporter,
+        $this->assertTrue($bug1Reporter instanceof $myRowClass,
             "Expecting object of type $myRowClass, got ".get_class($bug1Reporter));
     }
 
@@ -780,13 +780,13 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
                     'Engineer'
                     );
 
-        $this->assertType($myRowsetClass, $bugs,
+        $this->assertTrue($bugs instanceof $myRowsetClass,
             "Expecting object of type $myRowsetClass, got ".get_class($bugs));
 
         $this->assertEquals(3, count($bugs));
 
         foreach ($bugs as $bug) {
-            $this->assertType($myRowClass, $bug,
+            $this->assertTrue($bug instanceof $myRowClass,
                 "Expecting object of type $myRowClass, got ".get_class($bug));
         }
     }
@@ -812,13 +812,13 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
                 ->fetchRow($this->_db->quoteInto("$account_name = ?", 'mmouse'))
                 ->findDependentRowset('My_ZendDbTable_TableBugsCustom', 'Engineer');
 
-        $this->assertType($myRowsetClass, $bugs,
+        $this->assertTrue($bugs instanceof $myRowsetClass,
             "Expecting object of type $myRowsetClass, got ".get_class($bugs));
 
         $this->assertEquals(3, count($bugs));
 
         foreach ($bugs as $bug) {
-            $this->assertType($myRowClass, $bug,
+            $this->assertTrue($bug instanceof $myRowClass,
                 "Expecting object of type $myRowClass, got ".get_class($bug));
         }
     }
@@ -848,13 +848,13 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
                             'My_ZendDbTable_TableBugsProducts'
                             );
 
-        $this->assertType($myRowsetClass, $bug1Products,
+        $this->assertTrue($bug1Products instanceof $myRowsetClass,
             "Expecting object of type $myRowsetClass, got ".get_class($bug1Products));
 
         $this->assertEquals(3, count($bug1Products));
 
         foreach ($bug1Products as $bug1Product) {
-            $this->assertType($myRowClass, $bug1Product,
+            $this->assertTrue($bug1Product instanceof $myRowClass,
                 "Expecting object of type $myRowClass, got ".get_class($bug1Product));
         }
     }
@@ -882,13 +882,13 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
                             'My_ZendDbTable_TableBugsProductsCustom'
                             );
 
-        $this->assertType($myRowsetClass, $bug1Products,
+        $this->assertTrue($bug1Products instanceof $myRowsetClass,
             "Expecting object of type $myRowsetClass, got ".get_class($bug1Products));
 
         $this->assertEquals(3, count($bug1Products));
 
         foreach ($bug1Products as $bug1Product) {
-            $this->assertType($myRowClass, $bug1Product,
+            $this->assertTrue($bug1Product instanceof $myRowClass,
                 "Expecting object of type $myRowClass, got ".get_class($bug1Product));
         }
     }
@@ -906,15 +906,15 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $table = $this->_table['bugs'];
 
         $childRows = $table->fetchAll("$bug_id = 1");
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $parentRow = $childRow1->findParentRow('My_ZendDbTable_TableAccounts');
-        $this->assertType('Zend_Db_Table_Row_Abstract', $parentRow,
+        $this->assertTrue($parentRow instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($parentRow));
 
         $this->assertEquals('goofy', $parentRow->$account_name);
@@ -946,18 +946,18 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $bug_description = $this->_db->foldCase('bug_description');
 
         $parentRows = $table->find('mmouse');
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $parentRows,
+        $this->assertTrue($parentRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($parentRows));
         $parentRow1 = $parentRows->current();
 
         $childRows = $parentRow1->findDependentRowset('My_ZendDbTable_TableBugs');
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $childRows,
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($childRows));
 
         $this->assertEquals(1, $childRows->count());
 
         $childRow1 = $childRows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $childRow1,
+        $this->assertTrue($childRow1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($childRow1));
 
         $childRow1->$bug_description = 'Updated description';
@@ -992,7 +992,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $originRow1 = $originRows->current();
 
         $destRows = $originRow1->findManyToManyRowset('My_ZendDbTable_TableProducts', 'My_ZendDbTable_TableBugsProducts');
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $destRows,
+        $this->assertTrue($destRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($destRows));
 
         $this->assertEquals(3, $destRows->count());
@@ -1096,7 +1096,7 @@ abstract class Zend_Db_Table_Relationships_TestCommon extends Zend_Db_Table_Test
         $originRow1 = $originRows->current();
 
         $destRows = $originRow1->findManyToManyRowset('My_ZendDbTable_TableBugs', 'My_ZendDbTable_TableBugsProducts');
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $destRows,
+        $this->assertTrue($destRows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($destRows));
 
         $this->assertEquals(1, $destRows->count());

tests/Zend/Db/Table/Row/TestCommon.php

@@ -86,7 +86,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(1, count($rowset));
     }
@@ -104,14 +104,14 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
 
         $row1 = new Zend_Db_Table_Row($config);
 
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         try {
             $bug_description = $row1->bug_description;
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals("Specified column \"bug_description\" is not in the row", $e->getMessage());
         }
@@ -122,7 +122,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row1 = new Zend_Db_Table_Row($config);
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals("Data must be an array", $e->getMessage());
         }
@@ -141,7 +141,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         Zend_Db_Table_Abstract::setDefaultAdapter($this->_db);
 
         $row = new My_ZendDbTable_Row_TestStandaloneRow();
-        $this->assertType('Zend_Db_Table_Abstract', $row->getTable());
+        $this->assertTrue($row->getTable() instanceof Zend_Db_Table_Abstract);
 
         Zend_Db_Table_Abstract::setDefaultAdapter();
     }
@@ -166,10 +166,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $a = $row1->toArray();
@@ -199,14 +199,14 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $select = $row1->select();
-        $this->assertType('Zend_Db_Table_Select', $select,
+        $this->assertTrue($select instanceof Zend_Db_Table_Select,
             'Expecting object of type Zend_Db_Table_Select, got '.get_class($select));
     }
 
@@ -218,10 +218,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $bug_status = $this->_db->foldCase('bug_status');
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         try {
@@ -262,10 +262,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $bug_description = $this->_db->foldCase('bug_description');
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         try {
@@ -285,10 +285,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $bug_status = $this->_db->foldCase('bug_status');
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         try {
@@ -307,10 +307,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $bug_description = $this->_db->foldCase('bug_description');
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         try {
@@ -330,10 +330,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $bug_description = $this->_db->foldCase('bug_description');
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         try {
@@ -357,10 +357,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         );
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $result = $row1->setFromArray($data);
@@ -392,10 +392,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         );
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $row1->setFromArray($data);
@@ -404,7 +404,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $button = $row1->btnAccept;
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals("Specified column \"btnAccept\" is not in the row", $e->getMessage());
         }
@@ -461,10 +461,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         );
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $row1->setFromArray($data);
@@ -490,7 +490,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row->setTable($table);
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception for incorrect parent table');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals('The specified Table does not have the same columns as the Row', $e->getMessage());
         }
@@ -502,7 +502,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row->setTable($table);
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception for incorrect parent table');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals('The specified Table \'My_ZendDbTable_TableBugs\' does not have the same primary key as the Row', $e->getMessage());
         }
@@ -523,7 +523,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row->save();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception for incorrect parent table');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals('The primary key must be set as an array', $e->getMessage());
         }
@@ -534,7 +534,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row->save();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception for incorrect parent table');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals('The specified Table \'My_ZendDbTable_TableBugs\' does not have the same primary key as the Row', $e->getMessage());
         }
@@ -553,7 +553,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row->save();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception for missing parent');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals('Cannot refresh row as parent is missing', $e->getMessage());
         }
@@ -565,10 +565,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $table2 = $this->_table['products'];
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $row1->setTable(null);
@@ -578,7 +578,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row1->setTable($table2);
             $this->fail('Expected to catch Zend_Db_Table_Exception for incorrect parent table');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception got '.get_class($e));
             $this->assertEquals('The specified Table is of class My_ZendDbTable_TableProducts, expecting class to be instance of My_ZendDbTable_TableBugs', $e->getMessage());
         }
@@ -595,7 +595,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row->setTable($table);
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception for incorrect parent table');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals('The specified Table is of class My_ZendDbTable_TableBugs, expecting class to be instance of foo', $e->getMessage());
         }
@@ -606,10 +606,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $column = 'doesNotExist';
@@ -618,7 +618,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $dummy = $row1->$column;
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals("Specified column \"$column\" is not in the row", $e->getMessage());
         }
@@ -629,10 +629,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         $column = 'doesNotExist';
@@ -641,7 +641,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row1->$column = 'dummy value';
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals("Specified column \"$column\" is not in the row", $e->getMessage());
         }
@@ -659,7 +659,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $rowsAffected = $row->delete();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals("The specified Table 'My_ZendDbTable_TableBugsProducts' does not have the same primary key as the Row", $e->getMessage());
         }
@@ -671,10 +671,10 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $bug_id = $this->_db->foldCase('bug_id');
 
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
 
         try {
@@ -696,7 +696,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $serRow1 = serialize($row1);
 
         $row1New = unserialize($serRow1);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1New,
+        $this->assertTrue($row1New instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1New));
         $this->assertEquals($row1->toArray(), $row1New->toArray());
     }
@@ -711,7 +711,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $serRow1 = serialize($row1);
 
         $row1New = unserialize($serRow1);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1New,
+        $this->assertTrue($row1New instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1New));
         $bug_description = $this->_db->foldCase('bug_description');
         $row1New->$bug_description = 'New description';
@@ -720,7 +720,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row1New->save();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals("Cannot save a Row unless it is connected", $e->getMessage());
         }
@@ -736,7 +736,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $serRow1 = serialize($row1);
 
         $row1New = unserialize($serRow1);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1New,
+        $this->assertTrue($row1New instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1New));
 
         try {
@@ -772,7 +772,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $serRow1 = serialize($row1);
 
         $row1New = unserialize($serRow1);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1New,
+        $this->assertTrue($row1New instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1New));
 
         try {
@@ -800,7 +800,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $serRow1 = serialize($row1);
 
         $row1New = unserialize($serRow1);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1New,
+        $this->assertTrue($row1New instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1New));
 
         $table2 = $this->_table['products'];
@@ -809,7 +809,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $connected = $row1New->setTable($table2);
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals('The specified Table is of class My_ZendDbTable_TableProducts, expecting class to be instance of My_ZendDbTable_TableBugs', $e->getMessage());
         }
@@ -838,7 +838,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row2->save();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals('This row has been marked read-only', $e->getMessage());
         }
@@ -853,7 +853,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row2->save();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals('This row has been marked read-only', $e->getMessage());
         }
@@ -870,7 +870,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
             $row->setInvalidColumn();
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception for invalid column type');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception got '.get_class($e));
             $this->assertEquals('Specified column is not a string', $e->getMessage());
         }
@@ -887,7 +887,7 @@ abstract class Zend_Db_Table_Row_TestCommon extends Zend_Db_Table_TestSetup
         $row = $rowset->current();
         $this->assertTrue($row instanceof Traversable);
         $this->assertTrue($row instanceof IteratorAggregate);
-        $this->assertType('ArrayIterator', $row->getIterator());
+        $this->assertTrue($row->getIterator() instanceof ArrayIterator);
 
         $count=0;
         foreach ($row as $columnValue) {

tests/Zend/Db/Table/Rowset/TestCommon.php

@@ -48,7 +48,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rows = $table->find(array(1, 2));
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rows,
+        $this->assertTrue($rows instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rows));
 
         // see if we're at the beginning
@@ -57,7 +57,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
 
         // get first row and see if it's the right one
         $row1 = $rows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(1, $row1->$bug_id);
@@ -69,7 +69,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
 
         // get second row and see if it's the right one
         $row2 = $rows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row2,
+        $this->assertTrue($row2 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row2));
         $this->assertEquals(2, $row2->$bug_id);
 
@@ -91,7 +91,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
         // get row at beginning and compare it to
         // the one we got earlier
         $row1Copy = $rows->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
         $this->assertEquals(1, $row1->$bug_id);
         $this->assertSame($row1, $row1Copy);
@@ -145,7 +145,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
         $rowset = $table->fetchAll();
 
         $this->assertTrue(isset($rowset[0]));
-        $this->assertType('Zend_Db_Table_Row', $rowset[0]);
+        $this->assertTrue($rowset[0] instanceof Zend_Db_Table_Row);
     }
 
     public function testTableRowsetEmpty()
@@ -223,11 +223,11 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
         $rowsNew = unserialize($serRows);
 
         $this->assertFalse($rowsNew->isConnected());
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowsNew,
+        $this->assertTrue($rowsNew instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowsNew));
 
         $row1New = $rowsNew->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1New,
+        $this->assertTrue($row1New instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1New));
     }
 
@@ -248,7 +248,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
         $serRows = serialize($rows);
 
         $rowsNew = unserialize($serRows);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowsNew,
+        $this->assertTrue($rowsNew instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowsNew));
 
         $table2 = $this->_table['products'];
@@ -257,7 +257,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
             $connected = $rowsNew->setTable($table2);
             $this->fail('Expected to catch Zend_Db_Table_Row_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Row_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Row_Exception,
                 'Expecting object of type Zend_Db_Table_Row_Exception, got '.get_class($e));
             $this->assertEquals('The specified Table is of class My_ZendDbTable_TableProducts, expecting class to be instance of My_ZendDbTable_TableBugs', $e->getMessage());
         }
@@ -275,7 +275,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
             $rowset[-1];
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Db_Table_Rowset_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Rowset_Exception);
             $this->assertContains('Illegal index', $e->getMessage());
         }
 
@@ -285,7 +285,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
             $row = $rowset[count($rowset) + 1];
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Db_Table_Rowset_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Rowset_Exception);
             $this->assertContains('Illegal index', $e->getMessage());
         }
         $this->assertEquals(0, $rowset->key());
@@ -350,7 +350,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
         $rowset = unserialize($ser);
 
         $row = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row); 
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract);
         $this->assertFalse($row->isConnected());
         $this->assertNull($row->getTable());
     }
@@ -369,7 +369,7 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
 
         $this->assertTrue($rowset->isConnected());
         $row = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row);
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract);
         $this->assertTrue($row->isConnected());
         $this->assertSame($row->getTable(), $table);
     }

tests/Zend/Db/Table/Select/StaticTest.php

@@ -63,7 +63,7 @@ class Zend_Db_Table_Select_StaticTest extends Zend_Db_Select_TestCommon
         $this->assertEquals('SELECT "zfproducts".* FROM "zfproducts"', $sql);
         $stmt = $select->query();
         Zend_Loader::loadClass('Zend_Db_Statement_Static');
-        $this->assertType('Zend_Db_Statement_Static', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Static);
     }
 
     /**
@@ -79,7 +79,7 @@ class Zend_Db_Table_Select_StaticTest extends Zend_Db_Select_TestCommon
 
         $stmt = $select->query();
         Zend_Loader::loadClass('Zend_Db_Statement_Static');
-        $this->assertType('Zend_Db_Statement_Static', $stmt);
+        $this->assertTrue($stmt instanceof Zend_Db_Statement_Static);
     }
 
     /**

tests/Zend/Db/Table/Select/TestCommon.php

@@ -157,7 +157,7 @@ abstract class Zend_Db_Table_Select_TestCommon extends Zend_Db_Select_TestCommon
             $query = $select->assemble();
             $this->fail('Expected to catch Zend_Db_Table_Select_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Select_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Select_Exception);
             $this->assertEquals('Select query cannot join with another table', $e->getMessage());
         }
     }
@@ -314,7 +314,7 @@ abstract class Zend_Db_Table_Select_TestCommon extends Zend_Db_Select_TestCommon
 //        try {
 //            $select = $table->select()->columns('product_id');
 //
-//            $this->assertType('Zend_Db_Table_Select', $select);
+//            $this->assertTrue($select instanceof Zend_Db_Table_Select);
 //        } catch (Zend_Db_Table_Select_Exception $e) {
 //            $this->fail('Exception thrown: ' . $e->getMessage());
 //        }

tests/Zend/Db/Table/TestCommon.php

@@ -121,7 +121,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     public function testTableInfo()
     {
         $bugs = $this->_table['bugs'];
-        $this->assertType('Zend_Db_Table_Abstract', $bugs);
+        $this->assertTrue($bugs instanceof Zend_Db_Table_Abstract);
         $info = $bugs->info();
 
         $keys = array(
@@ -165,7 +165,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $value = $bugs->info('_non_existent_');
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception);
             $this->assertEquals('There is no table information for the key "_non_existent_"', $e->getMessage());
         }
     }
@@ -276,7 +276,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     public function testTableGetRowClass()
     {
         $table = $this->_table['products'];
-        $this->assertType('Zend_Db_Table_Abstract', $table);
+        $this->assertTrue($table instanceof Zend_Db_Table_Abstract);
 
         $rowClass = $table->getRowClass();
         $this->assertEquals($rowClass, 'Zend_Db_Table_Row');
@@ -332,7 +332,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $ref = $table->getReference('My_ZendDbTable_TableAccounts', 'Verifier');
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception);
             $this->assertEquals('No reference rule "Verifier" from table My_ZendDbTable_TableBugs to table My_ZendDbTable_TableAccounts', $e->getMessage());
         }
 
@@ -340,7 +340,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $ref = $table->getReference('My_ZendDbTable_TableProducts');
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception);
             $this->assertEquals('No reference from table My_ZendDbTable_TableBugs to table My_ZendDbTable_TableProducts', $e->getMessage());
         }
 
@@ -348,7 +348,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $ref = $table->getReference('My_ZendDbTable_TableProducts', 'Product');
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception);
             $this->assertEquals('No reference rule "Product" from table My_ZendDbTable_TableBugs to table My_ZendDbTable_TableProducts', $e->getMessage());
         }
 
@@ -356,7 +356,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $ref = $table->getReference('My_ZendDbTable_TableProducts', 'Reporter');
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception);
             $this->assertEquals('Reference rule "Reporter" does not reference table My_ZendDbTable_TableProducts', $e->getMessage());
         }
 
@@ -373,7 +373,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     public function testTableSetRowClass()
     {
         $table = $this->_table['products'];
-        $this->assertType('Zend_Db_Table_Abstract', $table);
+        $this->assertTrue($table instanceof Zend_Db_Table_Abstract);
 
         $table->setRowClass('stdClass');
         $rowClass = $table->getRowClass();
@@ -406,7 +406,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $table = new My_ZendDbTable_TableBugs();
             $this->fail('Zend_Db_Table_Exception should be thrown');
         }catch(Zend_Exception $e) {
-         $this->assertType('Zend_Db_Table_Exception', $e,
+         $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
         }
     }
@@ -441,7 +441,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             Zend_Db_Table_Abstract::setDefaultAdapter(new stdClass());
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored", $e->getMessage());
         }
@@ -450,7 +450,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             Zend_Db_Table_Abstract::setDefaultAdapter(327);
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored", $e->getMessage());
         }
@@ -463,7 +463,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $primary = $table->info(Zend_Db_Table_Abstract::PRIMARY);
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertContains("Primary key column(s)", $e->getMessage());
             $this->assertContains("are not columns in this table", $e->getMessage());
@@ -477,7 +477,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $primary = $table->info(Zend_Db_Table_Abstract::PRIMARY);
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertContains("Primary key column(s)", $e->getMessage());
             $this->assertContains("are not columns in this table", $e->getMessage());
@@ -496,7 +496,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $primary = $table->info(Zend_Db_Table_Abstract::PRIMARY);
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("A table must have a primary key, but none was found for table '{$tableName}'", $e->getMessage());
         }
@@ -534,7 +534,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $table = new My_ZendDbTable_TableBugs(array('db' => 327));
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored", $e->getMessage());
         }
@@ -547,7 +547,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $table = new My_ZendDbTable_TableBugs(array('db' => 'registered_db'));
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored", $e->getMessage());
         }
@@ -557,7 +557,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs'];
         $rowset = $table->find(1);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(1, count($rowset));
     }
@@ -566,7 +566,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs'];
         $rowset = $table->find(array(1, 2));
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(2, count($rowset));
     }
@@ -578,7 +578,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $table->find(1);
             $this->fail('Expected to catch Zend_Db_Table_Exception for missing key');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals('Too few columns for the primary key', $e->getMessage());
         }
@@ -591,7 +591,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $table->find(1, 2);
             $this->fail('Expected to catch Zend_Db_Table_Exception for incorrect key count');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals('Too many columns for the primary key', $e->getMessage());
         }
@@ -601,7 +601,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs_products'];
         $rowset = $table->find(1, 2);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(1, count($rowset));
     }
@@ -610,7 +610,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs_products'];
         $rowset = $table->find(array(1, 1), array(2, 3));
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(2, count($rowset));
     }
@@ -622,7 +622,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $rowset = $table->find(array(1, 1), 2);
             $this->fail('Expected to catch Zend_Db_Table_Exception for incorrect key count');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals('Missing value(s) for the primary key', $e->getMessage());
         }
@@ -635,7 +635,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['products'];
         $rowset = $table->find(array(0 => 1, 1 => 2, 99 => 3));
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(3, count($rowset));
     }
@@ -648,7 +648,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['products'];
         $rowset = $table->find(array());
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(0, count($rowset));
     }
@@ -747,7 +747,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             'product_id' => 1
         );
         $primary = $table->insert($row);
-        $this->assertType('array', $primary);
+        $this->assertTrue(is_array($primary));
         $this->assertEquals(2, count($primary));
         $this->assertEquals(array(2, 1), array_values($primary));
     }
@@ -892,11 +892,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
 
         // Query the row to see if we have the new values.
         $rowset = $table->find(2);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(1, count($rowset), "Expecting rowset count to be 1");
         $row = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id, "Expecting row->bug_id to be 2");
@@ -1011,7 +1011,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs'];
         $row = $table->createRow();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $this->assertTrue(isset($row->bug_description));
         $this->assertEquals($row, $table->fetchNew());
@@ -1029,7 +1029,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             'assigned_to'     => 'goofy'
         );
         $row = $table->createRow($data);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $this->assertTrue(isset($row->bug_description));
         $this->assertEquals('New bug', $row->bug_description);
@@ -1046,7 +1046,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
 
         $table = $this->_table['bugs'];
         $row = $table->fetchRow(array("$reported_by = ?" => 'goofy'), null, 1);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id);
@@ -1067,7 +1067,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             ->limit(1, 1);
 
         $row = $table->fetchRow($select);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id);
@@ -1078,7 +1078,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
         $bug_description = $this->_db->foldCase('bug_description');
         $row = $table->fetchRow();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $this->assertTrue(isset($row->$bug_description));
     }
@@ -1089,7 +1089,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
 
         $table = $this->_table['bugs'];
         $row = $table->fetchRow("$bug_id = 2");
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id);
@@ -1101,7 +1101,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
 
         $table = $this->_table['bugs'];
         $row = $table->fetchRow(array("$bug_id = ?" => 2));
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id);
@@ -1116,7 +1116,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             ->where("$bug_id = ?", 2);
 
         $row = $table->fetchRow($select);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id);
@@ -1129,7 +1129,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $row = $table->fetchRow("$bug_id > 1", "bug_id ASC");
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id);
@@ -1145,7 +1145,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             ->order("bug_id ASC");
 
         $row = $table->fetchRow($select);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row->$bug_id);
@@ -1158,7 +1158,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $row = $table->fetchRow(null, "bug_id DESC");
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(4, $row->$bug_id);
@@ -1174,7 +1174,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             ->order("bug_id DESC");
 
         $row = $table->fetchRow($select);
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row,
+        $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(4, $row->$bug_id);
@@ -1195,11 +1195,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs'];
         $rowset = $table->fetchAll();
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(4, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
     }
 
@@ -1210,11 +1210,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rowset = $table->fetchAll("$bug_id = 2");
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(1, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row1->$bug_id);
@@ -1229,11 +1229,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             ->where("$bug_id = ?", 2);
 
         $rowset = $table->fetchAll($select);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(1, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row1->$bug_id);
@@ -1243,11 +1243,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs'];
         $rowset = $table->fetchAll(null, 'bug_id DESC');
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(4, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(4, $row1->$bug_id);
@@ -1260,11 +1260,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             ->order('bug_id DESC');
 
         $rowset = $table->fetchAll($select);
-        $this->assertType('Zend_Db_Table_Rowset_Abstract', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract,
             'Expecting object of type Zend_Db_Table_Rowset_Abstract, got '.get_class($rowset));
         $this->assertEquals(4, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row_Abstract', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row_Abstract,
             'Expecting object of type Zend_Db_Table_Row_Abstract, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(4, $row1->$bug_id);
@@ -1277,11 +1277,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
         $table = $this->_table['bugs'];
 
         $rowset = $table->fetchAll(null, new Zend_Db_Expr("$bug_id + 1 DESC"));
-        $this->assertType('Zend_Db_Table_Rowset', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset,
             'Expecting object of type Zend_Db_Table_Rowset, got '.get_class($rowset));
         $this->assertEquals(4, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row,
             'Expecting object of type Zend_Db_Table_Row, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(4, $row1->$bug_id);
@@ -1291,11 +1291,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
     {
         $table = $this->_table['bugs'];
         $rowset = $table->fetchAll(null, 'bug_id ASC', 2, 1);
-        $this->assertType('Zend_Db_Table_Rowset', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset,
             'Expecting object of type Zend_Db_Table_Rowset, got '.get_class($rowset));
         $this->assertEquals(2, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row,
             'Expecting object of type Zend_Db_Table_Row, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row1->$bug_id);
@@ -1309,11 +1309,11 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             ->limit(2, 1);
 
         $rowset = $table->fetchAll($select);
-        $this->assertType('Zend_Db_Table_Rowset', $rowset,
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset,
             'Expecting object of type Zend_Db_Table_Rowset, got '.get_class($rowset));
         $this->assertEquals(2, count($rowset));
         $row1 = $rowset->current();
-        $this->assertType('Zend_Db_Table_Row', $row1,
+        $this->assertTrue($row1 instanceof Zend_Db_Table_Row,
             'Expecting object of type Zend_Db_Table_Row, got '.get_class($row1));
         $bug_id = $this->_db->foldCase('bug_id');
         $this->assertEquals(2, $row1->$bug_id);
@@ -1434,9 +1434,8 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             array('metadataCache' => $cache)
         );
 
-        $this->assertType(
-            'Zend_Cache_Core',
-            $tableBugsCustom1->getMetadataCache()
+        $this->assertTrue(
+            $tableBugsCustom1->getMetadataCache() instanceof Zend_Cache_Core
         );
 
         $this->assertFalse($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is not from cache');
@@ -1471,9 +1470,8 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             )
         );
 
-        $this->assertType(
-            'Zend_Cache_Core',
-            $tableBugsCustom1->getMetadataCache()
+        $this->assertTrue(
+            $tableBugsCustom1->getMetadataCache() instanceof Zend_Cache_Core
         );
 
         $this->assertFalse($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is not from cache');
@@ -1505,9 +1503,8 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
 
         $this->assertFalse($tableBugsCustom1->isMetadataFromCache);
 
-        $this->assertType(
-            'Zend_Cache_Core',
-            $tableBugsCustom1->getMetadataCache()
+        $this->assertTrue(
+            $tableBugsCustom1->getMetadataCache() instanceof Zend_Cache_Core
         );
 
         $tableBugsCustom1->setup();
@@ -1527,7 +1524,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             Zend_Db_Table_Abstract::setDefaultMetadataCache(new stdClass());
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored", $e->getMessage());
         }
@@ -1536,7 +1533,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             Zend_Db_Table_Abstract::setDefaultMetadataCache(327);
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored", $e->getMessage());
         }
@@ -1553,7 +1550,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $table = new My_ZendDbTable_TableBugs(array('metadataCache' => 327));
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored", $e->getMessage());
         }
@@ -1566,7 +1563,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
             $table = new My_ZendDbTable_TableBugs(array('metadataCache' => 'registered_metadata_cache'));
             $this->fail('Expected to catch Zend_Db_Table_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Db_Table_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Table_Exception,
                 'Expecting object of type Zend_Db_Table_Exception, got '.get_class($e));
             $this->assertEquals("Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored", $e->getMessage());
         }
@@ -1622,14 +1619,14 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
 
         // Enforce initial table structure
         $parentRow = $tblRecursive->find(1)->current();
-        $this->assertType('Zend_Db_Table_Row', $parentRow);
+        $this->assertTrue($parentRow instanceof Zend_Db_Table_Row);
         $childRows = $parentRow->findDependentRowset('My_ZendDbTable_TableCascadeRecursive', 'Children');
-        $this->assertType('Zend_Db_Table_Rowset', $childRows);
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset);
         $this->assertEquals(2, count($childRows));
         foreach ( $childRows as $childRow ) {
-            $this->assertType('Zend_Db_Table_Row', $childRow);
+            $this->assertTrue($childRow instanceof Zend_Db_Table_Row);
             $subChildRows = $childRow->findDependentRowset('My_ZendDbTable_TableCascadeRecursive', 'Children');
-            $this->assertType('Zend_Db_Table_Rowset', $subChildRows);
+            $this->assertTrue($subChildRows instanceof Zend_Db_Table_Rowset);
             $this->assertEquals( $childRow['item_id'] == 3 ? 2 : 0 , count($subChildRows));
         }
 
@@ -1643,7 +1640,7 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
         $this->assertNull($tblRecursive->find(4)->current());
         $this->assertNull($tblRecursive->find(5)->current());
         //... but #6 remains
-        $this->assertType('Zend_Db_Table_Row', $tblRecursive->find(6)->current());
+        $this->assertTrue($tblRecursive->find(6)->current() instanceof Zend_Db_Table_Row);
     }
 
     /**
@@ -1655,14 +1652,14 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
 
         // Enforce initial table structure
         $parentRow = $tblRecursive->find(1)->current();
-        $this->assertType('Zend_Db_Table_Row', $parentRow);
+        $this->assertTrue($parentRow instanceof Zend_Db_Table_Row);
         $childRows = $parentRow->findDependentRowset('My_ZendDbTable_TableCascadeRecursive', 'Children');
-        $this->assertType('Zend_Db_Table_Rowset', $childRows);
+        $this->assertTrue($childRows instanceof Zend_Db_Table_Rowset);
         $this->assertEquals(2, count($childRows));
         foreach ( $childRows as $childRow ) {
-            $this->assertType('Zend_Db_Table_Row', $childRow);
+            $this->assertTrue($childRow instanceof Zend_Db_Table_Row);
             $subChildRows = $childRow->findDependentRowset('My_ZendDbTable_TableCascadeRecursive', 'Children');
-            $this->assertType('Zend_Db_Table_Rowset', $subChildRows);
+            $this->assertTrue($subChildRows instanceof Zend_Db_Table_Rowset);
             $this->assertEquals( $childRow['item_id'] == 3 ? 2 : 0 , count($subChildRows));
         }
 
@@ -1676,13 +1673,13 @@ abstract class Zend_Db_Table_TestCommon extends Zend_Db_Table_TestSetup
         $this->assertNull($tblRecursive->find(4)->current());
         $this->assertNull($tblRecursive->find(5)->current());
         //... but #6 remains
-        $this->assertType('Zend_Db_Table_Row', $tblRecursive->find(6)->current());
+        $this->assertTrue($tblRecursive->find(6)->current() instanceof Zend_Db_Table_Row);
     }
 
     public function testSerialiseTable()
     {
         $table = $this->_table['products'];
-        $this->assertType('string', serialize($table));
+        $this->assertTrue(is_string(serialize($table)));
     }
 
     /**

tests/Zend/Db/TestSetup.php

@@ -85,7 +85,7 @@ abstract class Zend_Db_TestSetup extends PHPUnit_Framework_TestCase
             $conn = $this->_db->getConnection();
         } catch (Zend_Exception $e) {
             $this->_db = null;
-            $this->assertType('Zend_Db_Adapter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Db_Adapter_Exception,
                 'Expecting Zend_Db_Adapter_Exception, got ' . get_class($e));
             $this->markTestSkipped($e->getMessage());
         }

tests/Zend/Dom/QueryTest.php

@@ -304,9 +304,9 @@ EOF;
     {
         $this->query->setDocument($this->getHtml(), 'utf-8');
         $test = $this->query->query('.foo');
-        $this->assertType('Zend_Dom_Query_Result', $test);
+        $this->assertTrue($test instanceof Zend_Dom_Query_Result);
         $doc  = $test->getDocument();
-        $this->assertType('DOMDocument', $doc);
+        $this->assertTrue($doc instanceof DOMDocument);
         $this->assertEquals('utf-8', $doc->encoding);
     }
     

tests/Zend/EventManager/EventManagerTest.php

@@ -99,10 +99,10 @@ class Zend_EventManager_EventManagerTest extends PHPUnit_Framework_TestCase
         $callback = array($this, 'returnName');
         $listeners = $this->events->attach(array('foo', 'bar'), $callback);
 
-        $this->assertType('array', $listeners);
+        $this->assertTrue(is_array($listeners));
 
         foreach ($listeners as $listener) {
-            $this->assertType('Zend_Stdlib_CallbackHandler', $listener);
+            $this->assertTrue($listener instanceof Zend_Stdlib_CallbackHandler);
             $this->assertSame($callback, $listener->getCallback());
         }
     }
@@ -522,31 +522,31 @@ class Zend_EventManager_EventManagerTest extends PHPUnit_Framework_TestCase
     {
         $identifier1 = 'foo';
         $identifiers = array($identifier1);
-        $this->assertType('Zend_EventManager_EventManager', $this->events->setIdentifiers($identifier1));
+        $this->assertTrue($this->events->setIdentifiers($identifier1) instanceof Zend_EventManager_EventManager);
         $this->assertSame($this->events->getIdentifiers(), $identifiers);
         $identifier2 = 'baz';
         $identifiers = array($identifier1, $identifier2);
-        $this->assertType('Zend_EventManager_EventManager', $this->events->addIdentifiers($identifier2));
+        $this->assertTrue($this->events->addIdentifiers($identifier2) instanceof Zend_EventManager_EventManager);
         $this->assertSame($this->events->getIdentifiers(), $identifiers);
     }
 
     public function testIdentifierGetterSettersWorkWithArrays()
     {
         $identifiers = array('foo', 'bar');
-        $this->assertType('Zend_EventManager_EventManager', $this->events->setIdentifiers($identifiers));
+        $this->assertTrue($this->events->setIdentifiers($identifiers) instanceof Zend_EventManager_EventManager);
         $this->assertSame($this->events->getIdentifiers(), $identifiers);
         $identifiers[] = 'baz';
-        $this->assertType('Zend_EventManager_EventManager', $this->events->addIdentifiers($identifiers));
+        $this->assertTrue($this->events->addIdentifiers($identifiers) instanceof Zend_EventManager_EventManager);
         $this->assertSame($this->events->getIdentifiers(), $identifiers);
     }
 
     public function testIdentifierGetterSettersWorkWithTraversables()
     {
         $identifiers = new ArrayIterator(array('foo', 'bar'));
-        $this->assertType('Zend_EventManager_EventManager', $this->events->setIdentifiers($identifiers));
+        $this->assertTrue($this->events->setIdentifiers($identifiers) instanceof Zend_EventManager_EventManager);
         $this->assertSame($this->events->getIdentifiers(), (array) $identifiers);
         $identifiers = new ArrayIterator(array('foo', 'bar', 'baz'));
-        $this->assertType('Zend_EventManager_EventManager', $this->events->addIdentifiers($identifiers));
+        $this->assertTrue($this->events->addIdentifiers($identifiers) instanceof Zend_EventManager_EventManager);
         $this->assertSame($this->events->getIdentifiers(), (array) $identifiers);
     }
 

tests/Zend/EventManager/FilterChainTest.php

@@ -138,7 +138,7 @@ class Zend_EventManager_FilterChainTest extends PHPUnit_Framework_TestCase
 
     public function filterReceivalCallback($context, array $params, $chain)
     {
-        $this->assertType('Zend_EventManager_Filter_FilterIterator', $chain);
+        $this->assertTrue($chain instanceof Zend_EventManager_Filter_FilterIterator);
     }
 
     public function filterTrim($context, $params, $chain)

tests/Zend/EventManager/GlobalEventManagerTest.php

@@ -50,16 +50,16 @@ class Zend_EventManager_GlobalEventManagerTest extends PHPUnit_Framework_TestCas
     public function testStoresAnEventManagerInstanceByDefault()
     {
         $events = Zend_EventManager_GlobalEventManager::getEventCollection();
-        $this->assertType('Zend_EventManager_EventManager', $events);
+        $this->assertTrue($events instanceof Zend_EventManager_EventManager);
     }
 
     public function testPassingNullValueForEventCollectionResetsInstance()
     {
         $events = Zend_EventManager_GlobalEventManager::getEventCollection();
-        $this->assertType('Zend_EventManager_EventManager', $events);
+        $this->assertTrue($events instanceof Zend_EventManager_EventManager);
         Zend_EventManager_GlobalEventManager::setEventCollection(null);
         $events2 = Zend_EventManager_GlobalEventManager::getEventCollection();
-        $this->assertType('Zend_EventManager_EventManager', $events2);
+        $this->assertTrue($events2 instanceof Zend_EventManager_EventManager);
         $this->assertNotSame($events, $events2);
     }
 
@@ -67,7 +67,7 @@ class Zend_EventManager_GlobalEventManagerTest extends PHPUnit_Framework_TestCas
     {
         $this->test = new stdClass();
         $listener = Zend_EventManager_GlobalEventManager::attach('foo.bar', array($this, 'aggregateEventMetadata'));
-        $this->assertType('Zend_Stdlib_CallbackHandler', $listener);
+        $this->assertTrue($listener instanceof Zend_Stdlib_CallbackHandler);
 
         Zend_EventManager_GlobalEventManager::trigger('foo.bar', $this, array('foo' => 'bar'));
         $this->assertSame($this, $this->test->target);

tests/Zend/EventManager/StaticEventManagerTest.php

@@ -69,7 +69,9 @@ class Zend_EventManager_StaticEventManagerTest extends PHPUnit_Framework_TestCas
 
     public function testSingletonInstanceIsInstanceOfClass()
     {
-        $this->assertType('Zend_EventManager_StaticEventManager', Zend_EventManager_StaticEventManager::getInstance());
+        $this->assertTrue(
+            Zend_EventManager_StaticEventManager::getInstance() instanceof Zend_EventManager_StaticEventManager
+        );
     }
 
     public function testCanAttachCallbackToEvent()
@@ -80,7 +82,7 @@ class Zend_EventManager_StaticEventManagerTest extends PHPUnit_Framework_TestCas
         $expected  = array($this, __FUNCTION__);
         $found     = false;
         $listeners = $events->getListeners('foo', 'bar');
-        $this->assertType('Zend_Stdlib_PriorityQueue', $listeners);
+        $this->assertTrue($listeners instanceof Zend_Stdlib_PriorityQueue);
         $this->assertTrue(0 < count($listeners), 'Empty listeners!');
         foreach ($listeners as $listener) {
             if ($expected === $listener->getCallback()) {
@@ -101,7 +103,7 @@ class Zend_EventManager_StaticEventManagerTest extends PHPUnit_Framework_TestCas
         foreach (array('foo', 'test') as $event) {
             $found     = false;
             $listeners = $events->getListeners('bar', $event);
-            $this->assertType('Zend_Stdlib_PriorityQueue', $listeners);
+            $this->assertTrue($listeners instanceof Zend_Stdlib_PriorityQueue);
             $this->assertTrue(0 < count($listeners), 'Empty listeners!');
             foreach ($listeners as $listener) {
                 if ($expected === $listener->getCallback()) {
@@ -123,7 +125,7 @@ class Zend_EventManager_StaticEventManagerTest extends PHPUnit_Framework_TestCas
         foreach (array('foo', 'test') as $id) {
             $found     = false;
             $listeners = $events->getListeners($id, 'bar');
-            $this->assertType('Zend_Stdlib_PriorityQueue', $listeners);
+            $this->assertTrue($listeners instanceof Zend_Stdlib_PriorityQueue);
             $this->assertTrue(0 < count($listeners), 'Empty listeners!');
             foreach ($listeners as $listener) {
                 if ($expected === $listener->getCallback()) {
@@ -146,7 +148,7 @@ class Zend_EventManager_StaticEventManagerTest extends PHPUnit_Framework_TestCas
             foreach (array('foo', 'test') as $event) {
                 $found     = false;
                 $listeners = $events->getListeners($resource, $event);
-                $this->assertType('Zend_Stdlib_PriorityQueue', $listeners);
+                $this->assertTrue($listeners instanceof Zend_Stdlib_PriorityQueue);
                 $this->assertTrue(0 < count($listeners), 'Empty listeners!');
                 foreach ($listeners as $listener) {
                     if ($expected === $listener->getCallback()) {
@@ -200,7 +202,7 @@ class Zend_EventManager_StaticEventManagerTest extends PHPUnit_Framework_TestCas
         $events = Zend_EventManager_StaticEventManager::getInstance();
         $events->attach('foo', 'bar', array($this, __FUNCTION__));
         $listeners = $events->getListeners('foo', 'bar');
-        $this->assertType('Zend_Stdlib_PriorityQueue', $listeners);
+        $this->assertTrue($listeners instanceof Zend_Stdlib_PriorityQueue);
         $this->assertEquals(1, count($listeners));
     }
 
@@ -221,11 +223,11 @@ class Zend_EventManager_StaticEventManagerTest extends PHPUnit_Framework_TestCas
         $events->attach('foo', 'baz', array($this, __FUNCTION__));
         $events->attach('foo', 'bat', array($this, __FUNCTION__));
         $events->clearListeners('foo', 'baz');
-        $this->assertType('Zend_Stdlib_PriorityQueue', $events->getListeners('foo', 'baz'));
+        $this->assertTrue($events->getListeners('foo', 'baz') instanceof Zend_Stdlib_PriorityQueue);
         $this->assertEquals(0, count($events->getListeners('foo', 'baz')));
-        $this->assertType('Zend_Stdlib_PriorityQueue', $events->getListeners('foo', 'bar'));
+        $this->assertTrue($events->getListeners('foo', 'bar') instanceof Zend_Stdlib_PriorityQueue);
         $this->assertEquals(1, count($events->getListeners('foo', 'bar')));
-        $this->assertType('Zend_Stdlib_PriorityQueue', $events->getListeners('foo', 'bat'));
+        $this->assertTrue($events->getListeners('foo', 'bat') instanceof Zend_Stdlib_PriorityQueue);
         $this->assertEquals(1, count($events->getListeners('foo', 'bat')));
     }
 

tests/Zend/Feed/Pubsubhubbub/Model/SubscriptionTest.php

@@ -46,7 +46,7 @@ class Zend_Feed_Pubsubhubbub_Model_SubscriptionTest extends PHPUnit_Framework_Te
 
         $this->assertTrue($subscription->hasSubscription($id));
         $dataSubscription = $subscription->getSubscription($id);
-        $this->assertType('array', $dataSubscription);
+        $this->assertTrue(is_array($dataSubscription));
         $keys = array('id', 'topic_url', 'hub_url',
                       'created_time', 'lease_seconds',
                       'verify_token', 'secret',

tests/Zend/Filter/InputTest.php

@@ -386,7 +386,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $f1 = $input->field1;
-        $this->assertType('array', $f1);
+        $this->assertTrue(is_array($f1));
         $this->assertEquals(array('foo', 'bar', 'baz'), $f1);
     }
 
@@ -425,15 +425,15 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month'), array_keys($messages));
-        $this->assertType('array', $messages['month']);
+        $this->assertTrue(is_array($messages['month']));
         $this->assertEquals("'6abc ' must contain only digits", current($messages['month']));
 
         $errors = $input->getErrors();
-        $this->assertType('array', $errors);
+        $this->assertTrue(is_array($errors));
         $this->assertEquals(array('month'), array_keys($errors));
-        $this->assertType('array', $errors['month']);
+        $this->assertTrue(is_array($errors['month']));
         $this->assertEquals("notDigits", $errors['month'][0]);
     }
 
@@ -486,7 +486,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('6', $month);
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month2'), array_keys($messages));
         $this->assertEquals("'13' is not between '1' and '12', inclusively", current($messages['month2']));
     }
@@ -513,10 +513,10 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field2', 'field3'), array_keys($messages));
-        $this->assertType('array', $messages['field2']);
-        $this->assertType('array', $messages['field3']);
+        $this->assertTrue(is_array( $messages['field2']));
+        $this->assertTrue(is_array($messages['field3']));
         $this->assertEquals("'abc123' must contain only digits", current($messages['field2']));
         $this->assertEquals("'150' is not between '1' and '100', inclusively",
             current($messages['field3']));
@@ -546,10 +546,10 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field2a', 'field2b'), array_keys($messages));
-        $this->assertType('array', $messages['field2a']);
-        $this->assertType('array', $messages['field2b']);
+        $this->assertTrue(is_array($messages['field2a']));
+        $this->assertTrue(is_array($messages['field2b']));
         $this->assertEquals("'abc123' must contain only digits",
             current($messages['field2a']));
         $this->assertEquals("'abc123' is not between '1' and '100', inclusively",
@@ -595,7 +595,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field2'), array_keys($messages));
         $this->assertEquals("'123' contains non alphabetic characters",
             current($messages['field2']));
@@ -636,7 +636,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
 
         set_include_path($ip);
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('rule2'), array_keys($messages));
         $this->assertEquals("Not all strings in the argument are equal",
             current($messages['rule2']));
@@ -688,7 +688,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
 
         set_include_path($ip);
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('rule2', 'rule3'), array_keys($messages));
         $this->assertEquals(array('isEmpty' => "You must give a non-empty value for field 'password3'"),
                             $messages['rule2']);
@@ -725,7 +725,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field1', 'field2'), array_keys($messages));
         $this->assertEquals(
             $messageUserDefined,
@@ -765,7 +765,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertNull($input->field1);
         $this->assertNotNull($input->field2);
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field1'), array_keys($messages));
         $this->assertEquals("You must give a non-empty value for field 'field1'", current($messages['field1']));
     }
@@ -793,7 +793,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return true');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field1'), array_keys($messages));
         $this->assertEquals("You must give a non-empty value for field 'field1'", current($messages['field1']));
     }
@@ -866,7 +866,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('nick'), array_keys($messages));
         $this->assertEquals(1, count($messages['nick']));
     }
@@ -896,9 +896,9 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
 
         $this->assertNull($input->field1);
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field1Rule'), array_keys($messages));
-        $this->assertType('array', $messages['field1Rule']);
+        $this->assertTrue(is_array($messages['field1Rule']));
         $this->assertEquals("You cannot give an empty value for field 'field1', according to rule 'field1Rule'", current($messages['field1Rule']));
     }
 
@@ -923,7 +923,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $missing = $input->getMissing();
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         // make sure field5 and field7 are not counted as missing
         $this->assertEquals(array('field1', 'field3'), array_keys($missing));
 
@@ -956,7 +956,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $missing = $input->getMissing();
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         $this->assertEquals(array('rule1'), array_keys($missing));
         $this->assertEquals(array("Field 'field2' is required by rule 'rule1', but the field is missing"), $missing['rule1']);
     }
@@ -1012,9 +1012,9 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field2', 'field3'), array_keys($messages));
-        $this->assertType('array', $messages['field2']);
+        $this->assertTrue(is_array($messages['field2']));
         $this->assertEquals("You must give a non-empty value for field 'field2'", current($messages['field2']));
     }
 
@@ -1036,7 +1036,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertEquals(1, count($messages['month']));
         $this->assertEquals($digitsMesg, current($messages['month']));
@@ -1066,7 +1066,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertEquals(2, count($messages['month']));
         $this->assertEquals($digitsMesg, $messages['month']['notDigits']);
@@ -1097,7 +1097,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field1'), array_keys($messages));
         $this->assertEquals(3, count($messages['field1']));
         $this->assertEquals($digitsMesg, $messages['field1']['notDigits']);
@@ -1126,7 +1126,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertEquals(2, count($messages['month']));
         $this->assertEquals("'13abc' must contain only digits", current($messages['month']));
@@ -1153,7 +1153,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertEquals(1, count($messages['month']));
         // $this->assertEquals($digitsMesg, $messages['month'][0]);
@@ -1183,7 +1183,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertEquals(2, count($messages['month']));
         // $this->assertEquals($digitsMesg, $messages['month'][0]);
@@ -1214,7 +1214,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertEquals(2, count($messages['month']));
         // $this->assertEquals($digitsMesg, $messages['month'][0]);
@@ -1272,7 +1272,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $missing = $input->getMissing();
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         $this->assertEquals(array('month'), array_keys($missing));
         $this->assertEquals("Field 'month' is required by rule 'month', but the field is missing", $missing['month'][0]);
     }
@@ -1298,7 +1298,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $missing = $input->getMissing();
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         $this->assertEquals(array('monthRule'), array_keys($missing));
         $this->assertEquals("I looked for month but I did not find it; it is required by rule monthRule", $missing['monthRule'][0]);
     }
@@ -1335,7 +1335,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $unknown = $input->getUnknown();
-        $this->assertType('array', $unknown);
+        $this->assertTrue(is_array($unknown));
         $this->assertThat($unknown, $this->arrayHasKey('unknown'));
     }
 
@@ -1359,11 +1359,11 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $invalid = $input->getInvalid();
         $missing = $input->getMissing();
 
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('month', 'field2'), array_keys($messages));
-        $this->assertType('array', $invalid);
+        $this->assertTrue(is_array($invalid));
         $this->assertEquals(array('month'), array_keys($invalid));
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         $this->assertEquals(array('field2'), array_keys($missing));
         $this->assertEquals(array_merge($invalid, $missing), $messages);
     }
@@ -1432,7 +1432,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('123', (string) $input->field3);
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertThat($messages, $this->arrayHasKey('field1'));
         $this->assertEquals("'abc' must contain only digits", current($messages['field1']));
     }
@@ -1442,14 +1442,14 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $input = new Zend_Filter_Input(null, null);
 
         $loader = $input->getPluginLoader(Zend_Filter_Input::VALIDATE);
-        $this->assertType('Zend_Loader_PluginLoader', $loader,
+        $this->assertTrue($loader instanceof Zend_Loader_PluginLoader,
             'Expected object of type Zend_Loader_PluginLoader, got ' , get_class($loader));
 
         try {
             $loader = $input->getPluginLoader('foo');
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Filter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Filter_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertEquals('Invalid type "foo" provided to getPluginLoader()',
                 $e->getMessage());
@@ -1476,7 +1476,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
             $input->setPluginLoader($loader, 'foo');
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Filter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Filter_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertEquals('Invalid type "foo" provided to setPluginLoader()',
                 $e->getMessage());
@@ -1497,7 +1497,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
             $this->assertTrue($input->hasInvalid(), 'Expected hasInvalid() to return true');
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Loader_PluginLoader_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Loader_PluginLoader_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertContains("not found in the registry", $e->getMessage());
         }
@@ -1519,7 +1519,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
             $this->assertTrue($input->hasInvalid(), 'Expected hasInvalid() to return true');
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Filter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Filter_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertEquals("Class 'Zend_Validate_Exception' based on basename 'Exception' must implement the 'Zend_Validate_Interface' interface",
                 $e->getMessage());
@@ -1549,7 +1549,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
             $input->setDefaultEscapeFilter(new StdClass());
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Filter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Filter_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertEquals("Escape filter specified does not implement Zend_Filter_Interface", $e->getMessage());
         }
@@ -1599,7 +1599,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(array('field1'), array_keys($messages));
         $this->assertEquals(1, count($messages['field1']), 'Expected rule for field1 to break 1 validator');
         $this->assertEquals("'150' is not between '1' and '100', inclusively",
@@ -1657,7 +1657,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('123', (string) $input->field3);
 
         $messages = $input->getMessages();
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertThat($messages, $this->arrayHasKey('field1'));
         $this->assertEquals("'abc' must contain only digits", current($messages['field1']));
     }
@@ -1683,7 +1683,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $missing = $input->getMissing();
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         $this->assertEquals(array('field2'), array_keys($missing));
         $this->assertEquals("Field 'field2' is required by rule 'field2', but the field is missing", $missing['field2'][0]);
     }
@@ -1697,7 +1697,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
             $input = new Zend_Filter_Input(null, null, null, $options);
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Filter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Filter_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertEquals("Unknown option 'unknown'", $e->getMessage());
         }
@@ -1763,7 +1763,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasValid(), 'Expected hasValid() to return true');
 
         $multi = $input->getEscaped('multiSelect');
-        $this->assertType('array', $multi);
+        $this->assertTrue(is_array($multi));
         $this->assertEquals(3, count($multi));
         $this->assertEquals(array('C&H', 'B&O', 'AT&T'), $multi);
     }
@@ -1896,7 +1896,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
             $input->process();
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Filter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Filter_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertEquals("Input has invalid fields", $e->getMessage());
             $this->assertFalse($input->hasMissing(), 'Expected hasMissing() to return false');
@@ -1930,7 +1930,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
             $input->process();
             $this->fail('Expected to catch Zend_Filter_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Filter_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Filter_Exception,
                 'Expected object of type Zend_Filter_Exception, got '.get_class($e));
             $this->assertEquals("Input has missing fields", $e->getMessage());
             $this->assertTrue($input->hasMissing(), 'Expected hasMissing() to return true');
@@ -2149,7 +2149,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($input->hasMissing(), 'Expected hasMissing() to return true');
 
         $missing = $input->getMissing();
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         $this->assertEquals(array('rule1'), array_keys($missing));
         $this->assertEquals(array("Still missing"), $missing['rule1']);
     }
@@ -2178,7 +2178,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($input->hasValid(), 'Expected hasValid() to return false');
 
         $missing = $input->getMissing();
-        $this->assertType('array', $missing);
+        $this->assertTrue(is_array($missing));
         $this->assertEquals(array('rule1'), array_keys($missing));
         $this->assertEquals(array("Still missing"), $missing['rule1']);
     }

tests/Zend/Gdata/AppTest.php

@@ -601,7 +601,7 @@ class Zend_Gdata_AppTest extends PHPUnit_Framework_TestCase
         try { 
             $eq = $this->service->newEventQuery();
             restore_error_handler();
-            $this->assertType('Zend_Gdata_Calendar_EventQuery', $eq);
+            $this->assertTrue($eq instanceof Zend_Gdata_Calendar_EventQuery);
         } catch ( Zend_Gdata_App_Exception $ex ) {
             // If we catch this exception, it means the ErrorException resulting
             // from the include_once E_NOTICE was caught in the right place,

tests/Zend/Gdata/CalendarOnlineTest.php

@@ -71,7 +71,7 @@ class Zend_Gdata_CalendarOnlineTest extends PHPUnit_Framework_TestCase
                 !== false);
         $eventCount = 0;
         foreach ( $eventFeed as $event ) {
-            $this->assertType('Zend_Gdata_Calendar_EventEntry', $event);
+            $this->assertTrue($event instanceof Zend_Gdata_Calendar_EventEntry);
             $eventCount++;
         }
         $this->assertTrue($eventCount > 0 );

tests/Zend/Gdata/GdataTest.php

@@ -78,7 +78,7 @@ class Zend_Gdata_GdataTest extends PHPUnit_Framework_TestCase
             $feed = $gdata->getFeed(new stdClass());
             $this->fail('Expecting to catch Zend_Gdata_App_InvalidArgumentException');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Gdata_App_InvalidArgumentException', $e,
+            $this->assertTrue($e instanceof Zend_Gdata_App_InvalidArgumentException,
                 'Expecting Zend_Gdata_App_InvalidArgumentException, got '.get_class($e));
             $this->assertEquals('You must specify the location as either a string URI or a child of Zend_Gdata_Query', $e->getMessage());
         }
@@ -93,7 +93,7 @@ class Zend_Gdata_GdataTest extends PHPUnit_Framework_TestCase
             $feed = $gdata->getEntry(new stdClass());
             $this->fail('Expecting to catch Zend_Gdata_App_InvalidArgumentException');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Gdata_App_InvalidArgumentException', $e,
+            $this->assertTrue($e instanceof Zend_Gdata_App_InvalidArgumentException,
                 'Expecting Zend_Gdata_App_InvalidArgumentException, got '.get_class($e));
             $this->assertEquals('You must specify the location as either a string URI or a child of Zend_Gdata_Query', $e->getMessage());
         }

tests/Zend/Http/Client/TestAdapterTest.php

@@ -192,7 +192,7 @@ class Zend_Http_Client_TestAdapterTest extends PHPUnit_Framework_TestCase
                 $this->fail();
             } catch (Exception $e) {
                 $class = 'Zend_Http_Client_Adapter_Exception';
-                $this->assertType($class, $e);
+                $this->assertTrue($e instanceof $class);
                 $this->assertRegexp('/out of range/i', $e->getMessage());
             }
         }

tests/Zend/Http/CookieJarTest.php

@@ -401,16 +401,16 @@ class Zend_Http_CookieJarTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(8, count($jar->getAllCookies()), 'Cookie count is expected to be 8');
 
         $cookies = $jar->getMatchingCookies('http://www.foo.com/path/file.txt', true, Zend_Http_CookieJar::COOKIE_STRING_ARRAY);
-        $this->assertType('array', $cookies, '$cookies is expected to be an array, but it is not');
-        $this->assertType('string', $cookies[0], '$cookies[0] is expected to be a string');;
+        $this->assertTrue(is_array($cookies), '$cookies is expected to be an array, but it is not');
+        $this->assertTrue('string', $cookies[0], '$cookies[0] is expected to be a string');;
 
         $cookies = $jar->getMatchingCookies('http://www.foo.com/path/file.txt', true, Zend_Http_CookieJar::COOKIE_STRING_CONCAT);
-        $this->assertType('string', $cookies, '$cookies is expected to be a string');
+        $this->assertTrue(is_string($cookies), '$cookies is expected to be a string');
         $expected = 'foo1=bar1;foo2=bar2;foo4=bar4;foo7=bar7;';
         $this->assertEquals($expected, $cookies, 'Concatenated string is not as expected');
 
         $cookies = $jar->getMatchingCookies('http://www.foo.com/path/file.txt', true, Zend_Http_CookieJar::COOKIE_STRING_CONCAT_STRICT);
-        $this->assertType('string', $cookies, '$cookies is expected to be a string');
+        $this->assertTrue(is_string($cookies), '$cookies is expected to be a string');
         $expected = 'foo1=bar1; foo2=bar2; foo4=bar4; foo7=bar7';
         $this->assertEquals($expected, $cookies, 'Concatenated string is not as expected');
     }
@@ -481,7 +481,7 @@ class Zend_Http_CookieJarTest extends PHPUnit_Framework_TestCase
         foreach ($cookies as $cookie) $jar->addCookie($cookie);
         $cookies = $jar->getMatchingCookies('http://www.example.com/a/b/file.txt');
 
-        $this->assertType('array', $cookies);
+        $this->assertTrue(is_array($cookies));
         $this->assertEquals(2, count($cookies));
     }
 
@@ -494,7 +494,7 @@ class Zend_Http_CookieJarTest extends PHPUnit_Framework_TestCase
         );
         foreach ($cookies as $cookie) $jar->addCookie($cookie);
         foreach ($jar as $cookie) {
-            $this->assertType('Zend_Http_Cookie', $cookie);
+            $this->assertTrue($cookie instanceof Zend_Http_Cookie);
         }
         $this->assertEquals(2, count($jar));
         $this->assertFalse($jar->isEmpty());

tests/Zend/Http/Header/SetCookieTest.php

@@ -69,13 +69,13 @@ class Zend_Http_Header_SetCookieTest extends PHPUnit_Framework_TestCase
     public function testSetCookieFromStringCreatesValidSetCookieHeader()
     {
         $setCookieHeader = Zend_Http_Header_SetCookie::fromString('Set-Cookie: xxx');
-        $this->assertType('Zend_Http_Header_SetCookie', $setCookieHeader);
+        $this->assertTrue($setCookieHeader instanceof Zend_Http_Header_SetCookie);
     }
 
     public function testSetCookieFromStringCanCreateSingleHeader()
     {
         $setCookieHeader = Zend_Http_Header_SetCookie::fromString('Set-Cookie: myname=myvalue');
-        $this->assertType('Zend_Http_Header_SetCookie', $setCookieHeader);
+        $this->assertTrue($setCookieHeader instanceof Zend_Http_Header_SetCookie);
         $this->assertEquals('myname', $setCookieHeader->getName());
         $this->assertEquals('myvalue', $setCookieHeader->getValue());
 
@@ -83,7 +83,7 @@ class Zend_Http_Header_SetCookieTest extends PHPUnit_Framework_TestCase
             'set-cookie: myname=myvalue; Domain=docs.foo.com; Path=/accounts;'
             . 'Expires=Wed, 13-Jan-2021 22:23:01 GMT; Secure; HttpOnly'
         );
-        $this->assertType('Zend_Http_Header_SetCookie', $setCookieHeader);
+        $this->assertTrue($setCookieHeader instanceof Zend_Http_Header_SetCookie);
         $this->assertEquals('myname', $setCookieHeader->getName());
         $this->assertEquals('myvalue', $setCookieHeader->getValue());
         $this->assertEquals('docs.foo.com', $setCookieHeader->getDomain());
@@ -100,15 +100,15 @@ class Zend_Http_Header_SetCookieTest extends PHPUnit_Framework_TestCase
             . 'someothername=someothervalue; Domain=docs.foo.com; Path=/accounts;'
             . 'Expires=Wed, 13-Jan-2021 22:23:01 GMT; Secure; HttpOnly'
         );
-        $this->assertType('array', $setCookieHeaders);
+        $this->assertTrue(is_array($setCookieHeaders));
 
         $setCookieHeader = $setCookieHeaders[0];
-        $this->assertType('Zend_Http_Header_SetCookie', $setCookieHeader);
+        $this->assertTrue($setCookieHeader instanceof Zend_Http_Header_SetCookie);
         $this->assertEquals('myname', $setCookieHeader->getName());
         $this->assertEquals('myvalue', $setCookieHeader->getValue());
 
         $setCookieHeader = $setCookieHeaders[1];
-        $this->assertType('Zend_Http_Header_SetCookie', $setCookieHeader);
+        $this->assertTrue($setCookieHeader instanceof Zend_Http_Header_SetCookie);
         $this->assertEquals('someothername', $setCookieHeader->getName());
         $this->assertEquals('someothervalue', $setCookieHeader->getValue());
         $this->assertEquals('Wed, 13-Jan-2021 22:23:01 GMT', $setCookieHeader->getExpires());

tests/Zend/Http/ResponseTest.php

@@ -249,7 +249,7 @@ class Zend_Http_ResponseTest extends PHPUnit_Framework_TestCase
 
         // Check we get an array if no code is passed
         $codes = Zend_Http_Response::responseCodeAsText();
-        $this->assertType('array', $codes);
+        $this->assertTrue(is_array($codes));
         $this->assertEquals('OK', $codes[200]);
     }
 

tests/Zend/Ldap/AttributeTest.php

@@ -76,7 +76,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $value=Zend_Ldap_Attribute::getAttribute($data, 'uid2', 0);
         $this->assertNull($value);
         $array=Zend_Ldap_Attribute::getAttribute($data, 'uid2');
-        $this->assertType('array', $array);
+        $this->assertTrue(is_array($array));
         $this->assertEquals(0, count($array));
     }
 
@@ -93,7 +93,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
     {
         $data=array('uid' => array('value'));
         $value=Zend_Ldap_Attribute::getAttribute($data, 'uid');
-        $this->assertType('array', $value);
+        $this->assertTrue(is_array());
         $this->assertEquals(1, count($value));
         $this->assertContains('value', $value);
     }
@@ -103,7 +103,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array();
         Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', false);
         $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
+        $this->assertTrue(is_array($data['uid']));
         $this->assertEquals(1, count($data['uid']));
         $this->assertContains('new', $data['uid']);
     }
@@ -113,7 +113,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('uid' => array('old'));
         Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', false);
         $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
+        $this->assertTrue(is_array($data['uid']));
         $this->assertEquals(1, count($data['uid']));
         $this->assertContains('new', $data['uid']);
     }
@@ -123,7 +123,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('uid' => array('old'));
         Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', true);
         $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
+        $this->assertTrue(is_array($data['uid']));
         $this->assertEquals(2, count($data['uid']));
         $this->assertContains('old', $data['uid']);
         $this->assertContains('new', $data['uid']);
@@ -150,7 +150,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array();
         Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), false);
         $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
+        $this->assertTrue(is_array($data['uid']));
         $this->assertEquals(2, count($data['uid']));
         $this->assertContains('new1', $data['uid']);
         $this->assertContains('new2', $data['uid']);
@@ -163,7 +163,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('uid' => array('old'));
         Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), false);
         $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
+        $this->assertTrue(is_array($data['uid']));
         $this->assertEquals(2, count($data['uid']));
         $this->assertContains('new1', $data['uid']);
         $this->assertContains('new2', $data['uid']);
@@ -176,7 +176,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('uid' => array('old'));
         Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), true);
         $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
+        $this->assertTrue(is_array($data['uid']));
         $this->assertEquals(3, count($data['uid']));
         $this->assertContains('old', $data['uid']);
         $this->assertContains('new1', $data['uid']);
@@ -336,7 +336,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
         Zend_Ldap_Attribute::removeFromAttribute($data, 'test', 'value2');
         $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
+        $this->assertTrue(is_array($data['test']));
         $this->assertEquals(3, count($data['test']));
         $this->assertContains('value1', $data['test']);
         $this->assertContains('value3', $data['test']);
@@ -348,7 +348,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
         Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array('value1', 'value2'));
         $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
+        $this->assertTrue(is_array($data['test']));
         $this->assertEquals(2, count($data['test']));
         $this->assertContains('value3', $data['test']);
         $this->assertNotContains('value1', $data['test']);
@@ -360,7 +360,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
         Zend_Ldap_Attribute::removeFromAttribute($data, 'test', 'value3');
         $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
+        $this->assertTrue(is_array($data['test']));
         $this->assertEquals(2, count($data['test']));
         $this->assertContains('value1', $data['test']);
         $this->assertContains('value2', $data['test']);
@@ -372,7 +372,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
         Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array('value1', 'value3'));
         $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
+        $this->assertTrue(is_array($data['test']));
         $this->assertEquals(1, count($data['test']));
         $this->assertContains('value2', $data['test']);
         $this->assertNotContains('value1', $data['test']);
@@ -384,7 +384,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('test' => array('TRUE', 'FALSE', 'TRUE', 'FALSE'));
         Zend_Ldap_Attribute::removeFromAttribute($data, 'test', false);
         $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
+        $this->assertTrue(is_array($data['test']));
         $this->assertEquals(2, count($data['test']));
         $this->assertContains('TRUE', $data['test']);
         $this->assertNotContains('FALSE', $data['test']);
@@ -395,7 +395,7 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $data=array('test' => array('1', '2', '3', '4'));
         Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array(2, 4));
         $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
+        $this->assertTrue(is_array($data['test']));
         $this->assertEquals(2, count($data['test']));
         $this->assertContains('1', $data['test']);
         $this->assertContains('3', $data['test']);

tests/Zend/Ldap/ChangePasswordTest.php

@@ -55,7 +55,9 @@ class Zend_Ldap_ChangePasswordTest extends Zend_Ldap_OnlineTestCase
         try {
             $this->_getLdap()->add($dn, $data);
 
-            $this->assertType('Zend_Ldap', $this->_getLdap()->bind($dn, $password));
+            $this->assertTrue(
+                $this->_getLdap()->bind($dn, $password) instanceof Zend_Ldap
+            );
 
             $this->_getLdap()->bind();
             $this->_getLdap()->delete($dn);
@@ -104,7 +106,9 @@ class Zend_Ldap_ChangePasswordTest extends Zend_Ldap_OnlineTestCase
                     strstr($message, 'Server is unwilling to perform'));
             }
 
-            $this->assertType('Zend_Ldap', $this->_getLdap()->bind($dn, $newPasswd));
+            $this->assertTrue(
+                $this->_getLdap()->bind($dn, $newPasswd) instanceof Zend_Ldap
+            );
 
             $this->_getLdap()->bind();
             $this->_getLdap()->delete($dn);
@@ -144,7 +148,9 @@ class Zend_Ldap_ChangePasswordTest extends Zend_Ldap_OnlineTestCase
         try {
             $this->_getLdap()->add($dn, $data);
 
-            $this->assertType('Zend_Ldap', $this->_getLdap()->bind($dn, $password));
+            $this->assertTrue(
+                $this->_getLdap()->bind($dn, $password) instanceof Zend_Ldap
+            );
 
             $this->_getLdap()->bind();
             $this->_getLdap()->delete($dn);
@@ -200,7 +206,9 @@ class Zend_Ldap_ChangePasswordTest extends Zend_Ldap_OnlineTestCase
                     strstr($message, 'Server is unwilling to perform'));
             }
 
-            $this->assertType('Zend_Ldap', $this->_getLdap()->bind($dn, $newPasswd));
+            $this->assertTrue(
+                $this->_getLdap()->bind($dn, $newPasswd) instanceof Zend_Ldap
+            );
 
             $this->_getLdap()->bind();
             $this->_getLdap()->delete($dn);

tests/Zend/Ldap/Node/ChildrenTest.php

@@ -56,9 +56,9 @@ class Zend_Ldap_Node_ChildrenTest extends Zend_Ldap_OnlineTestCase
     {
         $node=$this->_getLdap()->getBaseNode();
         $children=$node->getChildren();
-        $this->assertType('Zend_Ldap_Node_ChildrenIterator', $children);
+        $this->assertTrue($children instanceof Zend_Ldap_Node_ChildrenIterator);
         $this->assertEquals(6, count($children));
-        $this->assertType('Zend_Ldap_Node', $children['ou=Node']);
+        $this->assertTrue($children['ou=Node'] instanceof Zend_Ldap_Node);
     }
 
     public function testGetChildrenOnDetachedNode()
@@ -66,16 +66,16 @@ class Zend_Ldap_Node_ChildrenTest extends Zend_Ldap_OnlineTestCase
         $node=$this->_getLdap()->getBaseNode();
         $node->detachLdap();
         $children=$node->getChildren();
-        $this->assertType('Zend_Ldap_Node_ChildrenIterator', $children);
+        $this->assertTrue($children instanceof Zend_Ldap_Node_ChildrenIterator);
         $this->assertEquals(0, count($children));
 
         $node->attachLdap($this->_getLdap());
         $node->reload();
         $children=$node->getChildren();
 
-        $this->assertType('Zend_Ldap_Node_ChildrenIterator', $children);
+        $this->assertTrue($children instanceof Zend_Ldap_Node_ChildrenIterator);
         $this->assertEquals(6, count($children));
-        $this->assertType('Zend_Ldap_Node', $children['ou=Node']);
+        $this->assertTrue($children['ou=Node'] instanceof Zend_Ldap_Node);
     }
 
     public function testHasChildrenOnAttachedNode()

tests/Zend/Ldap/Node/OfflineTest.php

@@ -56,7 +56,7 @@ class Zend_Ldap_Node_OfflineTest extends Zend_Ldap_TestCase
     {
         $data=$this->_createTestArrayData();
         $node=Zend_Ldap_Node::fromArray($data);
-        $this->assertType('Zend_Ldap_Node', $node);
+        $this->assertTrue($node instanceof Zend_Ldap_Node);
         $this->assertFalse($node->isAttached());
         $this->assertFalse($node->willBeDeleted());
         $this->assertFalse($node->willBeMoved());
@@ -68,7 +68,7 @@ class Zend_Ldap_Node_OfflineTest extends Zend_Ldap_TestCase
         $data=$this->_createTestArrayData();
         $data['dn']=Zend_Ldap_Dn::fromString($data['dn']);
         $node=Zend_Ldap_Node::fromArray($data);
-        $this->assertType('Zend_Ldap_Node', $node);
+        $this->assertTrue($node instanceof Zend_Ldap_Node);
         $this->assertFalse($node->isAttached());
     }
 
@@ -107,7 +107,7 @@ class Zend_Ldap_Node_OfflineTest extends Zend_Ldap_TestCase
         $data=$this->_createTestArrayData();
         $data['dn']=Zend_Ldap_Dn::fromString($data['dn']);
         $node=Zend_Ldap_Node::fromArray($data);
-        $this->assertType('Zend_Ldap_Node', $node);
+        $this->assertTrue($node instanceof Zend_Ldap_Node);
         $this->assertFalse($node->isAttached());
         unset($data['dn']);
         $this->assertEquals($data, $node->getData());
@@ -346,7 +346,7 @@ class Zend_Ldap_Node_OfflineTest extends Zend_Ldap_TestCase
     public function testAttributeAccessDnGet()
     {
         $node=$this->_createTestNode();
-        $this->assertType('string', $node->dn);
+        $this->assertTrue(is_string($node->dn));
         $this->assertEquals($node->getDn()->toString(), $node->dn);
     }
 

tests/Zend/Ldap/Node/OnlineTest.php

@@ -56,7 +56,7 @@ class Zend_Ldap_Node_OnlineTest extends Zend_Ldap_OnlineTestCase
     {
         $dn=$this->_createDn('ou=Test1,');
         $node=Zend_Ldap_Node::fromLdap($dn, $this->_getLdap());
-        $this->assertType('Zend_Ldap_Node', $node);
+        $this->assertTrue($node instanceof Zend_Ldap_Node);
         $this->assertTrue($node->isAttached());
     }
 
@@ -110,7 +110,7 @@ class Zend_Ldap_Node_OnlineTest extends Zend_Ldap_OnlineTestCase
     {
         $dn=$this->_createDn('ou=Test1,');
         $node=Zend_Ldap_Node::fromLdap($dn, $this->_getLdap());
-        $this->assertType('Zend_Ldap_Node', $node);
+        $this->assertTrue($node instanceof Zend_Ldap_Node);
         $this->assertTrue($node->isAttached());
         $node->detachLdap();
         $this->assertFalse($node->isAttached());
@@ -216,7 +216,7 @@ class Zend_Ldap_Node_OnlineTest extends Zend_Ldap_OnlineTestCase
         $node=$this->_getLdap()->getNode($this->_createDn('ou=Node,'));
         $items=$node->searchSubtree('(objectClass=organizationalUnit)', Zend_Ldap::SEARCH_SCOPE_SUB,
             array(), 'ou');
-        $this->assertType('Zend_Ldap_Node_Collection', $items);
+        $this->assertTrue($items instanceof Zend_Ldap_Node_Collection);
         $this->assertEquals(3, $items->count());
 
         $i=0;
@@ -283,7 +283,7 @@ class Zend_Ldap_Node_OnlineTest extends Zend_Ldap_OnlineTestCase
     {
         $dn=Zend_Ldap_Dn::fromString($this->_createDn('ou=Test1,'));
         $node=Zend_Ldap_Node::fromLdap($dn, $this->_getLdap());
-        $this->assertType('Zend_Ldap_Node', $node);
+        $this->assertTrue($node instanceof Zend_Ldap_Node);
         $this->assertTrue($node->isAttached());
     }
 }

tests/Zend/Ldap/Node/RootDseTest.php

@@ -49,39 +49,39 @@ class Zend_Ldap_Node_RootDseTest extends Zend_Ldap_OnlineTestCase
     {
         $root=$this->_getLdap()->getRootDse();
 
-        $this->assertType('boolean', $root->supportsSaslMechanism('GSSAPI'));
-        $this->assertType('boolean', $root->supportsSaslMechanism(array('GSSAPI', 'DIGEST-MD5')));
-        $this->assertType('boolean', $root->supportsVersion('3'));
-        $this->assertType('boolean', $root->supportsVersion(3));
-        $this->assertType('boolean', $root->supportsVersion(array('3', '2')));
-        $this->assertType('boolean', $root->supportsVersion(array(3, 2)));
+        $this->assertTrue(is_bool($root->supportsSaslMechanism('GSSAPI')));
+        $this->assertTrue(is_bool($root->supportsSaslMechanism(array('GSSAPI', 'DIGEST-MD5'))));
+        $this->assertTrue(is_bool($root->supportsVersion('3')));
+        $this->assertTrue(is_bool($root->supportsVersion(3)));
+        $this->assertTrue(is_bool($root->supportsVersion(array('3', '2'))));
+        $this->assertTrue(is_bool($root->supportsVersion(array(3, 2))));
 
         switch ($root->getServerType()) {
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_ACTIVEDIRECTORY:
-                $this->assertType('boolean', $root->supportsControl('1.2.840.113556.1.4.319'));
-                $this->assertType('boolean', $root->supportsControl(array('1.2.840.113556.1.4.319',
-                    '1.2.840.113556.1.4.473')));
-                $this->assertType('boolean', $root->supportsCapability('1.3.6.1.4.1.4203.1.9.1.1'));
-                $this->assertType('boolean', $root->supportsCapability(array('1.3.6.1.4.1.4203.1.9.1.1',
-                    '2.16.840.1.113730.3.4.18')));
-                $this->assertType('boolean', $root->supportsPolicy('unknown'));
-                $this->assertType('boolean', $root->supportsPolicy(array('unknown', 'unknown')));
+                $this->assertTrue(is_bool($root->supportsControl('1.2.840.113556.1.4.319')));
+                $this->assertTrue(is_bool($root->supportsControl(array('1.2.840.113556.1.4.319',
+                    '1.2.840.113556.1.4.473'))));
+                $this->assertTrue(is_bool($root->supportsCapability('1.3.6.1.4.1.4203.1.9.1.1')));
+                $this->assertTrue(is_bool($root->supportsCapability(array('1.3.6.1.4.1.4203.1.9.1.1',
+                    '2.16.840.1.113730.3.4.18'))));
+                $this->assertTrue(is_bool($root->supportsPolicy('unknown')));
+                $this->assertTrue(is_bool($root->supportsPolicy(array('unknown', 'unknown'))));
                 break;
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_EDIRECTORY:
-                $this->assertType('boolean', $root->supportsExtension('1.3.6.1.4.1.1466.20037'));
-                $this->assertType('boolean', $root->supportsExtension(array('1.3.6.1.4.1.1466.20037',
-                    '1.3.6.1.4.1.4203.1.11.1')));
+                $this->assertTrue(is_bool($root->supportsExtension('1.3.6.1.4.1.1466.20037')));
+                $this->assertTrue(is_bool($root->supportsExtension(array('1.3.6.1.4.1.1466.20037',
+                    '1.3.6.1.4.1.4203.1.11.1'))));
                 break;
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_OPENLDAP:
-                $this->assertType('boolean', $root->supportsControl('1.3.6.1.4.1.4203.1.9.1.1'));
-                $this->assertType('boolean', $root->supportsControl(array('1.3.6.1.4.1.4203.1.9.1.1',
-                    '2.16.840.1.113730.3.4.18')));
-                $this->assertType('boolean', $root->supportsExtension('1.3.6.1.4.1.1466.20037'));
-                $this->assertType('boolean', $root->supportsExtension(array('1.3.6.1.4.1.1466.20037',
-                    '1.3.6.1.4.1.4203.1.11.1')));
-                $this->assertType('boolean', $root->supportsFeature('1.3.6.1.1.14'));
-                $this->assertType('boolean', $root->supportsFeature(array('1.3.6.1.1.14',
-                    '1.3.6.1.4.1.4203.1.5.1')));
+                $this->assertTrue(is_bool($root->supportsControl('1.3.6.1.4.1.4203.1.9.1.1')));
+                $this->assertTrue(is_bool($root->supportsControl(array('1.3.6.1.4.1.4203.1.9.1.1',
+                    '2.16.840.1.113730.3.4.18'))));
+                $this->assertTrue(is_bool($root->supportsExtension('1.3.6.1.4.1.1466.20037')));
+                $this->assertTrue(is_bool($root->supportsExtension(array('1.3.6.1.4.1.1466.20037',
+                    '1.3.6.1.4.1.4203.1.11.1'))));
+                $this->assertTrue(is_bool($root->supportsFeature('1.3.6.1.1.14')));
+                $this->assertTrue(is_bool($root->supportsFeature(array('1.3.6.1.1.14',
+                    '1.3.6.1.4.1.4203.1.5.1'))));
                 break;
         }
     }
@@ -90,38 +90,38 @@ class Zend_Ldap_Node_RootDseTest extends Zend_Ldap_OnlineTestCase
     {
         $root=$this->_getLdap()->getRootDse();
 
-        $this->assertType('array', $root->getNamingContexts());
-        $this->assertType('string', $root->getSubschemaSubentry());
+        $this->assertTrue(is_array($root->getNamingContexts()));
+        $this->assertTrue(is_array($root->getSubschemaSubentry()));
 
         switch ($root->getServerType()) {
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_ACTIVEDIRECTORY:
-                $this->assertType('string', $root->getConfigurationNamingContext());
-                $this->assertType('string', $root->getCurrentTime());
-                $this->assertType('string', $root->getDefaultNamingContext());
-                $this->assertType('string', $root->getDnsHostName());
-                $this->assertType('string', $root->getDomainControllerFunctionality());
-                $this->assertType('string', $root->getDomainFunctionality());
-                $this->assertType('string', $root->getDsServiceName());
-                $this->assertType('string', $root->getForestFunctionality());
-                $this->assertType('string', $root->getHighestCommittedUSN());
-                $this->assertType('boolean', $root->getIsGlobalCatalogReady());
-                $this->assertType('boolean', $root->getIsSynchronized());
-                $this->assertType('string', $root->getLdapServiceName());
-                $this->assertType('string', $root->getRootDomainNamingContext());
-                $this->assertType('string', $root->getSchemaNamingContext());
-                $this->assertType('string', $root->getServerName());
+                $this->assertTrue(is_string($root->getConfigurationNamingContext()));
+                $this->assertTrue(is_string($root->getCurrentTime()));
+                $this->assertTrue(is_string($root->getDefaultNamingContext()));
+                $this->assertTrue(is_string($root->getDnsHostName()));
+                $this->assertTrue(is_string($root->getDomainControllerFunctionality()));
+                $this->assertTrue(is_string($root->getDomainFunctionality()));
+                $this->assertTrue(is_string($root->getDsServiceName()));
+                $this->assertTrue(is_string($root->getForestFunctionality()));
+                $this->assertTrue(is_string($root->getHighestCommittedUSN()));
+                $this->assertTrue(is_bool($root->getIsGlobalCatalogReady()));
+                $this->assertTrue(is_bool($root->getIsSynchronized()));
+                $this->assertTrue(is_string($root->getLdapServiceName()));
+                $this->assertTrue(is_string($root->getRootDomainNamingContext()));
+                $this->assertTrue(is_string($root->getSchemaNamingContext()));
+                $this->assertTrue(is_string($root->getServerName()));
                 break;
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_EDIRECTORY:
-                $this->assertType('string', $root->getVendorName());
-                $this->assertType('string', $root->getVendorVersion());
-                $this->assertType('string', $root->getDsaName());
-                $this->assertType('string', $root->getStatisticsErrors());
-                $this->assertType('string', $root->getStatisticsSecurityErrors());
-                $this->assertType('string', $root->getStatisticsChainings());
-                $this->assertType('string', $root->getStatisticsReferralsReturned());
-                $this->assertType('string', $root->getStatisticsExtendedOps());
-                $this->assertType('string', $root->getStatisticsAbandonOps());
-                $this->assertType('string', $root->getStatisticsWholeSubtreeSearchOps());
+                $this->assertTrue(is_string($root->getVendorName()));
+                $this->assertTrue(is_string($root->getVendorVersion()));
+                $this->assertTrue(is_string($root->getDsaName()));
+                $this->assertTrue(is_string($root->getStatisticsErrors()));
+                $this->assertTrue(is_string($root->getStatisticsSecurityErrors()));
+                $this->assertTrue(is_string($root->getStatisticsChainings()));
+                $this->assertTrue(is_string($root->getStatisticsReferralsReturned()));
+                $this->assertTrue(is_string($root->getStatisticsExtendedOps()));
+                $this->assertTrue(is_string($root->getStatisticsAbandonOps()));
+                $this->assertTrue(is_string($root->getStatisticsWholeSubtreeSearchOps()));
                 break;
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_OPENLDAP:
                 $this->_assertNullOrString($root->getConfigContext());
@@ -135,7 +135,7 @@ class Zend_Ldap_Node_RootDseTest extends Zend_Ldap_OnlineTestCase
         if ($value===null) {
             $this->assertNull($value);
         } else {
-            $this->assertType('string', $value);
+            $this->assertTrue(is_string($value));
         }
     }
 

tests/Zend/Ldap/Node/SchemaTest.php

@@ -62,8 +62,8 @@ class Zend_Ldap_Node_SchemaTest extends Zend_Ldap_OnlineTestCase
 
     public function testGetters()
     {
-        $this->assertType('array', $this->_schema->getAttributeTypes());
-        $this->assertType('array', $this->_schema->getObjectClasses());
+        $this->assertTrue(is_array($this->_schema->getAttributeTypes()));
+        $this->assertTrue(is_array($this->_schema->getObjectClasses()));
 
         switch ($this->_getLdap()->getRootDse()->getServerType()) {
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_ACTIVEDIRECTORY:
@@ -71,9 +71,9 @@ class Zend_Ldap_Node_SchemaTest extends Zend_Ldap_OnlineTestCase
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_EDIRECTORY:
                 break;
             case Zend_Ldap_Node_RootDse::SERVER_TYPE_OPENLDAP:
-                $this->assertType('array', $this->_schema->getLdapSyntaxes());
-                $this->assertType('array', $this->_schema->getMatchingRules());
-                $this->assertType('array', $this->_schema->getMatchingRuleUse());
+                $this->assertTrue(is_array($this->_schema->getLdapSyntaxes()));
+                $this->assertTrue(is_array($this->_schema->getMatchingRules()));
+                $this->assertTrue(is_array($this->_schema->getMatchingRuleUse()));
                 break;
         }
     }
@@ -122,7 +122,7 @@ class Zend_Ldap_Node_SchemaTest extends Zend_Ldap_OnlineTestCase
 
         $this->assertArrayHasKey('organizationalUnit', $objectClasses);
         $ou=$objectClasses['organizationalUnit'];
-        $this->assertType('Zend_Ldap_Node_Schema_ObjectClass_OpenLdap', $ou);
+        $this->assertTrue($ou instanceof Zend_Ldap_Node_Schema_ObjectClass_OpenLdap);
         $this->assertEquals('organizationalUnit', $ou->getName());
         $this->assertEquals('2.5.6.5', $ou->getOid());
         $this->assertEquals(array('objectClass', 'ou'), $ou->getMustContain());
@@ -163,7 +163,7 @@ class Zend_Ldap_Node_SchemaTest extends Zend_Ldap_OnlineTestCase
 
         $this->assertArrayHasKey('ou', $attributeTypes);
         $ou=$attributeTypes['ou'];
-        $this->assertType('Zend_Ldap_Node_Schema_AttributeType_OpenLdap', $ou);
+        $this->assertTrue($ou instanceof Zend_Ldap_Node_Schema_AttributeType_OpenLdap);
         $this->assertEquals('ou', $ou->getName());
         $this->assertEquals('2.5.4.11', $ou->getOid());
         $this->assertEquals('1.3.6.1.4.1.1466.115.121.1.15', $ou->getSyntax());

tests/Zend/Ldap/SearchTest.php

@@ -139,7 +139,7 @@ class Zend_Ldap_SearchTest extends Zend_Ldap_OnlineTestCase
     {
         $entries=$this->_getLdap()->searchEntries('(objectClass=organizationalUnit)',
             TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, Zend_Ldap::SEARCH_SCOPE_SUB);
-        $this->assertType("array", $entries);
+        $this->assertTrue(is_array($entries));
         $this->assertEquals(9, count($entries));
     }
 
@@ -238,7 +238,7 @@ class Zend_Ldap_SearchTest extends Zend_Ldap_OnlineTestCase
         $filter=Zend_Ldap_Filter::equals('objectClass', 'organizationalUnit');
 
         $entries=$this->_getLdap()->searchEntries($filter, $dn, Zend_Ldap::SEARCH_SCOPE_SUB);
-        $this->assertType("array", $entries);
+        $this->assertTrue(is_array($entries));
         $this->assertEquals(9, count($entries));
     }
 
@@ -443,7 +443,9 @@ class Zend_Ldap_SearchTest extends Zend_Ldap_OnlineTestCase
     {
         $items = $this->_getLdap()->search('(objectClass=organizationalUnit)',
             TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, Zend_Ldap::SEARCH_SCOPE_SUB);
-        $this->assertType('Zend_Ldap_Collection_Iterator_Default', $items->getInnerIterator());
+        $this->assertTrue(
+            $items->getInnerIterator() instanceof Zend_Ldap_Collection_Iterator_Default
+        );
     }
 
     /**
@@ -455,7 +457,7 @@ class Zend_Ldap_SearchTest extends Zend_Ldap_OnlineTestCase
             TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, Zend_Ldap::SEARCH_SCOPE_SUB);
         $this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $items->getInnerIterator()->key());
         $current = $items->getInnerIterator()->current();
-        $this->assertType('array', $current);
+        $this->assertTrue(is_array($current));
         $this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $current['dn']);
     }
 
@@ -469,7 +471,7 @@ class Zend_Ldap_SearchTest extends Zend_Ldap_OnlineTestCase
         $this->assertEquals(0, $items->key());
         $this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $items->dn());
         $current = $items->current();
-        $this->assertType('array', $current);
+        $this->assertTrue(is_array($current));
         $this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $current['dn']);
     }
 
@@ -506,7 +508,7 @@ class Zend_Ldap_SearchTest extends Zend_Ldap_OnlineTestCase
         $this->assertEquals(9, $items->count());
         $this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $items->getInnerIterator()->key());
         $current = $items->current();
-        $this->assertType('array', $current);
+        $this->assertTrue(is_array($current));
         $this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $current['dn']);
 
         $i=0;

tests/Zend/Loader/AutoloaderFactoryTest.php

@@ -170,14 +170,14 @@ class Zend_Loader_AutoloaderFactoryTest extends PHPUnit_Framework_TestCase
             ),
         ));
         $autoloader = Zend_Loader_AutoloaderFactory::getRegisteredAutoloader('Zend_Loader_StandardAutoloader');
-        $this->assertType('Zend_Loader_StandardAutoloader', $autoloader);
+        $this->assertTrue($autoloader instanceof Zend_Loader_StandardAutoloader);
     }
 
     public function testDefaultAutoloader()
     {
         Zend_Loader_AutoloaderFactory::factory();
         $autoloader = Zend_Loader_AutoloaderFactory::getRegisteredAutoloader('Zend_Loader_StandardAutoloader');
-        $this->assertType('Zend_Loader_StandardAutoloader', $autoloader);
+        $this->assertTrue($autoloader instanceof Zend_Loader_StandardAutoloader);
         $this->assertEquals(1, count(Zend_Loader_AutoloaderFactory::getRegisteredAutoloaders()));
     }
 
@@ -212,7 +212,7 @@ class Zend_Loader_AutoloaderFactoryTest extends PHPUnit_Framework_TestCase
         $loaders = Zend_Loader_AutoloaderFactory::getRegisteredAutoloaders();
         $this->assertEquals(1, count($loaders));
         $loader = array_shift($loaders);
-        $this->assertType('Zend_Loader_StandardAutoloader', $loader);
+        $this->assertTrue($loader instanceof Zend_Loader_StandardAutoloader);
 
         $test  = array($loader, 'autoload');
         $found = false;

tests/Zend/Loader/PluginLoaderTest.php

@@ -114,7 +114,7 @@ class Zend_Loader_PluginLoaderTest extends PHPUnit_Framework_TestCase
                ->addPrefixPath('Zend_Loader', $this->libPath . '/Zend/Loader');
         $paths = $loader->getPaths();
 
-        $this->assertType('array', $paths);
+        $this->assertTrue(is_array($paths));
         $this->assertEquals(1, count($paths['Zend_Loader_']));
     }
 
@@ -505,7 +505,7 @@ class Zend_Loader_PluginLoaderTest extends PHPUnit_Framework_TestCase
             $loader->removePrefixPath('My_Namespace_', 'ZF9721');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Loader_PluginLoader_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Loader_PluginLoader_Exception);
             $this->assertContains('Prefix My_Namespace_ / Path ZF9721', $e->getMessage());
         }
         $this->assertEquals(1, count($loader->getPaths('My_Namespace_')));

tests/Zend/LoaderTest.php

@@ -361,7 +361,7 @@ class Zend_LoaderTest extends PHPUnit_Framework_TestCase
             'Expected Zend_Loader_AutoloadableClass to be loaded');
 
         // and we verify it is the correct type
-        $this->assertType('Zend_Loader_AutoloadableClass', $obj,
+        $this->assertTrue($obj instanceof Zend_Loader_AutoloadableClass,
             'Expected to instantiate Zend_Loader_AutoloadableClass, got '.get_class($obj));
 
         spl_autoload_unregister($function);

tests/Zend/Log/Filter/MessageTest.php

@@ -52,7 +52,7 @@ class Zend_Log_Filter_MessageTest extends PHPUnit_Framework_TestCase
             $filter = new Zend_Log_Filter_Message('invalid regexp');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegexp('/invalid reg/i', $e->getMessage());
         }
     }

tests/Zend/Log/Filter/PriorityTest.php

@@ -72,7 +72,7 @@ class Zend_Log_Filter_PriorityTest extends PHPUnit_Framework_TestCase
             new Zend_Log_Filter_Priority('foo');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/must be an integer/i', $e->getMessage());
         }
     }
@@ -98,7 +98,7 @@ class Zend_Log_Filter_PriorityTest extends PHPUnit_Framework_TestCase
                 'filterParams' => array(),
             )));
         } catch(Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/must be an integer/', $e->getMessage());
         }
     }

tests/Zend/Log/Formatter/FirebugTest.php

@@ -64,7 +64,7 @@ class Zend_Log_Formatter_FirebugTest extends PHPUnit_Framework_TestCase
     {
         $options = array();
         $formatter = Zend_Log_Formatter_Firebug::factory($options);
-        $this->assertType('Zend_Log_Formatter_Firebug', $formatter);
+        $this->assertTrue($formatter instanceof Zend_Log_Formatter_Firebug);
     }
 }
 

tests/Zend/Log/Formatter/SimpleTest.php

@@ -49,7 +49,7 @@ class Zend_Log_Formatter_SimpleTest extends PHPUnit_Framework_TestCase
             new Zend_Log_Formatter_Simple(1);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/must be a string/i', $e->getMessage());
         }
     }
@@ -121,7 +121,7 @@ class Zend_Log_Formatter_SimpleTest extends PHPUnit_Framework_TestCase
             'format' => '%timestamp% [%priority%]: %message% -- %info%'
         );
         $formatter = Zend_Log_Formatter_Simple::factory($options);
-        $this->assertType('Zend_Log_Formatter_Simple', $formatter);
+        $this->assertTrue($formatter instanceof Zend_Log_Formatter_Simple);
     }
 }
 

tests/Zend/Log/Formatter/XmlTest.php

@@ -73,7 +73,7 @@ class Zend_Log_Formatter_XmlTest extends PHPUnit_Framework_TestCase
         $line = $f->format(array('message' => 'foo', 'priority' => 42));
 
         $sxml = @simplexml_load_string($line);
-        $this->assertType('SimpleXMLElement', $sxml, 'Formatted XML is invalid');
+        $this->assertTrue($sxml instanceof SimpleXMLElement, 'Formatted XML is invalid');
     }
 
     /**
@@ -135,7 +135,7 @@ class Zend_Log_Formatter_XmlTest extends PHPUnit_Framework_TestCase
             )
         );
         $formatter = Zend_Log_Formatter_Xml::factory($options);
-        $this->assertType('Zend_Log_Formatter_Xml', $formatter);
+        $this->assertTrue($formatter instanceof Zend_Log_Formatter_Xml);
     }
     
     /**

tests/Zend/Log/LogTest.php

@@ -146,7 +146,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->log('foo', 42);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/bad log priority/i', $e->getMessage());
         }
     }
@@ -158,7 +158,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->nonexistantPriority('');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/bad log priority/i', $e->getMessage());
         }
     }
@@ -170,7 +170,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->addPriority('BOB', 0);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/existing priorities/i', $e->getMessage());
         }
 
@@ -389,7 +389,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
             $writer = array('writerName' => 'NotExtendedWriterAbstract');
             $logger->addWriter($writer);
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('#^(Zend_Log_Writer_NotExtendedWriterAbstract|The\sspecified\swriter)#', $e->getMessage());
         }
     }
@@ -404,7 +404,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
             $filter = array('filterName' => 'NotImplementsFilterInterface');
             $logger->addFilter($filter);
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('#^(Zend_Log_Filter_NotImplementsFilterInterface|The\sspecified\sfilter)#', $e->getMessage());
         }
     }
@@ -435,7 +435,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->addPriority('emerg', 8);
             $this->fail();
         } catch(Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertEquals('Existing priorities cannot be overwritten', $e->getMessage());
         }
 
@@ -444,7 +444,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->log('clone zf10170', 8);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertEquals('Bad log priority', $e->getMessage());
         }
         $this->assertEquals(0, $mock->events[0]['priority']);

tests/Zend/Log/Writer/MailTest.php

@@ -319,7 +319,7 @@ class Zend_Log_Writer_MailTest extends PHPUnit_Framework_TestCase
     	);
 
     	$writer = Zend_Log_Writer_Mail::factory($config);
-    	$this->assertType('Zend_Log_Writer_Mail', $writer);
+    	$this->assertTrue($writer instanceof Zend_Log_Writer_Mail);
 
     	$writer->write($this->_getEvent());
     	$writer->shutdown();
@@ -358,7 +358,7 @@ class Zend_Log_Writer_MailTest extends PHPUnit_Framework_TestCase
     	);
 
     	$writer = Zend_Log_Writer_Mail::factory($config);
-    	$this->assertType('Zend_Log_Writer_Mail', $writer);
+    	$this->assertTrue($writer instanceof Zend_Log_Writer_Mail);
     }
 
     /**
@@ -444,7 +444,7 @@ class Zend_Log_Writer_MailTest extends PHPUnit_Framework_TestCase
     	);
 
     	$writer = Zend_Log_Writer_Mail::factory($config);
-    	$this->assertType('Zend_Log_Formatter_Simple', $writer->getLayoutFormatter());
+    	$this->assertTrue($writer->getLayoutFormatter() instanceof Zend_Log_Formatter_Simple);
     }
 
     /**
@@ -458,7 +458,7 @@ class Zend_Log_Writer_MailTest extends PHPUnit_Framework_TestCase
     	);
 
     	$writer = Zend_Log_Writer_Mail::factory($config);
-    	$this->assertType('Zend_Log_Writer_Mail', $writer);
+    	$this->assertTrue($writer instanceof Zend_Log_Writer_Mail);
     }
 
     /**

tests/Zend/Log/Writer/StreamTest.php

@@ -53,7 +53,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
             new Zend_Log_Writer_Stream($resource);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/not a stream/i', $e->getMessage());
         }
         xml_parser_free($resource);
@@ -77,7 +77,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
             new Zend_Log_Writer_Stream($stream, 'w+');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/existing stream/i', $e->getMessage());
         }
     }
@@ -88,7 +88,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
             new Zend_Log_Writer_Stream('');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/cannot be opened/i', $e->getMessage());
         }
     }
@@ -118,7 +118,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
             $writer->write(array('message' => 'foo'));
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/unable to write/i', $e->getMessage());
         }
     }
@@ -134,7 +134,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
             $writer->write(array('message' => 'this write should fail'));
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/unable to write/i', $e->getMessage());
         }
     }

tests/Zend/Log/Writer/SyslogTest.php

@@ -70,7 +70,7 @@ class Zend_Log_Writer_SyslogTest extends PHPUnit_Framework_TestCase
             $writer = new Zend_Log_Writer_Syslog();
             $writer->setFacility(LOG_USER * 1000);
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertContains('Invalid log facility provided', $e->getMessage());
         }
     }
@@ -87,7 +87,7 @@ class Zend_Log_Writer_SyslogTest extends PHPUnit_Framework_TestCase
             $writer = new Zend_Log_Writer_Syslog();
             $writer->setFacility(LOG_AUTH);
         } catch (Exception $e) {
-            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertContains('Only LOG_USER is a valid', $e->getMessage());
         }
     }

tests/Zend/Log/Writer/ZendMonitorTest.php

@@ -63,7 +63,7 @@ class Zend_Log_Writer_ZendMonitorTest extends PHPUnit_Framework_TestCase
     public function testIsEnabled()
     {
         $writer = new Zend_Log_Writer_ZendMonitor();
-        $this->assertType('boolean', $writer->isEnabled());
+        $this->assertTrue(is_bool($writer->isEnabled()));
     }
 }
 

tests/Zend/Mime/MessageTest.php

@@ -62,13 +62,13 @@ class Zend_Mime_MessageTest extends PHPUnit_Framework_TestCase
     {
         $msg = new Zend_Mime_Message();  // No Parts
         $m = $msg->getMime();
-        $this->assertType('Zend_Mime', $m);
+        $this->assertTrue($m instanceof Zend_Mime);
 
         $msg = new Zend_Mime_Message();  // No Parts
         $mime = new Zend_Mime('1234');
         $msg->setMime($mime);
         $m2 = $msg->getMime();
-        $this->assertType('Zend_Mime', $m2);
+        $this->assertTrue($m2 instanceof Zend_Mime);
         $this->assertEquals('1234', $m2->boundary());
     }
 

tests/Zend/Oauth/Oauth/ConsumerTest.php

@@ -206,7 +206,7 @@ class Zend_Oauth_ConsumerTest extends PHPUnit_Framework_TestCase
         $config = array('consumerKey'=>'12345','consumerSecret'=>'54321');
         $consumer = new Zend_Oauth_Consumer($config);
         $token = $consumer->getRequestToken(null, null, new Test_Http_RequestToken_48231);
-        $this->assertType('Zend_Oauth_Token_Request', $token);
+        $this->assertTrue($token instanceof Zend_Oauth_Token_Request);
     }
 
     public function testGetRedirectUrlReturnsUserAuthorizationUrlWithParameters()
@@ -232,21 +232,21 @@ class Zend_Oauth_ConsumerTest extends PHPUnit_Framework_TestCase
         $rtoken = new Zend_Oauth_Token_Request;
         $rtoken->setToken('token');
         $token = $consumer->getAccessToken(array('oauth_token'=>'token'), $rtoken, null, new Test_Http_AccessToken_48231);
-        $this->assertType('Zend_Oauth_Token_Access', $token);
+        $this->assertTrue($token instanceof Zend_Oauth_Token_Access);
     }
 
     public function testGetLastRequestTokenReturnsInstanceWhenExists()
     {
         $config = array('consumerKey'=>'12345','consumerSecret'=>'54321');
         $consumer = new Test_Consumer_48231($config);
-        $this->assertType('Zend_Oauth_Token_Request', $consumer->getLastRequestToken());
+        $this->assertTrue($consumer->getLastRequestToken() instanceof Zend_Oauth_Token_Request);
     }
 
     public function testGetLastAccessTokenReturnsInstanceWhenExists()
     {
         $config = array('consumerKey'=>'12345','consumerSecret'=>'54321');
         $consumer = new Test_Consumer_48231($config);
-        $this->assertType('Zend_Oauth_Token_Access', $consumer->getLastAccessToken());
+        $this->assertTrue($consumer->getLastAccessToken() instanceof Zend_Oauth_Token_Access);
     }
 
 }

tests/Zend/Oauth/Oauth/Http/AccessTokenTest.php

@@ -51,7 +51,7 @@ class Zend_Oauth_Http_AccessTokenTest extends PHPUnit_Framework_TestCase
     public function testConstructorSetsConsumerInstance()
     {
         $request = new Zend_Oauth_Http_AccessToken($this->stubConsumer, null, $this->stubHttpUtility);
-        $this->assertType('Test_Consumer_39745', $request->getConsumer());
+        $this->assertTrue($request->getConsumer() instanceof Test_Consumer_39745);
     }
 
     public function testConstructorSetsCustomServiceParameters()

tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php

@@ -52,7 +52,7 @@ class Zend_Oauth_Http_RequestTokenTest extends PHPUnit_Framework_TestCase
     public function testConstructorSetsConsumerInstance()
     {
         $request = new Zend_Oauth_Http_RequestToken($this->stubConsumer, null, $this->stubHttpUtility);
-        $this->assertType('Test_Consumer_32874', $request->getConsumer());
+        $this->assertTrue($request->getConsumer() instanceof Test_Consumer_32874);
     }
 
     public function testConstructorSetsCustomServiceParameters()

tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php

@@ -44,7 +44,7 @@ class Zend_Oauth_Http_UserAuthorizationTest extends PHPUnit_Framework_TestCase
     public function testConstructorSetsConsumerInstance()
     {
         $redirect = new Zend_Oauth_Http_UserAuthorization($this->stubConsumer);
-        $this->assertType('Test_Consumer_34879', $redirect->getConsumer());
+        $this->assertTrue($redirect->getConsumer() instanceof Test_Consumer_34879);
     }
 
     public function testConstructorSetsCustomServiceParameters()

tests/Zend/Oauth/Oauth/Token/AccessTest.php

@@ -39,7 +39,7 @@ class Zend_Oauth_Token_AccessTest extends PHPUnit_Framework_TestCase
     {
         $response = new Zend_Http_Response(200, array());
         $token = new Zend_Oauth_Token_Access($response);
-        $this->assertType('Zend_Http_Response', $token->getResponse());
+        $this->assertTrue($token->getResponse() instanceof Zend_Http_Response);
     }
 
     public function testConstructorParsesRequestTokenFromResponseBody()

tests/Zend/Oauth/Oauth/Token/RequestTest.php

@@ -38,7 +38,7 @@ class Zend_Oauth_Token_RequestTest extends PHPUnit_Framework_TestCase
     {
         $response = new Zend_Http_Response(200, array());
         $token = new Zend_Oauth_Token_Request($response);
-        $this->assertType('Zend_Http_Response', $token->getResponse());
+        $this->assertTrue($token->getResponse() instanceof Zend_Http_Response);
     }
 
     public function testConstructorParsesRequestTokenFromResponseBody()

tests/Zend/Oauth/OauthTest.php

@@ -43,7 +43,7 @@ class Zend_OauthTest extends PHPUnit_Framework_TestCase
     public function testCanSetCustomHttpClient()
     {
         Zend_Oauth::setHttpClient(new Test_Http_Client_19485876());
-        $this->assertType('Test_Http_Client_19485876', Zend_Oauth::getHttpClient());
+        $this->assertTrue(Zend_Oauth::getHttpClient() instanceof Test_Http_Client_19485876);
     }
 
     public function testGetHttpClientResetsParameters()