@@ -36,8 +36,7 @@ public function testMapTypedArray()
36
36
);
37
37
$ this ->assertIsArray ($ sn ->typedArray );
38
38
$ this ->assertCount (2 , $ sn ->typedArray );
39
- $ this ->assertInstanceOf ('JsonMapperTest_Simple ' , $ sn ->typedArray [0 ]);
40
- $ this ->assertInstanceOf ('JsonMapperTest_Simple ' , $ sn ->typedArray [1 ]);
39
+ $ this ->assertContainsOnlyInstancesOf (JsonMapperTest_Simple::class, $ sn ->typedArray );
41
40
$ this ->assertEquals ('stringvalue ' , $ sn ->typedArray [0 ]->str );
42
41
$ this ->assertEquals (1.2 , $ sn ->typedArray [1 ]->fl );
43
42
}
@@ -167,8 +166,7 @@ public function testMapArrayObject()
167
166
);
168
167
$ this ->assertInstanceOf ('ArrayObject ' , $ sn ->pArrayObject );
169
168
$ this ->assertCount (2 , $ sn ->pArrayObject );
170
- $ this ->assertInstanceOf ('\stdClass ' , $ sn ->pArrayObject [0 ]);
171
- $ this ->assertInstanceOf ('\stdClass ' , $ sn ->pArrayObject [1 ]);
169
+ $ this ->assertContainsOnlyInstancesOf (stdClass::class, $ sn ->pArrayObject );
172
170
$ this ->assertEquals ('stringvalue ' , $ sn ->pArrayObject [0 ]->str );
173
171
$ this ->assertEquals ('1.2 ' , $ sn ->pArrayObject [1 ]->fl );
174
172
}
@@ -187,8 +185,7 @@ public function testMapTypedArrayObject()
187
185
);
188
186
$ this ->assertInstanceOf ('ArrayObject ' , $ sn ->pTypedArrayObject );
189
187
$ this ->assertCount (2 , $ sn ->pTypedArrayObject );
190
- $ this ->assertInstanceOf ('JsonMapperTest_Simple ' , $ sn ->pTypedArrayObject [0 ]);
191
- $ this ->assertInstanceOf ('JsonMapperTest_Simple ' , $ sn ->pTypedArrayObject [1 ]);
188
+ $ this ->assertContainsOnlyInstancesOf (JsonMapperTest_Simple::class, $ sn ->pTypedArrayObject );
192
189
$ this ->assertEquals ('stringvalue ' , $ sn ->pTypedArrayObject [0 ]->str );
193
190
$ this ->assertEquals ('1.2 ' , $ sn ->pTypedArrayObject [1 ]->fl );
194
191
}
@@ -207,8 +204,7 @@ public function testMapSimpleArrayObject()
207
204
);
208
205
$ this ->assertInstanceOf ('ArrayObject ' , $ sn ->pSimpleArrayObject );
209
206
$ this ->assertCount (2 , $ sn ->pSimpleArrayObject );
210
- $ this ->assertIsInt ($ sn ->pSimpleArrayObject ['eins ' ]);
211
- $ this ->assertIsInt ($ sn ->pSimpleArrayObject ['zwei ' ]);
207
+ $ this ->assertContainsOnly ('int ' , $ sn ->pSimpleArrayObject , true );
212
208
$ this ->assertEquals (1 , $ sn ->pSimpleArrayObject ['eins ' ]);
213
209
$ this ->assertEquals (1 , $ sn ->pSimpleArrayObject ['zwei ' ]);
214
210
}
@@ -557,9 +553,7 @@ public function testMapArrayFromVariadicFunctionWithObjectType()
557
553
$ variadicArray = $ sn ->getVariadicDateTime ();
558
554
559
555
$ this ->assertCount (2 , $ variadicArray );
560
- $ this ->assertIsArray ($ variadicArray );
561
- $ this ->assertInstanceOf ('DateTime ' , $ variadicArray [0 ]);
562
- $ this ->assertInstanceOf ('DateTime ' , $ variadicArray [1 ]);
556
+ $ this ->assertContainsOnlyInstancesOf (DateTime::class, $ variadicArray );
563
557
$ this ->assertEquals (
564
558
'2014-01-02 ' , $ variadicArray [0 ]->format ('Y-m-d ' )
565
559
);
0 commit comments