Skip to content

Commit 31f32b4

Browse files
tenzaptenzap
committed
fix error with phpunit10 (assertObjectHasAttribute deprecated)
1 parent 85d02ab commit 31f32b4

File tree

2 files changed

+35
-18
lines changed

2 files changed

+35
-18
lines changed

‎tests/codeigniter/core/Loader_test.php

+22-14
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ class Loader_test extends CI_TestCase {
44

55
private $ci_obj;
66

7+
private $realAssertObjectHasProperty;
8+
79
public function set_up()
810
{
911
// Instantiate a new loader
@@ -16,6 +18,12 @@ public function set_up()
1618
// Set subclass prefix
1719
$this->prefix = 'MY_';
1820
$this->ci_set_config('subclass_prefix', $this->prefix);
21+
22+
// assertObjectHasAttribute() is deprecated and will be removed in PHPUnit 10.
23+
// It was replaced by assertObjectHasProperty() in phpunit 10.1.0+
24+
$this->realAssertObjectHasProperty = method_exists($this, 'assertObjectHasProperty')
25+
? 'assertObjectHasProperty'
26+
: 'assertObjectHasAttribute';
1927
}
2028

2129
// --------------------------------------------------------------------
@@ -36,7 +44,7 @@ public function test_library()
3644
// Test loading as an array.
3745
$this->assertInstanceOf('CI_Loader', $this->load->library(array($lib)));
3846
$this->assertTrue(class_exists($class), $class.' does not exist');
39-
$this->assertObjectHasAttribute($lib, $this->ci_obj);
47+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($lib, $this->ci_obj));
4048
$this->assertInstanceOf($class, $this->ci_obj->$lib);
4149

4250
// Create library in VFS
@@ -88,21 +96,21 @@ public function test_library_extension()
8896
$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
8997
$this->assertTrue(class_exists($class), $class.' does not exist');
9098
$this->assertTrue(class_exists($ext), $ext.' does not exist');
91-
$this->assertObjectHasAttribute($name, $this->ci_obj);
99+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($name, $this->ci_obj));
92100
$this->assertInstanceOf($class, $this->ci_obj->$name);
93101
$this->assertInstanceOf($ext, $this->ci_obj->$name);
94102

95103
// Test reloading with object name
96104
$obj = 'exttest';
97105
$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
98-
$this->assertObjectHasAttribute($obj, $this->ci_obj);
106+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($obj, $this->ci_obj));
99107
$this->assertInstanceOf($class, $this->ci_obj->$obj);
100108
$this->assertInstanceOf($ext, $this->ci_obj->$obj);
101109

102110
// Test reloading
103111
unset($this->ci_obj->$name);
104112
$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
105-
$this->assertObjectHasAttribute($name, $this->ci_obj);
113+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($name, $this->ci_obj));
106114

107115
// Create baseless library
108116
$name = 'ext_baseless_lib';
@@ -140,7 +148,7 @@ public function test_library_config()
140148
$obj = 'testy';
141149
$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
142150
$this->assertTrue(class_exists($class), $class.' does not exist');
143-
$this->assertObjectHasAttribute($obj, $this->ci_obj);
151+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($obj, $this->ci_obj));
144152
$this->assertInstanceOf($class, $this->ci_obj->$obj);
145153
$this->assertEquals($cfg, $this->ci_obj->$obj->config);
146154

@@ -172,7 +180,7 @@ public function test_load_library_in_application_dir()
172180

173181
// Was the model class instantiated.
174182
$this->assertTrue(class_exists($class), $class.' does not exist');
175-
$this->assertObjectHasAttribute($lib, $this->ci_obj);
183+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($lib, $this->ci_obj));
176184
$this->assertInstanceOf($class, $this->ci_obj->$lib);
177185
}
178186

@@ -193,13 +201,13 @@ class_exists('CI_Driver_Library', TRUE);
193201
// Test loading as an array.
194202
$this->assertInstanceOf('CI_Loader', $this->load->driver(array($driver)));
195203
$this->assertTrue(class_exists($class), $class.' does not exist');
196-
$this->assertObjectHasAttribute($driver, $this->ci_obj);
204+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($driver, $this->ci_obj));
197205
$this->assertInstanceOf($class, $this->ci_obj->$driver);
198206

199207
// Test loading as a library with a name
200208
$obj = 'testdrive';
201209
$this->assertInstanceOf('CI_Loader', $this->load->library($driver, NULL, $obj));
202-
$this->assertObjectHasAttribute($obj, $this->ci_obj);
210+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($obj, $this->ci_obj));
203211
$this->assertInstanceOf($class, $this->ci_obj->$obj);
204212

205213
// Test a string given to params
@@ -222,7 +230,7 @@ public function test_models()
222230

223231
// Was the model class instantiated.
224232
$this->assertTrue(class_exists($model));
225-
$this->assertObjectHasAttribute($model, $this->ci_obj);
233+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($model, $this->ci_obj));
226234

227235
// Test no model given
228236
$this->assertInstanceOf('CI_Loader', $this->load->model(''));
@@ -248,8 +256,8 @@ public function test_model_subdir()
248256

249257
// Was the model class instantiated?
250258
$this->assertTrue(class_exists($model));
251-
$this->assertObjectHasAttribute($name, $this->ci_obj);
252-
$this->assertObjectHasAttribute($name, $this->ci_obj);
259+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($name, $this->ci_obj));
260+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($name, $this->ci_obj));
253261
$this->assertInstanceOf($base, $this->ci_obj->$name);
254262
$this->assertInstanceOf($model, $this->ci_obj->$name);
255263

@@ -607,17 +615,17 @@ public function test_initialize()
607615

608616
// Verify library
609617
$this->assertTrue(class_exists($lib_class), $lib_class.' does not exist');
610-
$this->assertObjectHasAttribute($lib, $this->ci_obj);
618+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($lib, $this->ci_obj));
611619
$this->assertInstanceOf($lib_class, $this->ci_obj->$lib);
612620

613621
// Verify driver
614622
$this->assertTrue(class_exists($drv_class), $drv_class.' does not exist');
615-
$this->assertObjectHasAttribute($drv, $this->ci_obj);
623+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($drv, $this->ci_obj));
616624
$this->assertInstanceOf($drv_class, $this->ci_obj->$drv);
617625

618626
// Verify model
619627
$this->assertTrue(class_exists($model), $model.' does not exist');
620-
$this->assertObjectHasAttribute($model, $this->ci_obj);
628+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($model, $this->ci_obj));
621629
$this->assertInstanceOf($model, $this->ci_obj->$model);
622630

623631
// Verify config calls

‎tests/codeigniter/libraries/Driver_test.php

+13-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ class Driver_test extends CI_TestCase {
77

88
private $name;
99

10+
private $realAssertObjectHasProperty;
11+
1012
/**
1113
* Set up test framework
1214
*/
@@ -25,6 +27,12 @@ public function set_up()
2527
// Create mock driver library
2628
$this->name = 'Driver';
2729
$this->lib = new Mock_Libraries_Driver();
30+
31+
// assertObjectHasAttribute() is deprecated and will be removed in PHPUnit 10.
32+
// It was replaced by assertObjectHasProperty() in phpunit 10.1.0+
33+
$this->realAssertObjectHasProperty = method_exists($this, 'assertObjectHasProperty')
34+
? 'assertObjectHasProperty'
35+
: 'assertObjectHasAttribute';
2836
}
2937

3038
/**
@@ -51,12 +59,12 @@ public function test_load_driver()
5159
$this->assertEquals($this->name, $this->lib->get_name());
5260

5361
// Was driver loaded?
54-
$this->assertObjectHasAttribute($driver, $this->lib);
62+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($driver, $this->lib));
5563
$this->assertInstanceOf($class, $this->lib->$driver);
5664
$this->assertInstanceOf('CI_Driver', $this->lib->$driver);
5765

5866
// Was decorate called?
59-
$this->assertObjectHasAttribute($prop, $this->lib->$driver);
67+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($prop, $this->lib->$driver));
6068
$this->assertTrue($this->lib->$driver->$prop);
6169

6270
// Do we get an error for an invalid driver?
@@ -86,7 +94,8 @@ public function test_load_app_driver()
8694
$this->assertNotNull($this->lib->load_driver($driver));
8795

8896
// Was driver loaded?
89-
$this->assertObjectHasAttribute($driver, $this->lib);
97+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($driver, $this->lib));
98+
9099
$this->assertInstanceOf($class, $this->lib->$driver);
91100
$this->assertInstanceOf('CI_Driver', $this->lib->$driver);
92101

@@ -120,7 +129,7 @@ public function test_load_driver_ext()
120129
$this->assertNotNull($this->lib->load_driver($driver));
121130

122131
// Was driver loaded?
123-
$this->assertObjectHasAttribute($driver, $this->lib);
132+
call_user_func_array(array($this, $this->realAssertObjectHasProperty), array($driver, $this->lib));
124133
$this->assertInstanceOf($class, $this->lib->$driver);
125134
$this->assertInstanceOf($baseclass, $this->lib->$driver);
126135
$this->assertInstanceOf('CI_Driver', $this->lib->$driver);

0 commit comments

Comments
 (0)