Merge branch 'hotfix/80-mongo-connection'

Close #80

Author: weierophinney

.travis.yml

@@ -8,13 +8,15 @@ cache:
 
 services:
   - memcached
+  - mongodb
   - rabbitmq
   - redis-server
 
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
+    - TESTS_ZEND_DIAGNOSTICS_MONGO_ENABLED=true
     - TESTS_ZEND_DIAGNOSTICS_RABBITMQ_ENABLED=true
     - TESTS_ZEND_DIAGNOSTICS_REDIS_ENABLED=true
 
@@ -23,17 +25,20 @@ matrix:
     - php: 5.6
       env:
         - DEPS=lowest
+        - MONGO_LEGACY=true
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED=true
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=false
     - php: 5.6
       env:
         - DEPS=locked
+        - MONGO_LEGACY=true
         - LEGACY_DEPS="phpunit/phpunit"
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED=true
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=false
     - php: 5.6
       env:
         - DEPS=latest
+        - MONGO_LEGACY=true
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED=true
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=false
     - php: 7
@@ -80,12 +85,17 @@ before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED == 'true' ]]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
   - if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED == 'true' ]]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
+  - if [[ $MONGO_LEGACY == 'true' ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
+  - if [[ $MONGO_LEGACY != 'true' ]]; then pecl upgrade mongodb ; fi
+  - if [[ $MONGO_LEGACY != 'true' ]]; then echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
   - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - if [[ $MONGO_LEGACY != 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS mongodb/mongodb ; fi
+  - stty cols 120 && php -m
   - stty cols 120 && composer show
 
 script:

CHANGELOG.md

@@ -34,4 +34,5 @@ Releases prior to 1.2.0 did not have entries.
 
 ### Fixed
 
-- Nothing.
+- [#80](https://github.com/zendframework/zenddiagnostics/pull/80) fixes how the `MongoDB\Client` instance is created when using ext-mongodb + mongodb/mongodb,
+  ensuring it uses the provided connection URI.

phpunit.xml.dist

@@ -18,6 +18,7 @@
     <php>
         <env name="TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED" value="false" />
         <env name="TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED" value="false" />
+        <env name="TESTS_ZEND_DIAGNOSTICS_MONGO_ENABLED" value="false" />
         <env name="TESTS_ZEND_DIAGNOSTICS_RABBITMQ_ENABLED" value="false" />
         <env name="TESTS_ZEND_DIAGNOSTICS_REDIS_ENABLED" value="false" />
     </php>

src/Check/Mongo.php

@@ -7,6 +7,10 @@
 
 namespace ZendDiagnostics\Check;
 
+use Exception;
+use MongoClient;
+use MongoDB\Client as MongoDBClient;
+use RuntimeException;
 use ZendDiagnostics\Result\Success;
 use ZendDiagnostics\Result\Failure;
 
@@ -20,7 +24,7 @@ class Mongo extends AbstractCheck
     /**
      * @param string $connectionUri
      */
-    public function __construct($connectionUri)
+    public function __construct($connectionUri = 'mongodb://127.0.0.1/')
     {
         $this->connectionUri = $connectionUri;
     }
@@ -32,8 +36,11 @@ public function check()
     {
         try {
             $this->getListDBs();
-        } catch (\Exception $e) {
-            return new Failure(sprintf('Failed to connect to MongoDB server. Reason: `%s`', $e->getMessage()));
+        } catch (Exception $e) {
+            return new Failure(sprintf(
+                'Failed to connect to MongoDB server. Reason: `%s`',
+                $e->getMessage()
+            ));
         }
 
         return new Success();
@@ -48,12 +55,14 @@ public function check()
      */
     private function getListDBs()
     {
-        if (class_exists('\MongoDB\Client')) {
-            return (new \MongoDB\Client($this->connectionUri))->listDatabases();
-        } elseif (class_exists('\MongoClient')) {
-            return (new \MongoClient($this->server))->listDBs();
+        if (class_exists(MongoDBClient::class)) {
+            return (new MongoDBClient($this->connectionUri))->listDatabases();
         }
 
-        throw new \RuntimeException('Neither the mongo extension or mongodb are installed');
+        if (class_exists(MongoClient::class)) {
+            return (new MongoClient($this->connectionUri))->listDBs();
+        }
+
+        throw new RuntimeException('Neither the mongo extension or mongodb are installed');
     }
 }

test/ChecksTest.php

@@ -24,6 +24,7 @@
 use ZendDiagnostics\Check\JsonFile;
 use ZendDiagnostics\Check\Memcache;
 use ZendDiagnostics\Check\Memcached;
+use ZendDiagnostics\Check\Mongo;
 use ZendDiagnostics\Check\PhpFlag;
 use ZendDiagnostics\Check\PhpVersion;
 use ZendDiagnostics\Check\ProcessRunning;
@@ -124,6 +125,21 @@ public function testMemcached()
         $this->assertInstanceOf(Failure::class, $result);
     }
 
+    public function testMongo()
+    {
+        if (getenv('TESTS_ZEND_DIAGNOSTICS_MONGO_ENABLED') !== 'true') {
+            $this->markTestSkipped('Mongo tests are not enabled; enable them in phpunit.xml');
+        }
+
+        $check = new Mongo();
+        $result = $check->check();
+        $this->assertInstanceOf(Success::class, $result);
+
+        $check = new Memcached('127.0.0.250', 9999);
+        $result = $check->check();
+        $this->assertInstanceOf(Failure::class, $result);
+    }
+
     public function testClassExists()
     {
         $check = new ClassExists(__CLASS__);