Fix review nits

Author: Girgias

Zend/zend_API.c

@@ -1867,24 +1867,24 @@ ZEND_API zend_result object_init_with_constructor(zval *arg, zend_class_entry *c
 			zval_ptr_dtor(arg);
 			ZVAL_UNDEF(arg);
 			return FAILURE;
+		}
+
+		/* Surprisingly, this is the only case where internal classes will allow to pass extra arguments
+		 * However, if there are named arguments, an Error must be thrown to be consistent with new ClassName() */
+		if (UNEXPECTED(named_params != NULL)) {
+			/* Throw standard Error */
+			zend_string *arg_name = NULL;
+			zend_hash_get_current_key(named_params, &arg_name, /* num_index */ NULL);
+			ZEND_ASSERT(arg_name != NULL);
+			zend_throw_error(NULL, "Unknown named parameter $%s", ZSTR_VAL(arg_name));
+			zend_string_release(arg_name);
+			/* Do not call destructor, free object, and set arg to IS_UNDEF */
+			zend_object_store_ctor_failed(obj);
+			zval_ptr_dtor(arg);
+			ZVAL_UNDEF(arg);
+			return FAILURE;
 		} else {
-			/* Surprisingly, this is the only case where internal classes will allow to pass extra arguments
-			 * However, if there are named arguments, an Error must be thrown to be consistent with new ClassName() */
-			if (UNEXPECTED(named_params != NULL)) {
-				/* Throw standard Error */
-				zend_string *arg_name = NULL;
-					zend_hash_get_current_key(named_params, &arg_name, /* num_index */ NULL);
-				ZEND_ASSERT(arg_name != NULL);
-				zend_throw_error(NULL, "Unknown named parameter $%s", ZSTR_VAL(arg_name));
-				zend_string_release(arg_name);
-				/* Do not call destructor, free object, and set arg to IS_UNDEF */
-				zend_object_store_ctor_failed(obj);
-				zval_ptr_dtor(arg);
-				ZVAL_UNDEF(arg);
-				return FAILURE;
-			} else {
-				return SUCCESS;
-			}
+			return SUCCESS;
 		}
 	}
 	/* A constructor should not return a value, however if an exception is thrown
@@ -1894,7 +1894,7 @@ ZEND_API zend_result object_init_with_constructor(zval *arg, zend_class_entry *c
 		constructor,
 		obj,
 		class_type,
-		/* retval */ &retval,
+		&retval,
 		param_count,
 		params,
 		named_params