Fix PHPUnit deprecation warnings

diff --git a/framework/Log/test/Horde/Log/Filter/LevelTest.php b/framework/Log/test/Horde/Log/Filter/LevelTest.php
index e0aeac1..86b64a0 100644 (file)
--- a/framework/Log/test/Horde/Log/Filter/LevelTest.php
+++ b/framework/Log/test/Horde/Log/Filter/LevelTest.php
@@ -48,7 +48,7 @@ class Horde_Log_Filter_LevelTest extends PHPUnit_Framework_TestCase
             new Horde_Log_Filter_Level('foo');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('InvalidArgumentException', $e);
+            $this->assertInstanceOf('InvalidArgumentException', $e);
             $this->assertRegExp('/must be an integer/i', $e->getMessage());
         }
     }

diff --git a/framework/Log/test/Horde/Log/Formatter/SimpleTest.php b/framework/Log/test/Horde/Log/Formatter/SimpleTest.php
index d18c2ab..aa82714 100644 (file)
--- a/framework/Log/test/Horde/Log/Formatter/SimpleTest.php
+++ b/framework/Log/test/Horde/Log/Formatter/SimpleTest.php
@@ -30,7 +30,7 @@ class Horde_Log_Formatter_SimpleTest extends PHPUnit_Framework_TestCase
             new Horde_Log_Formatter_Simple(1);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('InvalidArgumentException', $e);
+            $this->assertInstanceOf('InvalidArgumentException', $e);
             $this->assertRegExp('/must be a string/i', $e->getMessage());
         }
     }

diff --git a/framework/Log/test/Horde/Log/Formatter/XmlTest.php b/framework/Log/test/Horde/Log/Formatter/XmlTest.php
index 2484369..551c5de 100644 (file)
--- a/framework/Log/test/Horde/Log/Formatter/XmlTest.php
+++ b/framework/Log/test/Horde/Log/Formatter/XmlTest.php
@@ -50,6 +50,6 @@ class Horde_Log_Formatter_XmlTest extends PHPUnit_Framework_TestCase
         $line = $f->format(array('message' => $message = 'message', 'level' => $level = 1));
 
         $sxml = @simplexml_load_string($line);
-        $this->assertType('SimpleXMLElement', $sxml, 'Formatted XML is invalid');
+        $this->assertInstanceOf('SimpleXMLElement', $sxml, 'Formatted XML is invalid');
     }
 }

diff --git a/framework/Log/test/Horde/Log/Handler/FirebugTest.php b/framework/Log/test/Horde/Log/Handler/FirebugTest.php
index ee6dc1c..8ffb887 100644 (file)
--- a/framework/Log/test/Horde/Log/Handler/FirebugTest.php
+++ b/framework/Log/test/Horde/Log/Handler/FirebugTest.php
@@ -36,7 +36,7 @@ class Horde_Log_Handler_FirebugTest extends PHPUnit_Framework_TestCase
             $handler->setOption('foo', 42);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/unknown option/i', $e->getMessage());
         }
     }

diff --git a/framework/Log/test/Horde/Log/Handler/StreamTest.php b/framework/Log/test/Horde/Log/Handler/StreamTest.php
index c072d15..3b38bbe 100644 (file)
--- a/framework/Log/test/Horde/Log/Handler/StreamTest.php
+++ b/framework/Log/test/Horde/Log/Handler/StreamTest.php
@@ -36,7 +36,7 @@ class Horde_Log_Handler_StreamTest extends PHPUnit_Framework_TestCase
             new Horde_Log_Handler_Stream($resource);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/not a stream/i', $e->getMessage());
         }
         xml_parser_free($resource);
@@ -60,7 +60,7 @@ class Horde_Log_Handler_StreamTest extends PHPUnit_Framework_TestCase
             new Horde_Log_Handler_Stream($stream, 'w');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/existing stream/i', $e->getMessage());
         }
     }
@@ -71,7 +71,7 @@ class Horde_Log_Handler_StreamTest extends PHPUnit_Framework_TestCase
             new Horde_Log_Handler_Stream('');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/cannot be opened/i', $e->getMessage());
         }
     }
@@ -83,7 +83,7 @@ class Horde_Log_Handler_StreamTest extends PHPUnit_Framework_TestCase
             $handler->setOption('foo', 42);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/unknown option/i', $e->getMessage());
         }
     }
@@ -117,7 +117,7 @@ class Horde_Log_Handler_StreamTest extends PHPUnit_Framework_TestCase
             $handler->write(array('message' => 'foo', 'level' => 1));
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/unable to write/i', $e->getMessage());
         }
     }

diff --git a/framework/Log/test/Horde/Log/LogTest.php b/framework/Log/test/Horde/Log/LogTest.php
index 942fc5a..a32a37f 100644 (file)
--- a/framework/Log/test/Horde/Log/LogTest.php
+++ b/framework/Log/test/Horde/Log/LogTest.php
@@ -102,7 +102,7 @@ class Horde_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->log('foo', 42);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/bad log level/i', $e->getMessage());
         }
     }
@@ -114,7 +114,7 @@ class Horde_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->nonexistantLevel('');
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/bad log level/i', $e->getMessage());
         }
     }
@@ -126,7 +126,7 @@ class Horde_Log_LogTest extends PHPUnit_Framework_TestCase
             $logger->addLevel('BOB', 0);
             $this->fail();
         } catch (Exception $e) {
-            $this->assertType('Horde_Log_Exception', $e);
+            $this->assertInstanceOf('Horde_Log_Exception', $e);
             $this->assertRegExp('/existing log level/i', $e->getMessage());
         }