diff --git a/includes/CachedList.php b/includes/CachedList.php index 2fcafce44..6afc24895 100644 --- a/includes/CachedList.php +++ b/includes/CachedList.php @@ -57,7 +57,7 @@ class CachedList implements ContainmentList { if ( !is_array( $result ) ) { throw new UnexpectedValueException( sprintf( "Expected array but received '%s' from '%s::getValues'", - is_object( $result ) ? get_class( $result ) : gettype( $result ), + get_debug_type( $result ), get_class( $this->nestedList ) ) ); } diff --git a/includes/Controller/NotificationController.php b/includes/Controller/NotificationController.php index e7acf44fc..c44e24089 100644 --- a/includes/Controller/NotificationController.php +++ b/includes/Controller/NotificationController.php @@ -519,7 +519,7 @@ class NotificationController { $notify->addFilter( static function ( $user ) use ( &$seen, $fname ) { if ( !$user instanceof User ) { wfDebugLog( $fname, 'Expected all User instances, received: ' . - ( is_object( $user ) ? get_class( $user ) : gettype( $user ) ) + get_debug_type( $user ) ); return false; diff --git a/includes/Iterator/FilteredSequentialIterator.php b/includes/Iterator/FilteredSequentialIterator.php index 567fd2f07..71c4d5404 100644 --- a/includes/Iterator/FilteredSequentialIterator.php +++ b/includes/Iterator/FilteredSequentialIterator.php @@ -64,8 +64,8 @@ class FilteredSequentialIterator implements IteratorAggregate { } elseif ( $users instanceof IteratorAggregate ) { $it = $users->getIterator(); } else { - throw new InvalidArgumentException( 'Expected array, Iterator or IteratorAggregate but received:' . - ( is_object( $users ) ? get_class( $users ) : gettype( $users ) ) + throw new InvalidArgumentException( 'Expected array, Iterator or IteratorAggregate but received ' . + get_debug_type( $users ) ); }