Throw ValueError when 1 is provided to the second argument of log()

Author: alexandre-daubois

NEWS

@@ -7,4 +7,8 @@ PHP                                                                        NEWS
     with a given skeleton, locale, collapse type and identity fallback.
     (BogdanUngureanu)
 
+- Standard:
+  . Passing 1 or negative base to log() now throws a ValueError.
+    (alexandre-daubois)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

ext/standard/math.c

@@ -667,12 +667,8 @@ PHP_FUNCTION(log)
 		RETURN_DOUBLE(log10(num));
 	}
 
-	if (base == 1.0) {
-		RETURN_DOUBLE(ZEND_NAN);
-	}
-
-	if (base <= 0.0) {
-		zend_argument_value_error(2, "must be greater than 0");
+	if (base <= 0.0 || base == 1.0) {
+		zend_argument_value_error(2, "must not be 1 or less than or equal to 0");
 		RETURN_THROWS();
 	}
 

ext/standard/tests/math/log_error.phpt

@@ -9,6 +9,13 @@ try {
 } catch (ValueError $exception) {
     echo $exception->getMessage() . "\n";
 }
+
+try {
+    log(36, 1);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 ?>
 --EXPECT--
-log(): Argument #2 ($base) must be greater than 0
+log(): Argument #2 ($base) must not be 1 or less than or equal to 0
+log(): Argument #2 ($base) must not be 1 or less than or equal to 0