mongodb
diff --git a/‎.github/workflows/coding-standards.yml
Lines changed: 0 additions & 3 deletions b/‎.github/workflows/coding-standards.yml
Lines changed: 0 additions & 3 deletions
diff --git a/‎.phpcs/autoload.php
Lines changed: 0 additions & 15 deletions b/‎.phpcs/autoload.php
Lines changed: 0 additions & 15 deletions
diff --git a/‎CONTRIBUTING.md
Lines changed: 2 additions & 10 deletions b/‎CONTRIBUTING.md
Lines changed: 2 additions & 10 deletions
diff --git a/‎composer.json
Lines changed: 2 additions & 1 deletion b/‎composer.json
Lines changed: 2 additions & 1 deletion
diff --git a/‎phpcs.xml.dist
Lines changed: 118 additions & 46 deletions b/‎phpcs.xml.dist
Lines changed: 118 additions & 46 deletions
diff --git a/‎src/ChangeStream.php
Lines changed: 2 additions & 1 deletion b/‎src/ChangeStream.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Client.php
Lines changed: 4 additions & 3 deletions b/‎src/Client.php
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/Collection.php
Lines changed: 7 additions & 3 deletions b/‎src/Collection.php
Lines changed: 7 additions & 3 deletions
diff --git a/‎src/Command/ListCollections.php
Lines changed: 1 addition & 0 deletions b/‎src/Command/ListCollections.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Command/ListDatabases.php
Lines changed: 1 addition & 0 deletions b/‎src/Command/ListDatabases.php
Lines changed: 1 addition & 0 deletions
@@ -60,9 +60,6 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
 
-      - name: "Require doctrine/coding-standard"
-        run: "composer require --no-update doctrine/coding-standard=^6.0"
-
       - name: "Install dependencies with Composer"
         run: "composer install --no-interaction --no-progress --no-suggest"
 
 
@@ -47,16 +47,8 @@ $ SYMFONY_PHPUNIT_VERSION=7.5 vendor/bin/simple-phpunit
 ## Checking coding standards
 
 The library's code is checked using [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer),
-which is installed as a development dependency by Composer. Due to the PHP
-requirement, the base version of the coding standard is not installed and needs
-to be added manually if you plan to contributing code:
-
-```
-$ composer require --dev doctrine/coding-standard=^6.0
-```
-
-Once the coding standard has been installed, you can check the code for style
-errors:
+which is installed as a development dependency by Composer. To check the code
+for style errors, run the `phpcs` binary:
 
 
 ```
 
@@ -17,7 +17,8 @@
         "symfony/polyfill-php80": "^1.19"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^3.5, <3.5.5",
+        "squizlabs/php_codesniffer": "^3.6",
+        "doctrine/coding-standard": "^9.0",
         "symfony/phpunit-bridge": "^5.2"
     },
     "autoload": {
 
@@ -1,79 +1,90 @@
 <?xml version="1.0"?>
 <ruleset>
-    <arg name="basepath" value="."/>
-    <arg name="extensions" value="php"/>
-    <arg name="parallel" value="80"/>
-    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="basepath" value="." />
+    <arg name="extensions" value="php" />
+    <arg name="parallel" value="80" />
+    <arg name="cache" value=".phpcs-cache" />
     <arg name="colors" />
 
-    <!-- Ignore warnings, show progress of the run, and show sniff names -->
+    <!-- Ignore warnings (n), show progress of the run (p), and show sniff names (s) -->
     <arg value="nps"/>
 
-    <autoload>.phpcs/autoload.php</autoload>
-
-    <file>.phpcs</file>
     <file>src</file>
     <file>tests</file>
 
+    <!-- ****************************************** -->
+    <!-- Import rules from doctrine/coding-standard -->
+    <!-- ****************************************** -->
     <rule ref="Doctrine">
+        <!-- ********************************************** -->
         <!-- Exclude sniffs that require newer PHP versions -->
-        <!-- 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" />
+        <!-- Requires PHP 7.4 -->
+        <exclude name="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator" />
 
-        <!-- No statement alignment so far -->
-        <exclude name="Generic.Formatting.MultipleStatementAlignment" />
+        <!-- Requires PHP 8.0 -->
+        <exclude name="SlevomatCodingStandard.Classes.ModernClassNameReference.ClassNameReferencedViaFunctionCall" />
 
-        <!-- Class naming sniffs are excluded to preserve BC -->
+
+        <!-- *********************************** -->
+        <!-- Exclude sniffs that cause BC breaks -->
+        <!-- *********************************** -->
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming" />
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming" />
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming" />
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousTraitNaming" />
 
-        <!-- Forbid useless annotations - Git and LICENCE file provide more accurate information -->
-        <!-- Disable forbidden annotation sniff as excluding @api from the list doesn't work -->
-        <exclude name="SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden" />
+        <!-- Can cause subtle BC breaks -->
+        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes" />
+
+
+        <!-- **************************************** -->
+        <!-- Exclude sniffs that force unwanted style -->
+        <!-- **************************************** -->
+        <exclude name="Generic.Formatting.MultipleStatementAlignment" />
+        <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop" />
 
         <!-- Keep long typehints (for now) -->
+        <exclude name="PSR12.Keywords.ShortFormTypeKeywords" />
         <exclude name="SlevomatCodingStandard.PHP.TypeCast.InvalidCastUsed" />
         <exclude name="SlevomatCodingStandard.TypeHints.LongTypeHints" />
 
-        <!-- Don't require a full stop after @throws tags -->
-        <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop" />
 
-        <!-- Disable some sniffs as they can cause functional changes. These will be enabled later -->
+        <!-- ************************************************ -->
+        <!-- Exclude sniffs that may cause functional changes -->
+        <!-- ************************************************ -->
         <exclude name="Generic.PHP.ForbiddenFunctions.FoundWithAlternative" />
-        <exclude name="SlevomatCodingStandard.Classes.UnusedPrivateElements" />
         <exclude name="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison" />
         <exclude name="SlevomatCodingStandard.ControlStructures.EarlyExit" />
         <exclude name="SlevomatCodingStandard.ControlStructures.UselessIfConditionWithReturn" />
         <exclude name="SlevomatCodingStandard.Functions.StaticClosure" />
         <exclude name="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure" />
         <exclude name="SlevomatCodingStandard.Operators.DisallowEqualOperators" />
 
-        <!-- These sniffs cause a large diff, so enable them in separate steps -->
+
+        <!-- ********************************************************* -->
+        <!-- Exclude sniffs that cause a huge diff - enable separately -->
+        <!-- ********************************************************* -->
         <exclude name="SlevomatCodingStandard.Commenting.DocCommentSpacing.IncorrectAnnotationsGroup" />
         <exclude name="Squiz.Strings.DoubleQuoteUsage" />
 
-        <!-- Sniff currently breaks, see https://github.com/slevomat/coding-standard/issues/727 -->
-        <exclude name="SlevomatCodingStandard.Namespaces.NamespaceSpacing" />
+
+        <!-- ********************* -->
+        <!-- Exclude broken sniffs -->
+        <!-- ********************* -->
 
         <!-- Sniff currently broken when casting arrays, see https://github.com/squizlabs/PHP_CodeSniffer/issues/2937#issuecomment-615498860 -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.ValueNoNewline" />
-    </rule>
 
-    <!-- Change use statement sorting to be compatible with PSR-12 -->
-    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
-        <properties>
-            <property name="psr12Compatible" value="true"/>
-        </properties>
+        <!-- Disable forbidden annotation sniff as excluding @api from the list doesn't work -->
+        <exclude name="SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden" />
     </rule>
 
+
+    <!-- ***************************************************** -->
     <!-- Forbid fully qualified names even for colliding names -->
+    <!-- ***************************************************** -->
     <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
         <properties>
             <property name="allowFallbackGlobalConstants" value="false"/>
@@ -88,30 +99,91 @@
         </properties>
     </rule>
 
-    <!-- Only enable some checks regarding type hints -->
-    <!-- In addition to requiring PHP 7.0, this sniff will cause a significant amount of BC breaks. Proceed with caution! -->
-    <rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
-        <!-- Traversable type hints often end up as mixed[], so we skip them for now -->
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversablePropertyTypeHintSpecification" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification" />
 
-        <!-- Will cause BC breaks to method signatures - disabled for now -->
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint" />
+    <!-- **************************************************************************** -->
+    <!-- Exclude BC breaking type hints for parameters, properties, and return values -->
+    <!-- **************************************************************************** -->
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
+        <properties>
+            <!-- Requires PHP 7.4 -->
+            <property name="enableObjectTypeHint" value="false" />
+            <!-- Requires PHP 8.0 -->
+            <property name="enableMixedTypeHint" value="false" />
+            <!-- Requires PHP 8.0 -->
+            <property name="enableUnionTypeHint" value="false" />
+        </properties>
+
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification" />
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.UselessAnnotation" />
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
+        <properties>
+            <!-- Requires PHP 7.4 -->
+            <property name="enableNativeTypeHint" value="false" />
+            <!-- Requires PHP 8.0 -->
+            <property name="enableMixedTypeHint" value="false" />
+            <!-- Requires PHP 8.0 -->
+            <property name="enableUnionTypeHint" value="false" />
+        </properties>
+
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification" />
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.UselessAnnotation" />
+    </rule>
 
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
         <properties>
-            <property name="enableObjectTypeHint" value="true" />
-            <property name="enableEachParameterAndReturnInspection" value="false" />
+            <!-- Requires PHP 7.2 -->
+            <property name="enableObjectTypeHint" value="false" />
+            <!-- Requires PHP 8.0 -->
+            <property name="enableStaticTypeHint" value="false" />
+            <!-- Requires PHP 8.0 -->
+            <property name="enableMixedTypeHint" value="false" />
+            <!-- Requires PHP 8.0 -->
+            <property name="enableUnionTypeHint" value="false" />
         </properties>
+
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.UselessAnnotation" />
     </rule>
 
+
+    <!-- ************************************************************************** -->
+    <!-- Require type hints for all parameters, properties, and return types in src -->
+    <!-- ************************************************************************** -->
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint">
+        <exclude-pattern>tests</exclude-pattern>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint">
+        <exclude-pattern>tests</exclude-pattern>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint">
+        <exclude-pattern>tests</exclude-pattern>
+    </rule>
+
+
+    <!-- *********************************************************************************** -->
+    <!-- Require native type hints for all parameters, properties, and return types in tests -->
+    <!-- *********************************************************************************** -->
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
+        <exclude-pattern>src</exclude-pattern>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint">
+        <exclude-pattern>src</exclude-pattern>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
+        <exclude-pattern>src</exclude-pattern>
+    </rule>
+
+
+    <!-- ************************************************************* -->
+    <!-- Ignore errors for certain files where this is part of the API -->
+    <!-- ************************************************************* -->
     <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
         <exclude-pattern>/src/GridFS/StreamWrapper</exclude-pattern>
         <exclude-pattern>/tests/DocumentationExamplesTest.php</exclude-pattern>
         <exclude-pattern>/tests/GridFS/UnusableStream.php</exclude-pattern>
     </rule>
-
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
         <exclude-pattern>/tests/PHPUnit/ConstraintTrait.php</exclude-pattern>
     </rule>
 
@@ -24,6 +24,7 @@
 use MongoDB\Driver\Exception\ServerException;
 use MongoDB\Exception\ResumeTokenException;
 use MongoDB\Model\ChangeStreamIterator;
+
 use function call_user_func;
 use function in_array;
 
@@ -40,7 +41,7 @@ class ChangeStream implements Iterator
      * @deprecated 1.4
      * @todo Remove this in 2.0 (see: PHPLIB-360)
      */
-    const CURSOR_NOT_FOUND = 43;
+    public const CURSOR_NOT_FOUND = 43;
 
     /** @var int */
     private static $cursorNotFound = 43;
 
@@ -38,6 +38,7 @@
 use MongoDB\Operation\ListDatabases;
 use MongoDB\Operation\Watch;
 use Throwable;
+
 use function is_array;
 use function is_string;
 
@@ -283,7 +284,7 @@ public function getWriteConcern()
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
-    public function listDatabaseNames(array $options = []) : Iterator
+    public function listDatabaseNames(array $options = []): Iterator
     {
         $operation = new ListDatabaseNames($options);
         $server = select_server($this->manager, $options);
@@ -384,7 +385,7 @@ public function watch(array $pipeline = [], array $options = [])
         return $operation->execute($server);
     }
 
-    private static function getVersion() : string
+    private static function getVersion(): string
     {
         if (self::$version === null) {
             try {
@@ -397,7 +398,7 @@ private static function getVersion() : string
         return self::$version;
     }
 
-    private function mergeDriverInfo(array $driver) : array
+    private function mergeDriverInfo(array $driver): array
     {
         $mergedDriver = [
             'name' => 'PHPLIB',
 
@@ -58,6 +58,7 @@
 use MongoDB\Operation\UpdateOne;
 use MongoDB\Operation\Watch;
 use Traversable;
+
 use function array_diff_key;
 use function array_intersect_key;
 use function current;
@@ -234,7 +235,8 @@ public function aggregate(array $pipeline, array $options = [])
          *
          * A read concern is also not compatible with transactions.
          */
-        if (! isset($options['readConcern']) &&
+        if (
+            ! isset($options['readConcern']) &&
             server_supports_feature($server, self::$wireVersionForReadConcern) &&
             ! is_in_transaction($options) &&
             ( ! $hasWriteStage || server_supports_feature($server, self::$wireVersionForReadConcernWithWriteStage))
@@ -246,10 +248,12 @@ public function aggregate(array $pipeline, array $options = [])
             $options['typeMap'] = $this->typeMap;
         }
 
-        if ($hasWriteStage &&
+        if (
+            $hasWriteStage &&
             ! isset($options['writeConcern']) &&
             server_supports_feature($server, self::$wireVersionForWritableCommandWriteConcern) &&
-            ! is_in_transaction($options)) {
+            ! is_in_transaction($options)
+        ) {
             $options['writeConcern'] = $this->writeConcern;
         }
 
 
@@ -24,6 +24,7 @@
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Model\CachingIterator;
 use MongoDB\Operation\Executable;
+
 use function is_array;
 use function is_bool;
 use function is_integer;
 
@@ -24,6 +24,7 @@
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnexpectedValueException;
 use MongoDB\Operation\Executable;
+
 use function current;
 use function is_array;
 use function is_bool;
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`use MongoDB\Operation\ListDatabases;`
`39`	`39`	`use MongoDB\Operation\Watch;`
`40`	`40`	`use Throwable;`
	`41`	`+`
`41`	`42`	`use function is_array;`
`42`	`43`	`use function is_string;`
`43`	`44`
`@@ -283,7 +284,7 @@ public function getWriteConcern()`
`283`	`284`	`* @throws InvalidArgumentException for parameter/option parsing errors`
`284`	`285`	`* @throws DriverRuntimeException for other driver errors (e.g. connection errors)`
`285`	`286`	`*/`
`286`		`- public function listDatabaseNames(array $options = []) : Iterator`
	`287`	`+ public function listDatabaseNames(array $options = []): Iterator`
`287`	`288`	`{`
`288`	`289`	`$operation = new ListDatabaseNames($options);`
`289`	`290`	`$server = select_server($this->manager, $options);`
`@@ -384,7 +385,7 @@ public function watch(array $pipeline = [], array $options = [])`
`384`	`385`	`return $operation->execute($server);`
`385`	`386`	`}`
`386`	`387`
`387`		`- private static function getVersion() : string`
	`388`	`+ private static function getVersion(): string`
`388`	`389`	`{`
`389`	`390`	`if (self::$version === null) {`
`390`	`391`	`try {`
`@@ -397,7 +398,7 @@ private static function getVersion() : string`
`397`	`398`	`return self::$version;`
`398`	`399`	`}`
`399`	`400`
`400`		`- private function mergeDriverInfo(array $driver) : array`
	`401`	`+ private function mergeDriverInfo(array $driver): array`
`401`	`402`	`{`
`402`	`403`	`$mergedDriver = [`
`403`	`404`	`'name' => 'PHPLIB',`