Write models refactoring

Author: petr-buchin

src/Cursor.php

@@ -2,13 +2,41 @@
 
 namespace Tequilla\MongoDB\Options\Traits;
 
+use Symfony\Component\OptionsResolver\Exception\InvalidArgumentException as OptionsResolverException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Tequilla\MongoDB\Exception\InvalidArgumentException;
 
 trait CachedResolverTrait
 {
+    /**
+     * @var OptionsResolver
+     */
     private static $cachedResolver;
 
-    public static function getCachedResolver()
+    /**
+     * @param array $options
+     * @return array
+     */
+    public static function resolve(array $options)
+    {
+        try {
+            return self::getCachedResolver()->resolve($options);
+        } catch (OptionsResolverException $e) {
+            throw new InvalidArgumentException($e->getMessage());
+        }
+    }
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public static function configureOptions(OptionsResolver $resolver)
+    {
+    }
+
+    /**
+     * @return OptionsResolver
+     */
+    private static function getCachedResolver()
     {
         if (!self::$cachedResolver) {
             self::$cachedResolver = new OptionsResolver();
@@ -17,8 +45,4 @@ public static function getCachedResolver()
 
         return self::$cachedResolver;
     }
-
-    public static function configureOptions(OptionsResolver $resolver)
-    {
-    }
 }

src/Options/Traits/CachedResolverTrait.php

@@ -43,10 +43,10 @@ class BulkWrite
      * @param \Tequilla\MongoDB\Write\Model\WriteModelInterface[] $requests
      * @param array $options
      */
-    public function __construct($requests, array $options)
+    public function __construct($requests, array $options = [])
     {
         $this->requests = $requests;
-        $this->options = BulkWriteOptions::getCachedResolver()->resolve($options);
+        $this->options = BulkWriteOptions::resolve($options);
 
         if (isset($this->options['writeConcern'])) {
             $this->writeConcern = $this->options['writeConcern'];
@@ -127,10 +127,10 @@ public function execute(Connection $connection, $databaseName, $collectionName)
             if (!$request instanceof WriteModelInterface) {
                 throw new InvalidArgumentException(
                     sprintf(
-                        'Every request in $requests must be an instance of %s, %s given in $requests[%d]',
+                        '$requests[%d] must be an instance of %s, %s given',
+                        $i,
                         WriteModelInterface::class,
-                        TypeUtils::getType($request),
-                        $i
+                        TypeUtils::getType($request)
                     )
                 );
             }

src/Write/Bulk/BulkWrite.php

@@ -2,7 +2,7 @@
 
 namespace Tequilla\MongoDB\Write\Model;
 
-use Tequilla\MongoDB\Write\Options\DeleteOneOptions;
+use Tequilla\MongoDB\Write\Options\DeleteOptions;
 
 class DeleteOne implements WriteModelInterface
 {
@@ -18,6 +18,6 @@ public function __construct($filter, array $options = [])
         $this->ensureValidFilter($filter);
 
         $this->filter = $filter;
-        $this->options = DeleteOneOptions::getCachedResolver()->resolve($options);
+        $this->options = DeleteOptions::->resolve($options);
     }
 }

src/Write/Model/DeleteOne.php

@@ -5,7 +5,7 @@
 use Tequilla\MongoDB\Exception\InvalidArgumentException;
 use Tequilla\MongoDB\Util\TypeUtils;
 use Tequilla\MongoDB\Write\Bulk\BulkWrite;
-use Tequilla\MongoDB\Write\Options\ReplaceOneOptions;
+use Tequilla\MongoDB\Write\Options\UpdateOptions;
 
 class ReplaceOne implements WriteModelInterface
 {
@@ -46,9 +46,16 @@ public function __construct($filter, $replacement, array $options = [])
 
         $this->ensureValidDocument($replacement);
 
+        $options = UpdateOptions::resolve($options);
+        if (isset($options['multi']) && $options['multi']) {
+            throw new InvalidArgumentException(
+                'ReplaceOne operation does not allow option "multi" to be true'
+            );
+        }
+
         $this->filter = $filter;
         $this->replacement = $replacement;
-        $this->options = ReplaceOneOptions::getCachedResolver()->resolve($options);
+        $this->options = $options;
     }
 
     public function writeToBulk(BulkWrite $bulk)

src/Write/Model/ReplaceOne.php

@@ -8,7 +8,6 @@ class Update implements WriteModelInterface
 {
     use Traits\EnsureValidFilterTrait;
     use Traits\BulkUpdateTrait;
-    use Traits\EnsureValidUpdateTrait;
 
     /**
      * @param array|object $filter
@@ -20,6 +19,6 @@ public function __construct($filter, $update, array $options = [])
         $this->ensureValidFilter($filter);
         $this->filter = $filter;
         $this->update = $update;
-        $this->options = UpdateOptions::getCachedResolver()->resolve($options);
+        $this->options = UpdateOptions::resolve($options);
     }
 }

src/Write/Model/Update.php

@@ -2,14 +2,14 @@
 
 namespace Tequilla\MongoDB\Write\Model;
 
-use Tequilla\MongoDB\Write\Options\UpdateManyOptions;
+use Tequilla\MongoDB\Exception\InvalidArgumentException;
+use Tequilla\MongoDB\Write\Options\UpdateOptions;
 
 class UpdateMany implements WriteModelInterface
 {
     use Traits\EnsureValidFilterTrait;
     use Traits\EnsureValidUpdateTrait;
     use Traits\BulkUpdateTrait;
-    use Traits\EnsureValidUpdateTrait;
 
     /**
      * Update constructor.
@@ -22,8 +22,15 @@ public function __construct($filter, $update, array $options = [])
         $this->ensureValidFilter($filter);
         $this->ensureValidUpdate($update);
 
+        $options = UpdateOptions::resolve($options);
+        if (isset($options['multi']) && !$options['multi']) {
+            throw new InvalidArgumentException(
+                'UpdateMany operation does not allow option "multi" to be false'
+            );
+        }
+
         $this->filter = $filter;
         $this->update = $update;
-        $this->options = UpdateManyOptions::getCachedResolver()->resolve($options);
+        $this->options = $options;
     }
 }

src/Write/Model/UpdateMany.php

@@ -2,14 +2,14 @@
 
 namespace Tequilla\MongoDB\Write\Model;
 
-use Tequilla\MongoDB\Write\Options\UpdateOneOptions;
+use Tequilla\MongoDB\Exception\InvalidArgumentException;
+use Tequilla\MongoDB\Write\Options\UpdateOptions;
 
 class UpdateOne implements WriteModelInterface
 {
     use Traits\EnsureValidFilterTrait;
     use Traits\EnsureValidUpdateTrait;
     use Traits\BulkUpdateTrait;
-    use Traits\EnsureValidUpdateTrait;
 
     /**
      * Update constructor.
@@ -22,8 +22,15 @@ public function __construct($filter, $update, array $options = [])
         $this->ensureValidFilter($filter);
         $this->ensureValidUpdate($update);
 
+        $options = UpdateOptions::resolve($options);
+        if (isset($options['multi']) && $options['multi']) {
+            throw new InvalidArgumentException(
+                'UpdateOne operation does not allow option "multi" to be true'
+            );
+        }
+
         $this->filter = $filter;
         $this->update = $update;
-        $this->options = UpdateOneOptions::getCachedResolver()->resolve($options);
+        $this->options = $options;
     }
 }