fixed expiration support and removed duplicated tests of MongoDb adapter

zendframework · Nov 29, 2015 · c20124f · c20124f
1 parent d17414d
commit c20124f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 39 deletions.
diff --git a/src/Storage/Adapter/MongoDb.php b/src/Storage/Adapter/MongoDb.php
@@ -136,7 +136,6 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
 
             if ($result['expires']->sec < time()) {
                 $this->internalRemoveItem($normalizedKey);
-
                 return;
             }
         }
@@ -241,12 +240,8 @@ protected function internalGetCapabilities()
                 'supportedMetadata'  => [
                     '_id',
                 ],
-                'minTtl'             => 0,
-                'maxTtl'             => 0,
+                'minTtl'             => 1,
                 'staticTtl'          => true,
-                'ttlPrecision'       => 1,
-                'useRequestTime'     => false,
-                'expiredRead'        => false,
                 'maxKeyLength'       => 255,
                 'namespaceIsPrefix'  => true,
             ]

diff --git a/test/Storage/Adapter/MongoDbTest.php b/test/Storage/Adapter/MongoDbTest.php
@@ -60,37 +60,4 @@ public function testSetOptionsNotMongoDbOptions()
 
         $this->assertInstanceOf('\Zend\Cache\Storage\Adapter\MongoDbOptions', $this->_storage->getOptions());
     }
-
-    public function testCachedItemsExpire()
-    {
-        $ttl = 2;
-        $key = 'foo';
-        $value = 'bar';
-
-        $this->_storage->getOptions()->setTtl($ttl);
-
-        $this->_storage->setItem($key, $value);
-
-        // wait for the cached item to expire
-        sleep($ttl * 2);
-
-        $this->assertNull($this->_storage->getItem($key));
-    }
-
-    public function testFlush()
-    {
-        $key1 = 'foo';
-        $key2 = 'key';
-        $value1 = 'bar';
-        $value2 = 'value';
-
-        $this->assertEquals([], $this->_storage->setItems([
-            $key1 => $value1,
-            $key2 => $value2,
-        ]));
-
-        $this->assertTrue($this->_storage->flush());
-
-        $this->assertEquals([], $this->_storage->hasItems([$key1, $key2]));
-    }
 }