Merge pull request #28 from boesing/feature/ext-mongodb-satellite

laminas · Oct 5, 2020 · b26b41d · b26b41d
2 parents 0e0a8d4 + 9eb86a3
commit b26b41d
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 1,289 deletions.
diff --git a/.ci/mongodb.ini b/.ci/mongodb.ini
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,6 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
-    - EXTMONGODB_DEPS="mongodb/mongodb"
     - TESTS_LAMINAS_CACHE_FILESYSTEM_DIR=/dev/shm
     - TESTS_LAMINAS_CACHE_MEMCACHED_ENABLED=true
     - TESTS_LAMINAS_CACHE_MEMCACHED_HOST="127.0.0.1"
@@ -22,7 +21,6 @@ env:
     - TESTS_LAMINAS_CACHE_MEMCACHE_HOST=$TESTS_LAMINAS_CACHE_MEMCACHED_HOST
     - TESTS_LAMINAS_CACHE_MEMCACHE_PORT=$TESTS_LAMINAS_CACHE_MEMCACHED_PORT
     - TESTS_LAMINAS_CACHE_MONGODB_ENABLED=true
-    - TESTS_LAMINAS_CACHE_EXTMONGODB_ENABLED=true
     - TESTS_LAMINAS_CACHE_REDIS_ENABLED=true
     - TESTS_LAMINAS_CACHE_REDIS_HOST="127.0.0.1"
     - TESTS_LAMINAS_CACHE_REDIS_PORT=6379
@@ -43,7 +41,6 @@ matrix:
         - MEMCACHE_PECL_VERSION="memcache-2.2.7"
         - MEMCACHED_PECL_VERSION="memcached-2.2.0"
         - REDIS_PECL_VERSION="redis-2.2.3"
-        - TESTS_LAMINAS_CACHE_EXTMONGODB_ENABLED=false
         - TESTS_LAMINAS_CACHE_MEMCACHE_ENABLED=true
         - TESTS_LAMINAS_CACHE_XCACHE_ENABLED=true
     - php: 5.6
@@ -52,21 +49,18 @@ matrix:
         - MEMCACHE_PECL_VERSION="memcache-3.0.8"
         - MEMCACHED_PECL_VERSION="memcached-2.2.0"
         - REDIS_PECL_VERSION="redis-4.3.0"
-        - TESTS_LAMINAS_CACHE_EXTMONGODB_ENABLED=false
         - TESTS_LAMINAS_CACHE_MEMCACHE_ENABLED=true
         - TESTS_LAMINAS_CACHE_XCACHE_ENABLED=true
     - php: 7
       env:
         - DEPS=lowest
         - REDIS_PECL_VERSION="redis-4.0.0"
         - TESTS_LAMINAS_CACHE_MONGODB_USE_POLYFILL=true
-        - TESTS_LAMINAS_CACHE_EXTMONGODB_ENABLED=false
     - php: 7
       env:
         - DEPS=latest
         - REDIS_PECL_VERSION="redis"
         - TESTS_LAMINAS_CACHE_MONGODB_USE_POLYFILL=true
-        - TESTS_LAMINAS_CACHE_EXTMONGODB_ENABLED=false
     - php: 7.1
       env:
         - DEPS=lowest
@@ -135,10 +129,6 @@ install:
         phpenv config-add .ci/mongo.ini ;
     fi ;
 
-  - if [[ $TESTS_LAMINAS_CACHE_EXTMONGODB_ENABLED == 'true' ]]; then
-        phpenv config-add .ci/mongodb.ini ;
-    fi ;
-
   - if [[ $TESTS_LAMINAS_CACHE_XCACHE_ENABLED == 'true' ]]; then
         phpenv config-add .ci/xcache.ini ;
     fi ;
@@ -149,7 +139,6 @@ install:
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - if [[ $TESTS_LAMINAS_CACHE_MONGODB_USE_POLYFILL == 'true' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS mongofill/mongofill:dev-master ; fi
-  - if [[ $TESTS_LAMINAS_CACHE_EXTMONGODB_ENABLED == 'true' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $EXTMONGODB_DEPS ; fi
   - stty cols 120 && composer show
   - pecl list
   - php -m

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file, in reverse
 - [#24](https://github.com/laminas/laminas-cache/pull/24) Move APCu adapter to its own [satellite package](https://github.com/laminas/laminas-cache-storage-adapter-apcu)
 - [#25](https://github.com/laminas/laminas-cache/pull/25) Move BlackHole adapter to its own [satellite package](https://github.com/laminas/laminas-cache-storage-adapter-blackhole)
 - [#27](https://github.com/laminas/laminas-cache/pull/27) Move DBA adapter to its own [satellite package](https://github.com/laminas/laminas-cache-storage-adapter-dba)
+- [#28](https://github.com/laminas/laminas-cache/pull/28) Move ExtMongodb adapter to its own [satellite package](https://github.com/laminas/laminas-cache-storage-adapter-ext-mongodb)
 
 ### Deprecated
 

diff --git a/composer.json b/composer.json
@@ -33,6 +33,7 @@
         "laminas/laminas-cache-storage-adapter-apcu": "^1.0@dev || ^1.0",
         "laminas/laminas-cache-storage-adapter-blackhole": "^1.0@dev || ^1.0",
         "laminas/laminas-cache-storage-adapter-dba": "^1.0@dev || ^1.0",
+        "laminas/laminas-cache-storage-adapter-ext-mongodb": "1.0.0@dev || ^1.0",
         "laminas/laminas-eventmanager": "^2.6.3 || ^3.2",
         "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
         "laminas/laminas-stdlib": "^3.2.1",
@@ -56,13 +57,11 @@
         "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter",
         "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
         "ext-mongo": "Mongo, to use MongoDb storage adapter",
-        "ext-mongodb": "MongoDB, to use the ExtMongoDb storage adapter",
         "ext-redis": "Redis, to use Redis storage adapter",
         "ext-wincache": "WinCache, to use the WinCache storage adapter",
         "ext-xcache": "XCache, to use the XCache storage adapter",
         "laminas/laminas-serializer": "Laminas\\Serializer component",
         "laminas/laminas-session": "Laminas\\Session component",
-        "mongodb/mongodb": "Required for use with the ext-mongodb adapter",
         "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement"
     },
     "autoload": {

diff --git a/src/Storage/Adapter/ExtMongoDb.php b/src/Storage/Adapter/ExtMongoDb.php