Merge branch 'pull-request/60'

By David Soria Parra (1) and Jille Timmermans (1)
* pull-request/60:
  NEWS entry for boolval()
  Implement boolval() with a test

Author: dsp

NEWS

@@ -12,6 +12,7 @@ PHP                                                                        NEWS
     (Nikita Popov)
 
 - Core:
+  . Added boolval(). (Jille Timmermans).
   . Fixed bug #61681 (Malformed grammar). (Nikita Popov, Etienne, Laruence).
   . Fixed bug #61038 (unpack("a5", "str\0\0") does not work as expected).
     (srgoogleguy, Gustavo)

ext/standard/basic_functions.c

@@ -2522,6 +2522,10 @@ ZEND_BEGIN_ARG_INFO(arginfo_strval, 0)
 	ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO(arginfo_boolval, 0)
+	ZEND_ARG_INFO(0, var)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO(arginfo_is_null, 0)
 	ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
@@ -3045,6 +3049,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(floatval,														arginfo_floatval)
 	PHP_FALIAS(doubleval,			floatval,								arginfo_floatval)
 	PHP_FE(strval,															arginfo_strval)
+	PHP_FE(boolval,															arginfo_boolval)
 	PHP_FE(gettype,															arginfo_gettype)
 	PHP_FE(settype,															arginfo_settype)
 	PHP_FE(is_null,															arginfo_is_null)

ext/standard/php_type.h

@@ -24,6 +24,7 @@
 PHP_FUNCTION(intval);
 PHP_FUNCTION(floatval);
 PHP_FUNCTION(strval);
+PHP_FUNCTION(boolval);
 PHP_FUNCTION(gettype);
 PHP_FUNCTION(settype);
 PHP_FUNCTION(is_null);

ext/standard/tests/general_functions/boolval.phpt

@@ -0,0 +1,29 @@
+--TEST--
+Testing boolval()
+--FILE--
+<?php
+	var_dump(boolval(false));
+	var_dump(boolval(NULL));
+	var_dump(boolval(""));
+	var_dump(boolval(0));
+	var_dump(boolval(array()));
+
+	var_dump(boolval(true));
+	var_dump(boolval("abc"));
+	var_dump(boolval(0.5));
+	var_dump(boolval(100));
+	var_dump(boolval(new stdClass()));
+	var_dump(boolval(STDIN));
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)

ext/standard/type.c

@@ -176,6 +176,21 @@ PHP_FUNCTION(floatval)
 }
 /* }}} */
 
+/* {{{ proto bool boolval(mixed var)
+   Get the boolean value of a variable */
+PHP_FUNCTION(boolval)
+{
+	zval **val;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &val) == FAILURE) {
+		return;
+	}
+
+	RETVAL_ZVAL(*val, 1, 0);
+	convert_to_boolean(return_value);
+}
+/* }}} */
+
 /* {{{ proto string strval(mixed var)
    Get the string value of a variable */
 PHP_FUNCTION(strval)