projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c9408f)
Fix deprecated assertType() usage
authorMichael M Slusarz <slusarz@curecanti.org>
Wed, 12 Jan 2011 17:00:26 +0000 (10:00 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Wed, 12 Jan 2011 17:19:40 +0000 (10:19 -0700)
framework/Db/test/Horde/Db/Adapter/MysqlTest.php patch | blob | history
framework/Db/test/Horde/Db/Adapter/MysqliTest.php patch | blob | history
framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php patch | blob | history
framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php patch | blob | history
framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php patch | blob | history
framework/Db/test/Horde/Db/Migration/BaseTest.php patch | blob | history
framework/Db/test/Horde/Db/Migration/MigratorTest.php patch | blob | history

diff --git a/framework/Db/test/Horde/Db/Adapter/MysqlTest.php b/framework/Db/test/Horde/Db/Adapter/MysqlTest.php
index 0824044..dff3344 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/MysqlTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/MysqlTest.php
@@ -145,11 +145,11 @@ class Horde_Db_Adapter_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->select($sql);
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -157,11 +157,11 @@ class Horde_Db_Adapter_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id=?";
         $result = $this->_conn->select($sql, array(1));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -169,11 +169,11 @@ class Horde_Db_Adapter_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE string_value=?";
         $result = $this->_conn->select($sql, array('name a'));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -181,7 +181,7 @@ class Horde_Db_Adapter_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->selectAll($sql);
-        $this->assertType('array', $result);
+        $this->assertInternalType('array', $result);
         $this->assertGreaterThan(0, count($result));
         $this->assertEquals(1, $result[0]['id']);
     }
diff --git a/framework/Db/test/Horde/Db/Adapter/MysqliTest.php b/framework/Db/test/Horde/Db/Adapter/MysqliTest.php
index 6fac38d..3cba91e 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/MysqliTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/MysqliTest.php
@@ -145,11 +145,11 @@ class Horde_Db_Adapter_MysqliTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->select($sql);
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -157,11 +157,11 @@ class Horde_Db_Adapter_MysqliTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id=?";
         $result = $this->_conn->select($sql, array(1));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -169,11 +169,11 @@ class Horde_Db_Adapter_MysqliTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE string_value=?";
         $result = $this->_conn->select($sql, array('name a'));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -181,7 +181,7 @@ class Horde_Db_Adapter_MysqliTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->selectAll($sql);
-        $this->assertType('array', $result);
+        $this->assertInternalType('array', $result);
         $this->assertGreaterThan(0, count($result));
         $this->assertEquals(1, $result[0]['id']);
     }
diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php
index f0f7b94..6c4aaca 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php
@@ -145,11 +145,11 @@ class Horde_Db_Adapter_Pdo_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->select($sql);
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -157,11 +157,11 @@ class Horde_Db_Adapter_Pdo_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id=?";
         $result = $this->_conn->select($sql, array(1));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -169,11 +169,11 @@ class Horde_Db_Adapter_Pdo_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE string_value=?";
         $result = $this->_conn->select($sql, array('name a'));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -181,7 +181,7 @@ class Horde_Db_Adapter_Pdo_MysqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->selectAll($sql);
-        $this->assertType('array', $result);
+        $this->assertInternalType('array', $result);
         $this->assertGreaterThan(0, count($result));
         $this->assertEquals(1, $result[0]['id']);
     }
diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php
index dc7a352..9da1619 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php
@@ -142,11 +142,11 @@ class Horde_Db_Adapter_Pdo_PgsqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->select($sql);
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -154,11 +154,11 @@ class Horde_Db_Adapter_Pdo_PgsqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id=?";
         $result = $this->_conn->select($sql, array(1));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -166,11 +166,11 @@ class Horde_Db_Adapter_Pdo_PgsqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE string_value=?";
         $result = $this->_conn->select($sql, array('name a'));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -178,7 +178,7 @@ class Horde_Db_Adapter_Pdo_PgsqlTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->selectAll($sql);
-        $this->assertType('array', $result);
+        $this->assertInternalType('array', $result);
         $this->assertGreaterThan(0, count($result));
         $this->assertEquals(1, $result[0]['id']);
     }
diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php
index 255ccf2..cc7aee1 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php
@@ -144,11 +144,11 @@ class Horde_Db_Adapter_Pdo_SqliteTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->select($sql);
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -156,11 +156,11 @@ class Horde_Db_Adapter_Pdo_SqliteTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id=?";
         $result = $this->_conn->select($sql, array(1));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -168,11 +168,11 @@ class Horde_Db_Adapter_Pdo_SqliteTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE string_value=?";
         $result = $this->_conn->select($sql, array('name a'));
-        $this->assertType('Traversable', $result);
+        $this->assertInstanceOf('Traversable', $result);
         $this->assertGreaterThan(0, count($result));
 
         foreach ($result as $row) break;
-        $this->assertType('array', $row);
+        $this->assertInternalType('array', $row);
         $this->assertEquals(1, $row['id']);
     }
 
@@ -180,7 +180,7 @@ class Horde_Db_Adapter_Pdo_SqliteTest extends PHPUnit_Framework_TestCase
     {
         $sql = "SELECT * FROM unit_tests WHERE id='1'";
         $result = $this->_conn->selectAll($sql);
-        $this->assertType('array', $result);
+        $this->assertInternalType('array', $result);
         $this->assertGreaterThan(0, count($result));
         $this->assertEquals(1, $result[0]['id']);
     }
diff --git a/framework/Db/test/Horde/Db/Migration/BaseTest.php b/framework/Db/test/Horde/Db/Migration/BaseTest.php
index 0859274..460aacd 100644 (file)
--- a/framework/Db/test/Horde/Db/Migration/BaseTest.php
+++ b/framework/Db/test/Horde/Db/Migration/BaseTest.php
@@ -99,7 +99,7 @@ class Horde_Db_Migration_BaseTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
 
         $m = new WeNeedReminders1($this->_conn);
         $m->up();
@@ -114,7 +114,7 @@ class Horde_Db_Migration_BaseTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
     }
 
     public function testAddTableWithDecimals()
@@ -123,7 +123,7 @@ class Horde_Db_Migration_BaseTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM big_numbers");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
 
         $m = new GiveMeBigNumbers($this->_conn);
         $m->up();
@@ -142,6 +142,6 @@ class Horde_Db_Migration_BaseTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM big_numbers");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
     }
 }
diff --git a/framework/Db/test/Horde/Db/Migration/MigratorTest.php b/framework/Db/test/Horde/Db/Migration/MigratorTest.php
index 9bdc78c..d7332dc 100644 (file)
--- a/framework/Db/test/Horde/Db/Migration/MigratorTest.php
+++ b/framework/Db/test/Horde/Db/Migration/MigratorTest.php
@@ -67,7 +67,7 @@ class Horde_Db_Migration_MigratorTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
 
         $dir = dirname(dirname(__FILE__)).'/fixtures/migrations/';
         $migrator = new Horde_Db_Migration_Migrator($this->_conn, $this->_logger, array('migrationsPath' => $dir));
@@ -93,7 +93,7 @@ class Horde_Db_Migration_MigratorTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
     }
 
     public function testOneUp()
@@ -102,7 +102,7 @@ class Horde_Db_Migration_MigratorTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
 
         $dir = dirname(dirname(__FILE__)).'/fixtures/migrations/';
         $migrator = new Horde_Db_Migration_Migrator($this->_conn, $this->_logger, array('migrationsPath' => $dir));
@@ -116,7 +116,7 @@ class Horde_Db_Migration_MigratorTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
 
         $migrator->up(2);
         $this->assertEquals(2, $migrator->getCurrentVersion());
@@ -165,7 +165,7 @@ class Horde_Db_Migration_MigratorTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
 
         $migrator->up();
 
@@ -201,7 +201,7 @@ class Horde_Db_Migration_MigratorTest extends PHPUnit_Framework_TestCase
         try {
             $this->_conn->selectValues("SELECT * FROM reminders");
         } catch (Exception $e) {}
-        $this->assertType('Horde_Db_Exception', $e);
+        $this->assertInstanceOf('Horde_Db_Exception', $e);
 
         $columns = $this->_columnNames('users');
         $this->assertTrue(in_array('last_name', $columns));
Unnamed repository; edit this file to name it for gitweb.