alcaeus / mongo-php-adapter

lib/Mongo/MongoLog.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
      * <ul>
      * @return boolean Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
      */
-    public static function setCallback(callable $log_function )
+    public static function setCallback(callable $log_function)
     {
         self::$callback = $log_function;
         return true;

lib/Mongo/MongoGridFSCursor.php

Spacing +1 added lines, -1 removed lines

@@ -65,6 +65,6 @@
     public function key()
     {
         $file = $this->current();
-        return ($file !== null) ? (string)$file->file['_id'] : null;
+        return ($file !== null) ? (string) $file->file['_id'] : null;
     }
 }

lib/Mongo/functions.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
 use Alcaeus\MongoDbAdapter\TypeConverter;
 
-if (! function_exists('bson_decode')) {
+if ( ! function_exists('bson_decode')) {
     /**
      * Deserializes a BSON object into a PHP array
      *
@@ -28,7 +28,7 @@ 
     }
 }
 
-if (! function_exists('bson_encode')) {
+if ( ! function_exists('bson_encode')) {
     /**
      * Serializes a PHP variable into a BSON string
      *

lib/Mongo/MongoClient.php

Spacing +9 added lines, -9 removed lines

@@ -28,13 +28,13 @@ 
     use Helper\WriteConcern;
 
     const VERSION = '1.6.12';
-    const DEFAULT_HOST = "localhost" ;
-    const DEFAULT_PORT = 27017 ;
-    const RP_PRIMARY = "primary" ;
-    const RP_PRIMARY_PREFERRED = "primaryPreferred" ;
-    const RP_SECONDARY = "secondary" ;
-    const RP_SECONDARY_PREFERRED = "secondaryPreferred" ;
-    const RP_NEAREST = "nearest" ;
+    const DEFAULT_HOST = "localhost";
+    const DEFAULT_PORT = 27017;
+    const RP_PRIMARY = "primary";
+    const RP_PRIMARY_PREFERRED = "primaryPreferred";
+    const RP_SECONDARY = "secondary";
+    const RP_SECONDARY_PREFERRED = "secondaryPreferred";
+    const RP_NEAREST = "nearest";
 
     /**
      * @var bool
@@ -84,7 +84,7 @@ 
 
         $this->server = $server;
         if (false === strpos($this->server, 'mongodb://')) {
-            $this->server = 'mongodb://'.$this->server;
+            $this->server = 'mongodb://' . $this->server;
         }
         $this->client = new Client($this->server, $options, $driverOptions);
         $info = $this->client->__debugInfo();
@@ -230,7 +230,7 @@ 
      * @param int|MongoInt64 $id The ID of the cursor to kill.
      * @return bool
      */
-    public function killCursor($server_hash , $id)
+    public function killCursor($server_hash, $id)
     {
         $this->notImplemented();
     }

Doc Comments +3 added lines, -3 removed lines

@@ -234,7 +234,7 @@ 
      * @link http://www.php.net/manual/en/mongoclient.killcursor.php
      * @param string $server_hash The server hash that has the cursor.
      * @param int|MongoInt64 $id The ID of the cursor to kill.
-     * @return bool
+     * @return boolean|null
      */
     public function killCursor($server_hash , $id)
     {
@@ -342,7 +342,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     function __sleep()
     {
@@ -352,7 +352,7 @@ 
     }
 
     /**
-     * @param $server
+     * @param string $server
      * @return array
      */
     private function extractUrlOptions($server)

lib/Mongo/MongoDB.php

Spacing +5 added lines, -5 removed lines

@@ -138,7 +138,7 @@ 
             throw ExceptionConverter::toLegacy($e);
         }
 
-        $getCollectionInfo = function (CollectionInfo $collectionInfo) {
+        $getCollectionInfo = function(CollectionInfo $collectionInfo) {
             return [
                 'name' => $collectionInfo->getName(),
                 'options' => $collectionInfo->getOptions(),
@@ -175,7 +175,7 @@ 
             throw ExceptionConverter::toLegacy($e);
         }
 
-        $getCollectionName = function (CollectionInfo $collectionInfo) {
+        $getCollectionName = function(CollectionInfo $collectionInfo) {
             return $collectionInfo->getName();
         };
 
@@ -344,13 +344,13 @@ 
         if ($document_or_id instanceof \MongoId) {
             $id = $document_or_id;
         } elseif (is_object($document_or_id)) {
-            if (! isset($document_or_id->_id)) {
+            if ( ! isset($document_or_id->_id)) {
                 $id = $document_or_id;
             } else {
                 $id = $document_or_id->_id;
             }
         } elseif (is_array($document_or_id)) {
-            if (! isset($document_or_id['_id'])) {
+            if ( ! isset($document_or_id['_id'])) {
                 return null;
             }
 
@@ -541,7 +541,7 @@ 
      * @return Closure
      */
     private function getSystemCollectionFilterClosure($includeSystemCollections = false) {
-        return function (CollectionInfo $collectionInfo) use ($includeSystemCollections) {
+        return function(CollectionInfo $collectionInfo) use ($includeSystemCollections) {
             return $includeSystemCollections || ! preg_match('#^system\.#', $collectionInfo->getName());
         };
     }

Braces +2 added lines, -1 removed lines

@@ -540,7 +540,8 @@
      * @param bool $includeSystemCollections
      * @return Closure
      */
-    private function getSystemCollectionFilterClosure($includeSystemCollections = false) {
+    private function getSystemCollectionFilterClosure($includeSystemCollections = false)
+    {
         return function (CollectionInfo $collectionInfo) use ($includeSystemCollections) {
             return $includeSystemCollections || ! preg_match('#^system\.#', $collectionInfo->getName());
         };

Doc Comments +4 added lines, -1 removed lines

@@ -511,6 +511,9 @@ 
         }
     }
 
+    /**
+     * @param string $name
+     */
     private function checkDatabaseName($name)
     {
         if (empty($name)) {
@@ -543,7 +546,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -258,7 +258,7 @@
      * @param bool $backup_original_files [optional] <p>If original files should be backed up.</p>
      * @return array <p>Returns db response.</p>
      */
-    public function repair($preserve_cloned_files = FALSE, $backup_original_files = FALSE)
+    public function repair($preserve_cloned_files = false, $backup_original_files = false)
     {
         $command = [
             'repairDatabase' => 1,

lib/Alcaeus/MongoDbAdapter/AbstractCursor.php

Doc Comments +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
     ];
 
     /**
-     * @return Cursor
+     * @return \Traversable
      */
     abstract protected function ensureCursor();
 
@@ -377,7 +377,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Spacing +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
      */
     public function next()
     {
-        if (! $this->startedIterating) {
+        if ( ! $this->startedIterating) {
             $this->ensureIterator();
             $this->startedIterating = true;
         } else {
@@ -402,7 +402,7 @@ 
      */
     protected function storeIteratorState()
     {
-        if (! $this->startedIterating) {
+        if ( ! $this->startedIterating) {
             $this->current = null;
             $this->key = null;
             $this->valid = false;

lib/Mongo/MongoCommandCursor.php

Doc Comments +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

lib/Mongo/MongoGridFS.php

Doc Comments +1 added lines, -2 removed lines

@@ -105,7 +105,6 @@ 
      * @link http://php.net/manual/en/mongogridfs.find.php
      * @param array $query The query
      * @param array $fields Fields to return
-     * @param array $options Options for the find command
      * @return MongoGridFSCursor A MongoGridFSCursor
      */
     public function find(array $query = [], array $fields = [])
@@ -446,7 +445,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Spacing +12 added lines, -12 removed lines

@@ -127,7 +127,7 @@ 
      */
     public function findOne($query = [], array $fields = [], array $options = [])
     {
-        if (! is_array($query)) {
+        if ( ! is_array($query)) {
             $query = ['filename' => (string) $query];
         }
 
@@ -203,7 +203,7 @@ 
         try {
             $file = $this->insertFile($record, $options);
         } catch (MongoException $e) {
-            throw new MongoGridFSException('Could not store file: '. $e->getMessage(), 0, $e);
+            throw new MongoGridFSException('Could not store file: ' . $e->getMessage(), 0, $e);
         }
 
         try {
@@ -240,10 +240,10 @@ 
             ];
 
             $handle = fopen($filename, 'r');
-            if (! $handle) {
+            if ( ! $handle) {
                 throw new MongoGridFSException('could not open file: ' . $filename);
             }
-        } elseif (! is_resource($filename)) {
+        } elseif ( ! is_resource($filename)) {
             throw new \Exception('first argument must be a string or stream resource');
         } else {
             $handle = $filename;
@@ -266,10 +266,10 @@ 
 
         // Add length and MD5 if they were not present before
         $update = [];
-        if (! isset($record['length'])) {
+        if ( ! isset($record['length'])) {
             $update['length'] = $length;
         }
-        if (! isset($record['md5'])) {
+        if ( ! isset($record['md5'])) {
             try {
                 $update['md5'] = $md5;
             } catch (MongoException $e) {
@@ -280,7 +280,7 @@ 
         if (count($update)) {
             try {
                 $result = $this->update(['_id' => $file['_id']], ['$set' => $update]);
-                if (! $this->isOKResult($result)) {
+                if ( ! $this->isOKResult($result)) {
                     throw new MongoGridFSException('Could not store file');
                 }
             } catch (MongoException $e) {
@@ -304,10 +304,10 @@ 
      */
     public function storeUpload($name, array $metadata = [])
     {
-        if (! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
+        if ( ! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
             throw new MongoGridFSException("Could not find uploaded file $name");
         }
-        if (! isset($_FILES[$name]['tmp_name'])) {
+        if ( ! isset($_FILES[$name]['tmp_name'])) {
             throw new MongoGridFSException("Couldn't find tmp_name in the \$_FILES array. Are you sure the upload worked?");
         }
 
@@ -357,7 +357,7 @@ 
 
         $result = $this->chunks->insert($chunk);
 
-        if (! $this->isOKResult($result)) {
+        if ( ! $this->isOKResult($result)) {
             throw new \MongoException('error inserting chunk');
         }
 
@@ -402,7 +402,7 @@ 
         $hash = hash_init('md5');
 
         rewind($handle);
-        while (! feof($handle)) {
+        while ( ! feof($handle)) {
             $data = stream_get_contents($handle, $chunkSize);
             hash_update($hash, $data);
             $this->insertChunk($fileId, $data, $i++);
@@ -432,7 +432,7 @@ 
 
         $result = $this->insert($record, $options);
 
-        if (! $this->isOKResult($result)) {
+        if ( ! $this->isOKResult($result)) {
             throw new \MongoException('error inserting file');
         }
 

lib/Mongo/MongoCursor.php

Doc Comments +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Spacing +3 added lines, -3 removed lines

@@ -221,7 +221,7 @@ 
      */
     public function hasNext()
     {
-        if (! $this->startedIterating) {
+        if ( ! $this->startedIterating) {
             $this->ensureIterator();
             $this->startedIterating = true;
             $this->storeIteratorState();
@@ -405,7 +405,7 @@ 
      */
     protected function convertCursorType()
     {
-        if (! $this->tailable) {
+        if ( ! $this->tailable) {
             return null;
         }
 
@@ -446,7 +446,7 @@ 
     protected function wrapTraversable(\Traversable $traversable)
     {
         foreach ($traversable as $key => $value) {
-            if (isset($value->_id) && ($value->_id instanceof \MongoDB\BSON\ObjectID || !is_object($value->_id))) {
+            if (isset($value->_id) && ($value->_id instanceof \MongoDB\BSON\ObjectID || ! is_object($value->_id))) {
                 $key = (string) $value->_id;
             }
             yield $key => $value;

Unused Use Statements -1 removed lines

@@ -21,7 +21,6 @@
 use Alcaeus\MongoDbAdapter\TypeConverter;
 use Alcaeus\MongoDbAdapter\ExceptionConverter;
 use MongoDB\Driver\Cursor;
-use MongoDB\Driver\ReadPreference;
 use MongoDB\Operation\Find;
 
 /**