From 993abb79d4e8c6fe1219d11aef3fcaee8d5091e2 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 12 Jan 2011 10:00:26 -0700 Subject: [PATCH] Fix deprecated assertType() usage --- framework/Db/test/Horde/Db/Adapter/MysqlTest.php | 14 +++++++------- framework/Db/test/Horde/Db/Adapter/MysqliTest.php | 14 +++++++------- framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php | 14 +++++++------- framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php | 14 +++++++------- framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 14 +++++++------- framework/Db/test/Horde/Db/Migration/BaseTest.php | 8 ++++---- framework/Db/test/Horde/Db/Migration/MigratorTest.php | 12 ++++++------ 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/framework/Db/test/Horde/Db/Adapter/MysqlTest.php b/framework/Db/test/Horde/Db/Adapter/MysqlTest.php index 082404432..dff3344ba 100644 --- 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 6fac38deb..3cba91e07 100644 --- 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 f0f7b9422..6c4aaca74 100644 --- 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 dc7a3521e..9da16199d 100644 --- 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 255ccf2ba..cc7aee1d8 100644 --- 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 0859274cb..460aacde1 100644 --- 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 9bdc78c8c..d7332dc42 100644 --- 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)); -- 2.11.0