Merge branch 'hotfix/182'

michalbundyra · michalbundyra · commit e5660fbeb0ca · 2019-08-28T22:03:20.000+01:00
Close #182 Fix #181
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,10 @@ All notable changes to this project will be documented in this file, in reverse
   after creation. Wrong TTL was set instead of using default value
   from options.
 
+- [#182](https://github.com/zendframework/zend-cache/pull/182) fixes
+  a typo in variable name within the `ExtMongoDbResourceManager::getResource`
+  method which prevented using custom db name when using that adapter.
+
 ## 2.8.2 - 2018-05-01
 
 ### Added
diff --git a/src/Storage/Adapter/ExtMongoDbResourceManager.php b/src/Storage/Adapter/ExtMongoDbResourceManager.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-cache for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2018-2019 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-cache/blob/master/LICENSE.md New BSD License
  */
 
@@ -98,7 +98,7 @@ public function getResource($id)
                 }
 
                 $collection = $resource['client_instance']->selectCollection(
-                    isset($resouce['db']) ? $resource['db'] : 'zend',
+                    isset($resource['db']) ? $resource['db'] : 'zend',
                     isset($resource['collection']) ? $resource['collection'] : 'cache'
                 );
                 $collection->createIndex(['key' => 1]);
diff --git a/test/Storage/Adapter/ExtMongoDbResourceManagerTest.php b/test/Storage/Adapter/ExtMongoDbResourceManagerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-cache for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2018-2019 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-cache/blob/master/LICENSE.md New BSD License
  */
 
@@ -12,7 +12,6 @@
 use PHPUnit\Framework\TestCase;
 use stdClass;
 use Zend\Cache\Exception;
-use Zend\Cache\Storage\Adapter\ExtMongoDbOptions;
 use Zend\Cache\Storage\Adapter\ExtMongoDbResourceManager;
 
 /**
@@ -117,6 +116,20 @@ public function testGetResourceInitialized()
         $this->assertSame($resource, $this->object->getResource($id));
     }
 
+    public function testCorrectDatabaseResourceName()
+    {
+        $id = 'foo';
+
+        $resource = [
+            'db' => getenv('TESTS_ZEND_CACHE_EXTMONGODB_DATABASE'),
+            'server' => getenv('TESTS_ZEND_CACHE_EXTMONGODB_CONNECTSTRING'),
+        ];
+
+        $this->object->setResource($id, $resource);
+
+        $this->assertSame($resource['db'], $this->object->getResource($id)->getDatabaseName());
+    }
+
     public function testGetResourceNewResource()
     {
         $id                = 'foo';
