giginc · Edsol · Feb 21, 2024 · Feb 21, 2024 · Feb 21, 2024 · Feb 23, 2024
diff --git a/README.md b/README.md
@@ -1,5 +1,14 @@
 [![Slack](https://img.shields.io/badge/join%20the%20conversation-on%20slack-green.svg)](https://mongodb-cakephp3.slack.com/messages/general/)
 
+# what's more
+The fork fixes some bugs and adds the ability to be able to count rows in a collection:
+
+```php
+$this->Categories->count($filters, $options);
+```
+
+---
+
 Mongodb for Cakephp3
 ========
 
@@ -10,15 +19,15 @@ An Mongodb datasource for CakePHP 3.5
 Install [composer](http://getcomposer.org) and run:
 
 ```bash
-composer require giginc/mongodb 1.0.0
+composer require Edsol/mongodb 1.0.0
 ```
 
 ## Connecting the Plugin to your application
 
 add the following line in your config/bootstrap.php to tell your application to load the plugin:
 
 ```php
-Plugin::load('Giginc/Mongodb');
+Plugin::load('Edsol/Mongodb');
 
 ```
 
@@ -28,11 +37,12 @@ Now, you need to set the connection in your config/app.php file:
 ```php
  'Datasources' => [
     'default' => [
-        'className' => 'Giginc\Mongodb\Database\Connection',
-        'driver' => 'Giginc\Mongodb\Database\Driver\Mongodb',
+        'className' => 'Edsol\Mongodb\Database\Connection',
+        'driver' => 'Edsol\Mongodb\Database\Driver\Mongodb',
         'persistent' => false,
         'host' => 'localhost',
         'port' => 27017,
+        'srv' => false,
         'username' => '',
         'password' => '',
         'database' => 'devmongo',
@@ -51,12 +61,12 @@ Now, you need to set the connection in your config/app.php file:
 If you want to connect to MongoDB using a SSH tunnel, you need to set additional variables in your Datasource. Some variables are unnecessary, depending on how you intend to connect. IF you're connecting using a SSH key file, the ```ssh_pubkey_path``` and ```ssh_privatekey_path``` variables are necessary and the ```ssh_password``` variable is unnecessary. If you're connecting using a text-based password (which is **not** a wise idea), the reverse is true. The function needs, at minimum, ```ssh_host```, ```ssh_user``` and one method of authentication to establish a SSH tunnel.
 
 ## Models
-After that, you need to load Giginc\Mongodb\ORM\Table in your tables class:
+After that, you need to load Edsol\Mongodb\ORM\Table in your tables class:
 
 ```php
 //src/Model/Table/YourTable.php
 
-use Giginc\Mongodb\ORM\Table;
+use Edsol\Mongodb\ORM\Table;
 
 class CategoriesTable extends Table {
 

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "giginc/mongodb",
+    "name": "edsol/mongodb-cakephp",
     "description": "An Mongodb datasource for CakePHP 3.0",
     "type": "cakephp-plugin",
     "require": {
@@ -14,14 +14,14 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "giginc",
-            "email": "dev@giginc.co.jp"
+            "name": "Edsol",
+            "email": "contact@edsol.dev"
         }
     ],
     "autoload": {
         "psr-4": {
-            "Giginc\\Mongodb\\": "src",
-            "Giginc\\Mongodb\\Test\\": "tests"
+            "Edsol\\Mongodb\\": "src",
+            "Edsol\\Mongodb\\Test\\": "tests"
         }
     }
 }
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Giginc\Mongodb\Database;
+namespace Edsol\Mongodb\Database;
 
 use Cake\Database\Exception\MissingConnectionException;
-use Giginc\Mongodb\Database\Driver\Mongodb as Gigincdb;
-use Giginc\Mongodb\Database\Schema\MongoSchema;
+use Edsol\Mongodb\Database\Driver\Mongodb as Gigincdb;
+use Edsol\Mongodb\Database\Schema\MongoSchema;
 
 class Connection extends \Cake\Database\Connection
 {
@@ -19,7 +19,7 @@ class Connection extends \Cake\Database\Connection
     /**
      * Database Driver object
      *
-     * @var \Giginc\Mongodb\Database\Driver\Mongodb;
+     * @var \Edsol\Mongodb\Database\Driver\Mongodb;
      */
     protected $_driver = null;
 

diff --git a/src/Database/Driver/Mongodb.php b/src/Database/Driver/Mongodb.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Giginc\Mongodb\Database\Driver;
+namespace Edsol\Mongodb\Database\Driver;
 
 use Exception;
 use MongoDB\Driver\ReadPreference;
@@ -184,6 +184,11 @@ private function createConnectionName()
         }
         $hostname = $this->_config['host'] . ':' . $this->_config['port'];
 
+        if ($this->_config['srv'] ?? false) {
+            $host = 'mongodb+srv://';
+            $hostname = $this->_config['host'];
+        }
+
         if (!empty($this->_config['login'])) {
             $host .= $this->_config['login'] . ':' . $this->_config['password'] . '@' . $hostname . '/' . $this->_config['database'];
         } else {

diff --git a/src/Database/Schema/MongoSchema.php b/src/Database/Schema/MongoSchema.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Giginc\Mongodb\Database\Schema;
+namespace Edsol\Mongodb\Database\Schema;
 
-use Giginc\Mongodb\Database\Driver\Mongodb;
+use Edsol\Mongodb\Database\Driver\Mongodb;
 use Cake\Database\Schema\TableSchema;
 
 class MongoSchema

diff --git a/src/ORM/Document.php b/src/ORM/Document.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Giginc\Mongodb\ORM;
+namespace Edsol\Mongodb\ORM;
 
 use Cake\ORM\Entity;
 use Exception;

diff --git a/src/ORM/MongoFinder.php b/src/ORM/MongoFinder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Giginc\Mongodb\ORM;
+namespace Edsol\Mongodb\ORM;
 
 use Cake\Utility\Hash;
 use MongoDB\Collection;
@@ -58,31 +58,36 @@ public function __construct($connection, $options = [])
         }
     }
 
-    /**
-     * Convert ['foo' => 'bar', ['baz' => true]]
-     * to
-     * ['$and' => [['foo', 'bar'], ['$and' => ['baz' => true]]]
-     * @param $conditions
-     */
-    private function __translateNestedArray(&$conditions)
+    public static function translateNestedArray(&$conditions)
     {
         $and = isset($conditions['$and']) ? (array)$conditions['$and'] : [];
         foreach ($conditions as $key => $value) {
             if (is_numeric($key) && is_array($value)) {
                 unset($conditions[$key]);
                 $and[] = $value;
             } elseif (is_array($value) && !in_array(strtoupper($key), ['OR', '$OR', 'AND', '$AND'])) {
-                $this->__translateNestedArray($conditions[$key]);
+                self::translateNestedArray($conditions[$key]);
             }
         }
         if (!empty($and)) {
             $conditions['$and'] = $and;
             foreach (array_keys($conditions['$and']) as $key) {
-                $this->__translateNestedArray($conditions['$and'][$key]);
+                self::translateNestedArray($conditions['$and'][$key]);
             }
         }
     }
 
+    /**
+     * Convert ['foo' => 'bar', ['baz' => true]]
+     * to
+     * ['$and' => [['foo', 'bar'], ['$and' => ['baz' => true]]]
+     * @param $conditions
+     */
+    private function __translateNestedArray(&$conditions)
+    {
+        return self::translateNestedArray($conditions);
+    }
+
     /**
      * connection
      *
@@ -116,18 +121,23 @@ public function connection($connection = null)
      * @return array
      */
     private function __translateConditions(&$conditions)
+    {
+        return self::translateConditions($conditions);
+    }
+
+    public static function translateConditions(&$conditions)
     {
         $operators = '<|>|<=|>=|!=|=|<>|IN|LIKE';
         foreach ($conditions as $key => $value) {
             if (is_numeric($key) && is_array($value)) {
-                $this->__translateConditions($conditions[$key]);
+                self::translateConditions($conditions[$key]);
             } elseif (preg_match("/^(.+) ($operators)$/", $key, $matches)) {
                 list(, $field, $operator) = $matches;
                 if (substr($field, -3) === 'NOT') {
-                    $field = substr($field, 0, strlen($field) -4);
-                    $operator = 'NOT '.$operator;
+                    $field = substr($field, 0, strlen($field) - 4);
+                    $operator = 'NOT ' . $operator;
                 }
-                $operator = $this->__translateOperator(strtoupper($operator));
+                $operator = self::translateOperator(strtoupper($operator));
                 unset($conditions[$key]);
                 if (substr($operator, -4) === 'LIKE') {
                     $value = str_replace('%', '.*', $value);
@@ -149,15 +159,17 @@ private function __translateConditions(&$conditions)
                     } else {
                         $conditions[$operator][$nestedKey] = $nestedValue;
                     }
-                    $this->__translateConditions($conditions[$operator][$nestedKey]);
+                    self::translateConditions($conditions[$operator][$nestedKey]);
                 }
-            } elseif (preg_match("/^(.+) (<|>|<=|>=|!=|=) (.+)$/", $key, $matches)
+            } elseif (
+                preg_match("/^(.+) (<|>|<=|>=|!=|=) (.+)$/", $key, $matches)
                 || (is_string($value) && preg_match("/^(.+) (<|>|<=|>=|!=|=) (.+)$/", $value, $matches))
             ) {
                 unset($conditions[$key]);
                 array_splice($matches, 0, 1);
                 $conditions['$where'] = implode(' ', array_map(function ($v) {
-                    if (preg_match("/^[\w.]+$/", $v)
+                    if (
+                        preg_match("/^[\w.]+$/", $v)
                         && substr($v, 0, strlen('this')) !== 'this'
                     ) {
                         $v = "this.$v";
@@ -178,18 +190,32 @@ private function __translateConditions(&$conditions)
      * @return string
      */
     private function __translateOperator($operator)
+    {
+        return self::translateOperator($operator);
+    }
+
+    public static function translateOperator($operator)
     {
         switch ($operator) {
-            case '<': return '$lt';
-            case '<=': return '$lte';
-            case '>': return '$gt';
-            case '>=': return '$gte';
-            case '=': return '$eq';
+            case '<':
+                return '$lt';
+            case '<=':
+                return '$lte';
+            case '>':
+                return '$gt';
+            case '>=':
+                return '$gte';
+            case '=':
+                return '$eq';
             case '!=':
-            case '<>': return '$ne';
-            case 'NOT IN': return '$nin';
-            case 'IN': return '$in';
-            default: return $operator;
+            case '<>':
+                return '$ne';
+            case 'NOT IN':
+                return '$nin';
+            case 'IN':
+                return '$in';
+            default:
+                return $operator;
         }
     }
 
@@ -210,7 +236,6 @@ public function find(array $options = [])
         } else {
             $this->_totalRows = 0;
         }
-
         return $cursor;
     }
 
@@ -236,12 +261,10 @@ public function findList()
         $results = [];
         $keyField = isset($this->_options['keyField'])
             ? $this->_options['keyField']
-            : '_id'
-        ;
+            : '_id';
         $valueField = isset($this->_options['valueField'])
             ? $this->_options['valueField']
-            : 'name'
-        ;
+            : 'name';
 
         $cursor = $this->find(['projection' => [$keyField => 1, $valueField => 1]]);
         foreach (iterator_to_array($cursor) as $value) {
@@ -280,7 +303,7 @@ function ($v) {
                     return strtolower((string)$v) === 'desc' ? -1 : 1;
                 },
                 Hash::get($options, 'sort', [])
-                + Hash::normalize((array)$this->_options['order'])
+                    + Hash::normalize((array)$this->_options['order'])
             );
         }
     }
@@ -294,11 +317,12 @@ private function __limitOption(array &$options)
         if (!empty($this->_options['limit']) && !isset($options['limit'])) {
             $options['limit'] = $this->_options['limit'];
         }
-        if (!empty($this->_options['page']) && $this->_options['page'] > 1
+        if (
+            !empty($this->_options['page']) && $this->_options['page'] > 1
             && !empty($options['limit'])
             && !isset($options['skip'])
         ) {
-            $options['skip'] = $options['limit'] * ($this->_options['page'] -1);
+            $options['skip'] = $options['limit'] * ($this->_options['page'] - 1);
         }
     }
 
@@ -326,4 +350,15 @@ public function count()
     {
         return $this->_totalRows;
     }
+
+    /**
+     * setTotalRows
+     *
+     * @param  int $rows
+     * @return void
+     */
+    public function setTotalRows(int $rows)
+    {
+        $this->_totalRows = $rows;
+    }
 }
diff --git a/src/ORM/MongoQuery.php b/src/ORM/MongoQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Giginc\Mongodb\ORM;
+namespace Edsol\Mongodb\ORM;
 
 class MongoQuery
 {

diff --git a/src/ORM/ResultSet.php b/src/ORM/ResultSet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Giginc\Mongodb\ORM;
+namespace Edsol\Mongodb\ORM;
 
 class ResultSet
 {