for PHP 7, use alcaeus/mongo-php-adapter compatibility layer and mong…

…odb extension
horde · Jun 16, 2016 · 3661871 · 3661871
1 parent 2d4faa0
commit 3661871
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/framework/Cache/test/Horde/Cache/MongoTest.php b/framework/Cache/test/Horde/Cache/MongoTest.php
@@ -23,8 +23,8 @@ class Horde_Cache_MongoTest extends Horde_Cache_TestBase
 {
     protected function _getCache($params = array())
     {
-        if (!extension_loaded('mongo')) {
-            $this->reason = 'Mongo extension not loaded';
+        if (!extension_loaded('mongo') && !extension_loaded('mongodb')) {
+            $this->reason = 'Mongo/Mongodb extensions not loaded';
             return;
         }
         if (!class_exists('Horde_Mongo_Client')) {

diff --git a/framework/Mongo/bundle/composer.json b/framework/Mongo/bundle/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "alcaeus/mongo-php-adapter": "^1.0.3"
+    }
+}
diff --git a/framework/Mongo/lib/Horde/Mongo/Client.php b/framework/Mongo/lib/Horde/Mongo/Client.php
@@ -11,6 +11,15 @@
  * @package   Mongo
  */
 
+if (!extension_loaded('mongo')) {
+    // use the compatibility layer and mongodb extension
+    if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+        require_once __DIR__ . '/vendor/autoload.php'; // PEAR installation
+    } else {
+        require_once __DIR__ . '/../../../bundle/vendor/autoload.php'; // GIT
+    }
+}
+
 /**
  * Extend the base PECL MongoClient class by allowing it to be serialized.
  *

diff --git a/framework/Test/lib/Horde/Test/Factory/Mongo.php b/framework/Test/lib/Horde/Test/Factory/Mongo.php
@@ -41,7 +41,7 @@ public function create(array $params = array())
     {
         $mongo = null;
 
-        if (extension_loaded('mongo') &&
+        if ((extension_loaded('mongo') || extension_loaded('mongodb')) &&
             class_exists('Horde_Mongo_Client') &&
             !empty($params['config'])) {
             try {