PHPC-704: Do not set mongodb.debug from driver options

The mongodb.debug INI option is a global setting and should not be set based on a single Manager's constructor argument.

Author: jmikola

php_phongo.c

@@ -1399,29 +1399,8 @@ static bool php_phongo_apply_ssl_opts(mongoc_client_t *client, zval *zdriverOpti
 
 static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zval *driverOptions TSRMLS_DC) /* {{{ */
 {
-#if PHP_VERSION_ID >= 70000
-	zval                      *zdebug = NULL;
-#else
-	zval                     **zdebug = NULL;
-#endif
-	const char                *mongoc_version, *bson_version;
-	mongoc_client_t           *client;
-
-#if PHP_VERSION_ID >= 70000
-	if (driverOptions && (zdebug = zend_hash_str_find(Z_ARRVAL_P(driverOptions), "debug", sizeof("debug")-1)) != NULL) {
-		zend_string *key = zend_string_init(PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI)-1, 0);
-		zend_string *value_str = zval_get_string(zdebug);
-		zend_alter_ini_entry_ex(key, value_str, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0);
-		zend_string_release(key);
-		zend_string_release(value_str);
-	}
-#else
-	if (driverOptions && zend_hash_find(Z_ARRVAL_P(driverOptions), "debug", strlen("debug") + 1, (void**)&zdebug) == SUCCESS) {
-		convert_to_string(*zdebug);
-
-		zend_alter_ini_entry_ex((char *)PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI), Z_STRVAL_PP(zdebug), Z_STRLEN_PP(zdebug), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
-	}
-#endif
+	const char      *mongoc_version, *bson_version;
+	mongoc_client_t *client;
 
 #ifdef HAVE_SYSTEM_LIBMONGOC
 	mongoc_version = mongoc_get_version();

tests/manager/manager-debug-001.phpt

@@ -10,16 +10,18 @@ require_once __DIR__ . "/../utils/basic.inc";
 $name = tempnam(sys_get_temp_dir(), "PHONGO");
 unlink($name);
 mkdir($name);
-$manager = new MongoDB\Driver\Manager(STANDALONE, array(), array("debug" => $name));
+ini_set('mongodb.debug', $name);
+$manager = new MongoDB\Driver\Manager(STANDALONE);
 $bulk = new MongoDB\Driver\BulkWrite();
 $bulk->insert(array('_id' => 1, 'x' => 1));
 $result = $manager->executeBulkWrite(NS, $bulk);
+ini_set('mongodb.debug', 'off');
 foreach(glob($name."/*") as $file);
 $content = file($file);
 unlink($file);
 rmdir($name);
 
-echo $content[0];
+echo $content[0], $content[1];
 foreach($content as $line) {
     if (strpos($line, "mongoc_bulk_operation_execute")) {
         echo $line;
@@ -30,6 +32,7 @@ foreach($content as $line) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
+[%s]     PHONGO: DEBUG   > Connection string: '%s'
 [%s]     PHONGO: DEBUG   > Creating Manager, phongo-1.%d.%d%S[%s] - mongoc-1.%s(%s), libbson-1.%s(%s), php-%s
 [%s]     mongoc: TRACE   > ENTRY: mongoc_bulk_operation_execute():%d
 [%s]     mongoc: TRACE   >  EXIT: mongoc_bulk_operation_execute():%d