Skip to content

Add optional $allow_objects param to is_string() #2408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add optional $allow_objects param to is_string() #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2547,8 +2547,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_is_float, 0)
ZEND_ARG_INFO(0, var)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_is_string, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_is_string, 0, 0, 1)
ZEND_ARG_INFO(0, var)
ZEND_ARG_INFO(0, allow_objects)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_is_array, 0)
Expand Down
39 changes: 36 additions & 3 deletions ext/standard/tests/general_functions/is_string.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,31 @@ foreach ($not_strings as $type ) {
var_dump( is_string($type) );
}

echo "\n*** Testing is_string() second parameter ***\n";

echo "-- objects not allowed; string input --\n";
var_dump(is_string("string", false));
echo "-- objects allowed; string input --\n";
var_dump(is_string("string", true));

echo "-- objects not allowed; non-__toString() object input --\n";
var_dump(is_string(new stdClass(), false));
echo "-- objects allowed; non-__toString() object input --\n";
var_dump(is_string(new stdClass(), true));

$toStringObject = new class() { public function __toString() { return ''; } };
echo "-- objects not allowed; __toString() object input --\n";
var_dump(is_string($toStringObject, false));
echo "-- objects allowed; __toString() object input --\n";
var_dump(is_string($toStringObject, true));


echo "\n*** Testing error conditions ***\n";
//Zero argument
var_dump( is_string() );

//arguments more than expected
var_dump( is_string("string", "test") );
var_dump( is_string("string", false, "test") );

echo "Done\n";

Expand Down Expand Up @@ -293,11 +312,25 @@ bool(false)
-- Iteration 45 --
bool(false)

*** Testing is_string() second parameter ***
-- objects not allowed; string input --
bool(true)
-- objects allowed; string input --
bool(true)
-- objects not allowed; non-__toString() object input --
bool(false)
-- objects allowed; non-__toString() object input --
bool(false)
-- objects not allowed; __toString() object input --
bool(false)
-- objects allowed; __toString() object input --
bool(true)

*** Testing error conditions ***

Warning: is_string() expects exactly 1 parameter, 0 given in %s on line %d
Warning: is_string() expects at least 1 parameter, 0 given in %s on line %d
bool(false)

Warning: is_string() expects exactly 1 parameter, 2 given in %s on line %d
Warning: is_string() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
Done
22 changes: 20 additions & 2 deletions ext/standard/type.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,30 @@ PHP_FUNCTION(is_float)
}
/* }}} */

/* {{{ proto bool is_string(mixed var)
/* {{{ proto bool is_string(mixed var [, bool allow_objects])
Returns true if variable is a string
Warning: This function is special-cased by zend_compile.c and so is usually bypassed */
PHP_FUNCTION(is_string)
{
php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING);
zval *var;
zend_bool allow_objects = 0;

ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_ZVAL(var)
Z_PARAM_OPTIONAL Z_PARAM_BOOL(allow_objects)
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

switch (Z_TYPE_P(var)) {
case IS_STRING:
RETURN_TRUE;
break;
case IS_OBJECT:
RETURN_BOOL(allow_objects == 1 && Z_OBJCE_P(var)->__tostring);
break;
default:
RETURN_FALSE;
break;
}
}
/* }}} */

Expand Down