Merge pull request #2 from php-cache/develop

Implementation and travis fixes

Author: Nyholm

.travis.yml

@@ -5,22 +5,53 @@ php:
   - 5.5
   - hhvm
 
+sudo: required
+
+env:
+  global:
+    - MONGODB_HOST="localhost:27017"
+    - MONGODB_COLLECTION="test.cache"
+    - KEY_SERVER="hkp://keyserver.ubuntu.com:80"
+    - MONGO_REPO_URI="http://repo.mongodb.com/apt/ubuntu"
+    - MONGO_REPO_TYPE="precise/mongodb-enterprise/"
+    - SOURCES_LOC="/etc/apt/sources.list.d/mongodb.list"
+    - SERVER_PACKAGE=mongodb-enterprise
+    - SERVER_SERVICE=mongod
+    - SERVER_VERSION=3.2
+
 services:
   - mongodb
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - php: hhvm
 
 before_install:
-    - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi;
-    - pip install --user codecov
+  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi;
+  - pip install --user codecov
+
+  # Fetch mongo stuff
+  - sudo apt-key adv --keyserver ${KEY_SERVER} --recv 7F0CEB10
+  - sudo apt-key adv --keyserver ${KEY_SERVER} --recv EA312927
+  - echo "deb ${MONGO_REPO_URI} ${MONGO_REPO_TYPE}${SERVER_VERSION} multiverse" | sudo tee ${SOURCES_LOC}
+  - sudo apt-get update -qq
+
+install:
+  - sudo apt-get install ${SERVER_PACKAGE}
+  - sudo apt-get -y install gdb
 
 before_script:
-    - travis_retry composer self-update
-    - travis_retry composer install --prefer-source --no-interaction
+  - if ! nc -z localhost 27017; then sudo service ${SERVER_SERVICE} start; fi
+  - mongod --version
+  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then pecl install -f mongodb-1.1.2; fi;
+  - mongo --eval 'tojson(db.runCommand({buildInfo:1}))'
+  - php --ri mongodb
+  - travis_retry composer install --prefer-source --no-interaction
+  - travis_retry composer self-update
 
 script:
-    - php -dzend_extension=xdebug.so vendor/bin/phpunit --coverage-clover=coverage.xml
+  - php -dzend_extension=xdebug.so vendor/bin/phpunit --coverage-clover=coverage.xml
 
 after_success:
-    - codecov
+  - codecov

phpunit.xml.dist

@@ -17,6 +17,11 @@
     </testsuite>
   </testsuites>
 
+  <php>
+    <env name="MONGODB_HOST" value="localhost:27017"/>
+    <env name="MONGODB_COLLECTION" value="psr6test.cache"/>
+  </php>
+
   <logging>
     <log type="coverage-text" target="php://stdout"/>
     <log type="coverage-html" target="./coverageReport"/>

src/MongoDBCachePool.php

@@ -12,45 +12,82 @@
 namespace Cache\Adapter\MongoDB;
 
 use Cache\Adapter\Common\AbstractCachePool;
+use Cache\Adapter\Common\CacheItem;
+use MongoDB\BSON\UTCDateTime;
+use MongoDB\Collection;
+use MongoDB\Driver\Manager;
 use Psr\Cache\CacheItemInterface;
-use MongoDB\Client;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class MongoDBCachePool extends AbstractCachePool
 {
     /**
-     * @var Client
+     * @type Collection
      */
-    private $client;
+    private $collection;
 
     /**
-     *
-     * @param Client $client
+     * @param Collection $collection
      */
-    public function __construct(Client $client)
+    public function __construct(Collection $collection)
     {
-        $this->client = $client;
+        $this->collection = $collection;
+    }
+
+    public static function createCollection(Manager $manager, $namespace)
+    {
+        $collection = new Collection($manager, $namespace);
+        $collection->createIndex(['expireAt' => 1], ['expireAfterSeconds' => 0]);
+
+        return $collection;
     }
 
     protected function fetchObjectFromCache($key)
     {
+        $object = $this->collection->findOne(['_id' => $key]);
+
+        if ($object && isset($object->data)) {
+            $item = new CacheItem($key, true, unserialize($object->data));
+
+            if (isset($object->expiresAt)) {
+                $item->expiresAt($object->expiresAt->toDateTime());
+            }
+
+            return $item;
+        }
+
         return false;
     }
 
     protected function clearAllObjectsFromCache()
     {
+        $this->collection->deleteMany([]);
+
         return true;
     }
 
     protected function clearOneObjectFromCache($key)
     {
+        $this->collection->deleteOne(['_id' => $key]);
+
         return true;
     }
 
     protected function storeItemInCache($key, CacheItemInterface $item, $ttl)
     {
+        $object = [
+            '_id'  => $key,
+            'data' => serialize($item->get()),
+        ];
+
+        if ($ttl) {
+            $object['expiresAt'] = new UTCDateTime((time() + $ttl) * 1000);
+        }
+
+        $this->collection->updateOne(['_id' => $key], ['$set' => $object], ['upsert' => true]);
+
         return true;
     }
-}
+}

tests/CreateServerTrait.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of php-cache\mongodb-adapter package.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>, Tobias Nyholm <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Cache\Adapter\MongoDB\Tests;
+
+use Cache\Adapter\MongoDB\MongoDBCachePool;
+use MongoDB\Driver\Manager;
+
+trait CreateServerTrait
+{
+    private $collection = null;
+
+    /**
+     * @return mixed
+     */
+    public function getCollection()
+    {
+        if ($this->collection === null) {
+            $manager = new Manager('mongodb://'.getenv('MONGODB_HOST'));
+
+            // In your own code, only do this *once* to initialize your cache
+            $this->collection = MongoDBCachePool::createCollection($manager, getenv('MONGODB_COLLECTION'));
+        }
+
+        return $this->collection;
+    }
+}

tests/IntegrationPoolTest.php

@@ -16,8 +16,10 @@
 
 class IntegrationPoolTest extends CachePoolTest
 {
+    use CreateServerTrait;
+
     public function createCachePool()
     {
-        return new MongoDBCachePool();
+        return new MongoDBCachePool($this->getCollection());
     }
 }

tests/IntegrationTagTest.php

@@ -16,8 +16,10 @@
 
 class IntegrationTagTest extends TaggableCachePoolTest
 {
+    use CreateServerTrait;
+
     public function createCachePool()
     {
-        return new MongoDBCachePool();
+        return new MongoDBCachePool($this->getCollection());
     }
 }