CS fixes

Author: jmikola

tests/UnifiedSpecTests/CollectionData.php

@@ -11,6 +11,10 @@
 use MongoDB\Tests\UnifiedSpecTests\Constraint\Matches;
 use MultipleIterator;
 use stdClass;
+use function assertContainsOnly;
+use function assertInternalType;
+use function assertNotNull;
+use function assertThat;
 use function sprintf;
 
 class CollectionData

tests/UnifiedSpecTests/Constraint/Matches.php

@@ -17,6 +17,11 @@
 use SebastianBergmann\Comparator\Factory;
 use Symfony\Bridge\PhpUnit\ConstraintTrait;
 use function array_keys;
+use function assertInstanceOf;
+use function assertInternalType;
+use function assertRegExp;
+use function assertThat;
+use function containsOnly;
 use function count;
 use function get_class;
 use function get_resource_type;
@@ -27,6 +32,10 @@
 use function is_object;
 use function is_resource;
 use function is_string;
+use function isInstanceOf;
+use function isType;
+use function logicalAnd;
+use function logicalOr;
 use function range;
 use function sprintf;
 use function stream_get_contents;

tests/UnifiedSpecTests/Context.php

@@ -15,11 +15,23 @@
 use function array_fill_keys;
 use function array_key_exists;
 use function array_keys;
+use function assertArrayHasKey;
+use function assertArrayNotHasKey;
+use function assertContains;
+use function assertCount;
+use function assertEmpty;
+use function assertInstanceOf;
+use function assertInternalType;
+use function assertNotFalse;
+use function assertStringStartsWith;
+use function assertThat;
 use function count;
 use function current;
 use function explode;
 use function implode;
+use function isType;
 use function key;
+use function logicalOr;
 use function parse_url;
 use function strlen;
 use function strpos;
@@ -146,7 +158,7 @@ public function stopEventObservers()
 
     private static function assertHasOnlyKeys($arrayOrObject, array $keys)
     {
-        assertThat($arrayOrObject, logicalOr(IsType('array'), IsType('object')));
+        assertThat($arrayOrObject, logicalOr(isType('array'), isType('object')));
         $diff = array_diff_key((array) $arrayOrObject, array_fill_keys($keys, 1));
         assertEmpty($diff, 'Unsupported keys: ' . implode(',', array_keys($diff)));
     }
@@ -310,7 +322,7 @@ private static function createWriteConcern(stdClass $o) : WriteConcern
         $wtimeoutMS = $o->wtimeoutMS ?? 0;
         $journal = $o->journal ?? null;
 
-        assertThat($w, logicalOr(new IsType('int'), new IsType('string')));
+        assertThat($w, logicalOr(isType('int'), isType('string')));
         assertInternalType('int', $wtimeoutMS);
 
         $args = [$w, $wtimeoutMS];

tests/UnifiedSpecTests/EntityMap.php

@@ -6,6 +6,9 @@
 use MongoDB\Driver\Session;
 use PHPUnit\Framework\Assert;
 use function array_key_exists;
+use function assertArrayHasKey;
+use function assertArrayNotHasKey;
+use function assertInternalType;
 use function sprintf;
 
 class EntityMap implements ArrayAccess

tests/UnifiedSpecTests/EventObserver.php

@@ -7,6 +7,9 @@
 use MongoDB\Driver\Monitoring\CommandSubscriber;
 use MongoDB\Driver\Monitoring\CommandSucceededEvent;
 use function array_fill_keys;
+use function assertArrayHasKey;
+use function assertInternalType;
+use function assertNotEmpty;
 use function MongoDB\Driver\Monitoring\addSubscriber;
 use function MongoDB\Driver\Monitoring\removeSubscriber;
 

tests/UnifiedSpecTests/ExpectedError.php

@@ -9,6 +9,16 @@
 use MongoDB\Driver\Exception\ServerException;
 use stdClass;
 use Throwable;
+use function assertArrayHasKey;
+use function assertContainsOnly;
+use function assertFalse;
+use function assertInstanceOf;
+use function assertInternalType;
+use function assertNotNull;
+use function assertNull;
+use function assertObjectHasAttribute;
+use function assertSame;
+use function assertTrue;
 use function get_class;
 use function sprintf;
 

tests/UnifiedSpecTests/Operation.php

@@ -15,9 +15,15 @@
 use stdClass;
 use function array_diff_key;
 use function array_map;
+use function assertArrayHasKey;
+use function assertInternalType;
+use function assertThat;
 use function get_class;
 use function iterator_to_array;
+use function logicalOr;
+use function logicalXor;
 use function MongoDB\is_last_pipeline_operator_write;
+use function objectHasAttribute;
 use function strtolower;
 
 /**

tests/UnifiedSpecTests/RunOnRequirement.php

@@ -3,6 +3,9 @@
 namespace MongoDB\Tests\UnifiedSpecTests;
 
 use stdClass;
+use function assertContainsOnly;
+use function assertInternalType;
+use function assertRegExp;
 use function in_array;
 use function version_compare;