Merge pull request #41 from samsonasik/apply-php80

Apply PHP 8.0 syntax
laminas · Nov 8, 2022 · 4993514 · 4993514
2 parents 1e1a076 + ea9ec57
commit 4993514
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/ExtMongoDb.php b/src/ExtMongoDb.php
@@ -17,10 +17,8 @@
 
 use function array_key_exists;
 use function assert;
-use function get_class;
-use function gettype;
+use function get_debug_type;
 use function is_array;
-use function is_object;
 use function microtime;
 use function round;
 use function sprintf;
@@ -138,7 +136,7 @@ protected function internalGetItem(&$normalizedKey, &$success = null, &$casToken
                     . ": the field 'expired' isn't an instance of MongoDate, '%s' found instead",
                     (string) $result['_id'],
                     $this->namespacePrefix . $normalizedKey,
-                    is_object($result['expires']) ? get_class($result['expires']) : gettype($result['expires'])
+                    get_debug_type($result['expires'])
                 ));
             }
 
@@ -162,11 +160,10 @@ protected function internalGetItem(&$normalizedKey, &$success = null, &$casToken
     }
 
     /**
-     * @param mixed $result
      * @param-out array|mixed $result
      * @psalm-assert-if-true array $result
      */
-    private function ensureArrayType(&$result): bool
+    private function ensureArrayType(mixed &$result): bool
     {
         if ($result instanceof ArrayObject) {
             $result = $result->getArrayCopy();

diff --git a/src/ExtMongoDbOptions.php b/src/ExtMongoDbOptions.php
@@ -137,7 +137,6 @@ public function setServer($server)
     }
 
     /**
-     * @param array $connectionOptions
      * @return $this Provides a fluent interface
      */
     public function setConnectionOptions(array $connectionOptions)

diff --git a/src/ExtMongoDbResourceManager.php b/src/ExtMongoDbResourceManager.php
@@ -10,9 +10,8 @@
 use MongoDB\Driver\Exception\Exception as MongoDriverException;
 
 use function assert;
-use function gettype;
+use function get_debug_type;
 use function is_array;
-use function is_object;
 use function is_string;
 use function sprintf;
 
@@ -65,7 +64,7 @@ public function setResource($id, $resource)
                 '%s expects an array or %s; received %s',
                 __METHOD__,
                 Collection::class,
-                is_object($resource) ? $resource::class : gettype($resource)
+                get_debug_type($resource)
             ));
         }
 
@@ -153,7 +152,6 @@ public function getServer($id)
 
     /**
      * @param string $id
-     * @param array $connectionOptions
      * @return void
      */
     public function setConnectionOptions($id, array $connectionOptions)
@@ -185,7 +183,6 @@ public function getConnectionOptions($id)
 
     /**
      * @param string $id
-     * @param array $driverOptions
      * @return void
      */
     public function setDriverOptions($id, array $driverOptions)