Harden checks for writeConcern options

* Throw an exception when wTimeout or journal are passed without a w option
* Cast w to int if it's numeric to ensure correct handling of writeConcern values in the driver

Author: alcaeus

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommand.php

@@ -9,8 +9,10 @@
 use Doctrine\ODM\MongoDB\SchemaManager;
 use MongoDB\Driver\WriteConcern;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use function is_numeric;
 use function is_string;
 
 abstract class AbstractCommand extends Command
@@ -26,8 +28,8 @@ protected function configure()
         $this
             ->addOption('maxTimeMs', null, InputOption::VALUE_REQUIRED, 'An optional maxTimeMs that will be used for all schema operations.')
             ->addOption('w', null, InputOption::VALUE_REQUIRED, 'An optional w option for the write concern that will be used for all schema operations.')
-            ->addOption('wTimeout', null, InputOption::VALUE_REQUIRED, 'An optional wTimeout option for the write concern that will be used for all schema operations. This option will be ignored if no w option was specified.')
-            ->addOption('journal', null, InputOption::VALUE_REQUIRED, 'An optional journal option for the write concern that will be used for all schema operations. This option will be ignored if no w option was specified.');
+            ->addOption('wTimeout', null, InputOption::VALUE_REQUIRED, 'An optional wTimeout option for the write concern that will be used for all schema operations. Using this option without a w option will cause an exception to be thrown.')
+            ->addOption('journal', null, InputOption::VALUE_REQUIRED, 'An optional journal option for the write concern that will be used for all schema operations. Using this option without a w option will cause an exception to be thrown.');
     }
 
     abstract protected function processDocumentCollection(SchemaManager $sm, string $document, ?int $maxTimeMs, ?WriteConcern $writeConcern);
@@ -75,14 +77,23 @@ protected function getMaxTimeMsFromInput(InputInterface $input) : ?int
 
     protected function getWriteConcernFromInput(InputInterface $input) : ?WriteConcern
     {
-        $w = $input->getOption('w');
+        $w        = $input->getOption('w');
+        $wTimeout = $input->getOption('wTimeout');
+        $journal  = $input->getOption('journal');
+
         if (! is_string($w)) {
+            if ($wTimeout !== null || $journal !== null) {
+                throw new InvalidOptionException('The "wTimeout" or "journal" options can only be used when passing a "w" option.');
+            }
+
             return null;
         }
 
-        $wTimeout = $input->getOption('wTimeout');
+        if (is_numeric($w)) {
+            $w = (int) $w;
+        }
+
         $wTimeout = is_string($wTimeout) ? (int) $wTimeout : 0;
-        $journal  = $input->getOption('journal');
         $journal  = is_string($journal) ? (bool) $journal : false;
 
         return new WriteConcern($w, $wTimeout, $journal);

phpstan.neon.dist

@@ -6,3 +6,5 @@ parameters:
   ignoreErrors:
     # See https://github.com/mongodb/mongo-php-driver/issues/940
     - '#^PHPDoc tag @throws with type MongoDB\\Driver\\Exception\\Exception is not subtype of Throwable$#'
+    # See https://github.com/phpstan/phpstan/pull/1730
+    - '#^Parameter \#1 $wstring of class MongoDB\\Driver\\WriteConcern constructor expects string, int|string given\.$#'