Require use of PHP 7 features in coding standard

Author: alcaeus

composer.json

@@ -18,7 +18,7 @@
     "require-dev": {
         "phpunit/phpunit": "^6.4 || ^8.3",
         "sebastian/comparator": "^2.0 || ^3.0",
-        "squizlabs/php_codesniffer": "^3.4",
+        "squizlabs/php_codesniffer": "^3.5",
         "symfony/phpunit-bridge": "^4.4@dev"
     },
     "autoload": {

phpcs.xml.dist

@@ -17,16 +17,14 @@
 
     <rule ref="Doctrine">
         <!-- Exclude sniffs that require newer PHP versions -->
-        <!-- Available with PHP 7.0 -->
-        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes" />
-        <exclude name="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly" />
-        <exclude name="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator" />
-
         <!-- Available with PHP 7.1 -->
         <exclude name="SlevomatCodingStandard.Classes.ClassConstantVisibility" />
         <exclude name="SlevomatCodingStandard.PHP.ShortList.LongListUsed" />
         <exclude name="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue" />
 
+        <!-- Can cause subtle BC breaks, disabled for now -->
+        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes" />
+
         <!-- No statement alignment so far -->
         <exclude name="Generic.Formatting.MultipleStatementAlignment" />
 

src/Client.php

@@ -109,7 +109,7 @@ public function __construct($uri = 'mongodb://127.0.0.1/', array $uriOptions = [
         }
 
         $this->uri = (string) $uri;
-        $this->typeMap = isset($driverOptions['typeMap']) ? $driverOptions['typeMap'] : null;
+        $this->typeMap = $driverOptions['typeMap'] ?? null;
 
         unset($driverOptions['typeMap']);
 

src/Collection.php

@@ -162,10 +162,10 @@ public function __construct(Manager $manager, $databaseName, $collectionName, ar
         $this->manager = $manager;
         $this->databaseName = (string) $databaseName;
         $this->collectionName = (string) $collectionName;
-        $this->readConcern = isset($options['readConcern']) ? $options['readConcern'] : $this->manager->getReadConcern();
-        $this->readPreference = isset($options['readPreference']) ? $options['readPreference'] : $this->manager->getReadPreference();
-        $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : self::$defaultTypeMap;
-        $this->writeConcern = isset($options['writeConcern']) ? $options['writeConcern'] : $this->manager->getWriteConcern();
+        $this->readConcern = $options['readConcern'] ?? $this->manager->getReadConcern();
+        $this->readPreference = $options['readPreference'] ?? $this->manager->getReadPreference();
+        $this->typeMap = $options['typeMap'] ?? self::$defaultTypeMap;
+        $this->writeConcern = $options['writeConcern'] ?? $this->manager->getWriteConcern();
     }
 
     /**

src/Database.php

@@ -129,10 +129,10 @@ public function __construct(Manager $manager, $databaseName, array $options = []
 
         $this->manager = $manager;
         $this->databaseName = (string) $databaseName;
-        $this->readConcern = isset($options['readConcern']) ? $options['readConcern'] : $this->manager->getReadConcern();
-        $this->readPreference = isset($options['readPreference']) ? $options['readPreference'] : $this->manager->getReadPreference();
-        $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : self::$defaultTypeMap;
-        $this->writeConcern = isset($options['writeConcern']) ? $options['writeConcern'] : $this->manager->getWriteConcern();
+        $this->readConcern = $options['readConcern'] ?? $this->manager->getReadConcern();
+        $this->readPreference = $options['readPreference'] ?? $this->manager->getReadPreference();
+        $this->typeMap = $options['typeMap'] ?? self::$defaultTypeMap;
+        $this->writeConcern = $options['writeConcern'] ?? $this->manager->getWriteConcern();
     }
 
     /**

src/GridFS/Bucket.php

@@ -180,10 +180,10 @@ public function __construct(Manager $manager, $databaseName, array $options = []
         $this->bucketName = $options['bucketName'];
         $this->chunkSizeBytes = $options['chunkSizeBytes'];
         $this->disableMD5 = $options['disableMD5'];
-        $this->readConcern = isset($options['readConcern']) ? $options['readConcern'] : $this->manager->getReadConcern();
-        $this->readPreference = isset($options['readPreference']) ? $options['readPreference'] : $this->manager->getReadPreference();
-        $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : self::$defaultTypeMap;
-        $this->writeConcern = isset($options['writeConcern']) ? $options['writeConcern'] : $this->manager->getWriteConcern();
+        $this->readConcern = $options['readConcern'] ?? $this->manager->getReadConcern();
+        $this->readPreference = $options['readPreference'] ?? $this->manager->getReadPreference();
+        $this->typeMap = $options['typeMap'] ?? self::$defaultTypeMap;
+        $this->writeConcern = $options['writeConcern'] ?? $this->manager->getWriteConcern();
 
         $collectionOptions = array_intersect_key($options, ['readConcern' => 1, 'readPreference' => 1, 'typeMap' => 1, 'writeConcern' => 1]);
 
@@ -688,7 +688,7 @@ private function getRawFileDocumentForStream($stream)
         $metadata = stream_get_meta_data($stream);
 
         if (! isset($metadata['wrapper_data']) || ! $metadata['wrapper_data'] instanceof StreamWrapper) {
-            throw InvalidArgumentException::invalidType('$stream wrapper data', isset($metadata['wrapper_data']) ? $metadata['wrapper_data'] : null, StreamWrapper::class);
+            throw InvalidArgumentException::invalidType('$stream wrapper data', $metadata['wrapper_data'] ?? null, StreamWrapper::class);
         }
 
         return $metadata['wrapper_data']->getFile();

src/GridFS/StreamWrapper.php

@@ -17,9 +17,9 @@
 
 namespace MongoDB\GridFS;
 
-use Exception;
 use MongoDB\BSON\UTCDateTime;
 use stdClass;
+use Throwable;
 use function explode;
 use function get_class;
 use function in_array;
@@ -150,7 +150,7 @@ public function stream_read($length)
 
         try {
             return $this->stream->readBytes($length);
-        } catch (Exception $e) {
+        } catch (Throwable $e) {
             trigger_error(sprintf('%s: %s', get_class($e), $e->getMessage()), E_USER_WARNING);
 
             return false;
@@ -247,7 +247,7 @@ public function stream_write($data)
 
         try {
             return $this->stream->writeBytes($data);
-        } catch (Exception $e) {
+        } catch (Throwable $e) {
             trigger_error(sprintf('%s: %s', get_class($e), $e->getMessage()), E_USER_WARNING);
 
             return false;

src/Model/ChangeStreamIterator.php

@@ -230,8 +230,8 @@ private function extractResumeToken($document)
         }
 
         $resumeToken = is_array($document)
-            ? (isset($document['_id']) ? $document['_id'] : null)
-            : (isset($document->_id) ? $document->_id : null);
+            ? ($document['_id'] ?? null)
+            : ($document->_id ?? null);
 
         if (! isset($resumeToken)) {
             $this->isValid = false;

src/Operation/Aggregate.php

@@ -325,7 +325,7 @@ public function execute(Server $server)
     private function createCommand(Server $server, $hasWriteStage)
     {
         $cmd = [
-            'aggregate' => isset($this->collectionName) ? $this->collectionName : 1,
+            'aggregate' => $this->collectionName ?? 1,
             'pipeline' => $this->pipeline,
         ];
         $cmdOptions = [];

src/Operation/FindAndModify.php

@@ -243,7 +243,7 @@ public function execute(Server $server)
 
         $result = current($cursor->toArray());
 
-        return isset($result->value) ? $result->value : null;
+        return $result->value ?? null;
     }
 
     public function getCommandDocument(Server $server)