PHPC-2289: Prohibit passing LogSubscriber to Manager::addSubscriber()

Author: jmikola

src/MongoDB/Manager.c

@@ -296,6 +296,10 @@ static PHP_METHOD(MongoDB_Driver_Manager, addSubscriber)
 	Z_PARAM_OBJECT_OF_CLASS(subscriber, php_phongo_subscriber_ce)
 	PHONGO_PARSE_PARAMETERS_END();
 
+	if (instanceof_function(Z_OBJCE_P(subscriber), php_phongo_logsubscriber_ce)) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "LogSubscriber instances cannot be registered with a Manager");
+	}
+
 	intern = Z_MANAGER_OBJ_P(getThis());
 
 	/* Lazily initialize the subscriber HashTable */
@@ -304,8 +308,6 @@ static PHP_METHOD(MongoDB_Driver_Manager, addSubscriber)
 		zend_hash_init(intern->subscribers, 0, NULL, ZVAL_PTR_DTOR, 0);
 	}
 
-	// TODO: Consider throwing if subscriber is unsupported (see: PHPC-2289)
-
 	phongo_apm_add_subscriber(intern->subscribers, subscriber);
 }
 

tests/manager/manager-addSubscriber_error-001.phpt

@@ -0,0 +1,44 @@
+--TEST--
+MongoDB\Driver\Manager::addSubscriber() does not support LogSubscriber instances
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+use MongoDB\Driver\Monitoring\CommandSubscriber;
+use MongoDB\Driver\Monitoring\LogSubscriber;
+
+class MyLogger implements LogSubscriber
+{
+    public function log($level, $domain, $message): void {}
+}
+
+class MySubscriber implements CommandSubscriber, LogSubscriber
+{ 
+    public function commandStarted($event): void {}
+ 
+    public function commandSucceeded($event): void {}
+ 
+    public function commandFailed($event): void {}
+
+    public function log($level, $domain, $message): void {}
+}
+
+$manager = create_test_manager();
+
+echo throws(function () use ($manager) {
+    $manager->addSubscriber(new MyLogger);
+}, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n";
+
+echo throws(function () use ($manager) {
+    $manager->addSubscriber(new MySubscriber);
+}, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n";
+
+?>
+===DONE===
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+LogSubscriber instances cannot be registered with a Manager
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+LogSubscriber instances cannot be registered with a Manager
+===DONE===