From 5fbcef06386cfd59b5c1693899cb71d3d67e64f2 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 14 Jul 2016 16:48:40 -0400 Subject: [PATCH] PHPC-746: Default Manager URI to "mongodb://127.0.0.1/" --- src/MongoDB/Manager.c | 4 +++- tests/manager/manager-ctor-003.phpt | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tests/manager/manager-ctor-003.phpt diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c index 937d20bbe..971c19ea7 100644 --- a/src/MongoDB/Manager.c +++ b/src/MongoDB/Manager.c @@ -45,6 +45,8 @@ #include "php_phongo.h" #include "php_bson.h" +#define PHONGO_MANAGER_URI_DEFAULT "mongodb://127.0.0.1/" + PHONGO_API zend_class_entry *php_phongo_manager_ce; zend_object_handlers php_phongo_handler_manager; @@ -76,7 +78,7 @@ PHP_METHOD(Manager, __construct) phongo_zval_to_bson(options, PHONGO_BSON_NONE, &bson_options, NULL TSRMLS_CC); } - phongo_manager_init(intern, uri_string, &bson_options, driverOptions TSRMLS_CC); + phongo_manager_init(intern, uri_string ? uri_string : PHONGO_MANAGER_URI_DEFAULT, &bson_options, driverOptions TSRMLS_CC); bson_destroy(&bson_options); } /* }}} */ diff --git a/tests/manager/manager-ctor-003.phpt b/tests/manager/manager-ctor-003.phpt new file mode 100644 index 000000000..c407387bb --- /dev/null +++ b/tests/manager/manager-ctor-003.phpt @@ -0,0 +1,19 @@ +--TEST-- +MongoDB\Driver\Manager::__construct() URI defaults to "mongodb://127.0.0.1/" +--SKIPIF-- + +--FILE-- + +===DONE=== + +--EXPECTF-- +[%s] PHONGO: DEBUG > Connection string: 'mongodb://127.0.0.1/' +%A +===DONE===