Merge pull request #6074 from philsturgeon/ci3-php8

CodeIgniter 3.0 on PHP 8

8 files changed, 48 insertions, 35 deletions

diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 8c5bb3021..6a7aa916a 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -36,7 +36,8 @@ class Loader_test extends CI_TestCase {
 		// Test loading as an array.
 		$this->assertInstanceOf('CI_Loader', $this->load->library(array($lib)));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $lib, $this->ci_obj);
+		$this->assertObjectHasAttribute($lib, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$lib);
 
 		// Create library in VFS
 		$lib = array('unit_test_lib' => 'unit_test_lib');
@@ -87,14 +88,16 @@ class Loader_test extends CI_TestCase {
 		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
 		$this->assertTrue(class_exists($ext), $ext.' does not exist');
-		$this->assertAttributeInstanceOf($class, $name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($ext, $name, $this->ci_obj);
+		$this->assertObjectHasAttribute($name, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$name);
+		$this->assertInstanceOf($ext, $this->ci_obj->$name);
 
 		// Test reloading with object name
 		$obj = 'exttest';
 		$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
-		$this->assertAttributeInstanceOf($ext, $obj, $this->ci_obj);
+		$this->assertObjectHasAttribute($obj, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$obj);
+		$this->assertInstanceOf($ext, $this->ci_obj->$obj);
 
 		// Test reloading
 		unset($this->ci_obj->$name);
@@ -137,7 +140,8 @@ class Loader_test extends CI_TestCase {
 		$obj = 'testy';
 		$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
+		$this->assertObjectHasAttribute($obj, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$obj);
 		$this->assertEquals($cfg, $this->ci_obj->$obj->config);
 
 		// Test is_loaded
@@ -168,7 +172,8 @@ class Loader_test extends CI_TestCase {
 
 		// Was the model class instantiated.
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $lib, $this->ci_obj);
+		$this->assertObjectHasAttribute($lib, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$lib);
 	}
 
 	// --------------------------------------------------------------------
@@ -188,12 +193,14 @@ class Loader_test extends CI_TestCase {
 		// Test loading as an array.
 		$this->assertInstanceOf('CI_Loader', $this->load->driver(array($driver)));
 		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $driver, $this->ci_obj);
+		$this->assertObjectHasAttribute($driver, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$driver);
 
 		// Test loading as a library with a name
 		$obj = 'testdrive';
 		$this->assertInstanceOf('CI_Loader', $this->load->library($driver, NULL, $obj));
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
+		$this->assertObjectHasAttribute($obj, $this->ci_obj);
+		$this->assertInstanceOf($class, $this->ci_obj->$obj);
 
 		// Test a string given to params
 		$this->assertInstanceOf('CI_Loader', $this->load->driver($driver, ' '));
@@ -242,8 +249,9 @@ class Loader_test extends CI_TestCase {
 		// Was the model class instantiated?
 		$this->assertTrue(class_exists($model));
 		$this->assertObjectHasAttribute($name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($base, $name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($model, $name, $this->ci_obj);
+		$this->assertObjectHasAttribute($name, $this->ci_obj);
+		$this->assertInstanceOf($base, $this->ci_obj->$name);
+		$this->assertInstanceOf($model, $this->ci_obj->$name);
 
 		// Test name conflict
 		$obj = 'conflict';
@@ -567,15 +575,18 @@ class Loader_test extends CI_TestCase {
 
 		// Verify library
 		$this->assertTrue(class_exists($lib_class), $lib_class.' does not exist');
-		$this->assertAttributeInstanceOf($lib_class, $lib, $this->ci_obj);
+		$this->assertObjectHasAttribute($lib, $this->ci_obj);
+		$this->assertInstanceOf($lib_class, $this->ci_obj->$lib);
 
 		// Verify driver
 		$this->assertTrue(class_exists($drv_class), $drv_class.' does not exist');
-		$this->assertAttributeInstanceOf($drv_class, $drv, $this->ci_obj);
+		$this->assertObjectHasAttribute($drv, $this->ci_obj);
+		$this->assertInstanceOf($drv_class, $this->ci_obj->$drv);
 
 		// Verify model
 		$this->assertTrue(class_exists($model), $model.' does not exist');
-		$this->assertAttributeInstanceOf($model, $model, $this->ci_obj);
+		$this->assertObjectHasAttribute($model, $this->ci_obj);
+		$this->assertInstanceOf($model, $this->ci_obj->$model);
 
 		// Verify config calls
 		$this->assertEquals($cfg['config'], $this->ci_obj->config->loaded);
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
index c3113adba..5f94e1501 100644
--- a/tests/codeigniter/core/Security_test.php
+++ b/tests/codeigniter/core/Security_test.php
@@ -252,7 +252,7 @@ class Security_test extends CI_TestCase {
 		// Perform hash
 		$this->security->xss_hash();
 
-		$this->assertRegExp('#^[0-9a-f]{32}$#iS', $this->security->xss_hash);
+		$this->assertMatchesRegularExpression('#^[0-9a-f]{32}$#iS', $this->security->xss_hash);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/compat/mbstring_test.php b/tests/codeigniter/core/compat/mbstring_test.php
index 415222446..8b8629efc 100644
--- a/tests/codeigniter/core/compat/mbstring_test.php
+++ b/tests/codeigniter/core/compat/mbstring_test.php
@@ -27,7 +27,7 @@ class mbstring_test extends CI_TestCase {
 	// ------------------------------------------------------------------------
 
 	/**
-	 * @depends	test_boostrap
+	 * @depends	test_bootstrap
 	 */
 	public function test_mb_strpos()
 	{
@@ -39,7 +39,7 @@ class mbstring_test extends CI_TestCase {
 	// ------------------------------------------------------------------------
 
 	/**
-	 * @depends	test_boostrap
+	 * @depends	test_bootstrap
 	 */
 	public function test_mb_substr()
 	{
diff --git a/tests/codeigniter/helpers/array_helper_test.php b/tests/codeigniter/helpers/array_helper_test.php
index b2409c330..f4e344673 100644
--- a/tests/codeigniter/helpers/array_helper_test.php
+++ b/tests/codeigniter/helpers/array_helper_test.php
@@ -38,8 +38,8 @@ class Array_helper_test extends CI_TestCase {
 
 	public function test_elements()
 	{
-		$this->assertInternalType('array', elements('test', $this->my_array));
-		$this->assertInternalType('array', elements('foo', $this->my_array));
+		$this->assertEquals('array', gettype(elements('test', $this->my_array)));
+		$this->assertEquals('array', gettype(elements('foo', $this->my_array)));
 	}
 
 }
diff --git a/tests/codeigniter/helpers/string_helper_test.php b/tests/codeigniter/helpers/string_helper_test.php
index 75701ec13..9bd1ea816 100644
--- a/tests/codeigniter/helpers/string_helper_test.php
+++ b/tests/codeigniter/helpers/string_helper_test.php
@@ -129,7 +129,7 @@ class String_helper_test extends CI_TestCase {
 	{
 		$this->assertEquals(16, strlen(random_string('alnum', 16)));
 		$this->assertEquals(32, strlen(random_string('unique', 16)));
-		$this->assertInternalType('string', random_string('numeric', 16));
+		$this->assertEquals('string', gettype(random_string('numeric', 16)));
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/libraries/Driver_test.php b/tests/codeigniter/libraries/Driver_test.php
index e4401e688..ea5cfa235 100644
--- a/tests/codeigniter/libraries/Driver_test.php
+++ b/tests/codeigniter/libraries/Driver_test.php
@@ -5,6 +5,8 @@
  */
 class Driver_test extends CI_TestCase {
 
+	private $name;
+
 	/**
 	 * Set up test framework
 	 */
@@ -50,8 +52,8 @@ class Driver_test extends CI_TestCase {
 
 		// Was driver loaded?
 		$this->assertObjectHasAttribute($driver, $this->lib);
-		$this->assertAttributeInstanceOf($class, $driver, $this->lib);
-		$this->assertAttributeInstanceOf('CI_Driver', $driver, $this->lib);
+		$this->assertInstanceOf($class, $this->lib->$driver);
+		$this->assertInstanceOf('CI_Driver', $this->lib->$driver);
 
 		// Was decorate called?
 		$this->assertObjectHasAttribute($prop, $this->lib->$driver);
@@ -85,8 +87,8 @@ class Driver_test extends CI_TestCase {
 
 		// Was driver loaded?
 		$this->assertObjectHasAttribute($driver, $this->lib);
-		$this->assertAttributeInstanceOf($class, $driver, $this->lib);
-		$this->assertAttributeInstanceOf('CI_Driver', $driver, $this->lib);
+		$this->assertInstanceOf($class, $this->lib->$driver);
+		$this->assertInstanceOf('CI_Driver', $this->lib->$driver);
 
 		// Do we get an error for a non-existent driver?
 		$this->setExpectedException('RuntimeException', 'CI Error: Unable to load the requested driver: CI_'.
@@ -119,9 +121,9 @@ class Driver_test extends CI_TestCase {
 
 		// Was driver loaded?
 		$this->assertObjectHasAttribute($driver, $this->lib);
-		$this->assertAttributeInstanceOf($class, $driver, $this->lib);
-		$this->assertAttributeInstanceOf($baseclass, $driver, $this->lib);
-		$this->assertAttributeInstanceOf('CI_Driver', $driver, $this->lib);
+		$this->assertInstanceOf($class, $this->lib->$driver);
+		$this->assertInstanceOf($baseclass, $this->lib->$driver);
+		$this->assertInstanceOf('CI_Driver', $this->lib->$driver);
 
 		// Create driver extension without base
 		$driver = 'baseless';
diff --git a/tests/codeigniter/libraries/Encryption_test.php b/tests/codeigniter/libraries/Encryption_test.php
index 8e411d9fa..68bc3d804 100644
--- a/tests/codeigniter/libraries/Encryption_test.php
+++ b/tests/codeigniter/libraries/Encryption_test.php
@@ -151,7 +151,7 @@ class Encryption_test extends CI_TestCase {
 			'hmac_key' => str_repeat("\x0", 16)
 		);
 
-		$this->assertInternalType('array', $this->encryption->__get_params($params));
+		$this->assertEquals('array', gettype($this->encryption->__get_params($params)));
 
 		$params['base64'] = TRUE;
 		$params['hmac_digest'] = 'sha512';
@@ -217,7 +217,7 @@ class Encryption_test extends CI_TestCase {
 	/**
 	 * encrypt(), decrypt test with custom parameters
 	 *
-	 * @depends	test___get_params
+	 * @depends	test__get_params
 	 */
 	public function test_encrypt_decrypt_custom()
 	{
diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index f505a43fc..6efae5d18 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -270,14 +270,14 @@ class Table_test extends CI_TestCase {
 		$table = $this->table->generate($data);
 
 		// Test the table header
-		$this->assertContains('<th>Name</th>', $table);
-		$this->assertContains('<th>Color</th>', $table);
-		$this->assertContains('<th>Size</th>', $table);
+		$this->assertEquals(1, substr_count($table, '<th>Name</th>'));
+		$this->assertEquals(1, substr_count($table, '<th>Color</th>'));
+		$this->assertEquals(1, substr_count($table, '<th>Size</th>'));
 
 		// Test the first entry
-		$this->assertContains('<td>Fred</td>', $table);
-		$this->assertContains('<td>Blue</td>', $table);
-		$this->assertContains('<td>Small</td>', $table);
+		$this->assertEquals(1, substr_count($table, '<td>Fred</td>'));
+		$this->assertEquals(1, substr_count($table, '<td>Blue</td>'));
+		$this->assertEquals(1, substr_count($table, '<td>Small</td>'));
 	}
 
 }