Skip to content

Commit f0b5d55

Browse files
committed
Promote warning to exception in parse_url()
1 parent 555eec7 commit f0b5d55

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

ext/standard/tests/url/parse_url_error_002.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ $url = 'http://secret:hideout@www.php.net:80/index.php?test=1&test2=char&test3=m
1414
echo "--> Below range:";
1515
var_dump(parse_url($url, -1));
1616

17-
echo "\n\n--> Above range:";
18-
var_dump(parse_url($url, 99));
17+
echo "\n\n--> Above range:\n";
18+
try {
19+
parse_url($url, 99);
20+
} catch (ValueError $exception) {
21+
echo $exception->getMessage() . "\n";
22+
}
1923

2024
echo "Done"
2125
?>
@@ -42,6 +46,5 @@ echo "Done"
4246

4347

4448
--> Above range:
45-
Warning: parse_url(): Invalid URL component identifier 99 in %s on line 15
46-
bool(false)
49+
Invalid URL component identifier: 99
4750
Done

ext/standard/url.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ PHP_FUNCTION(parse_url)
363363
if (resource->fragment != NULL) RETVAL_STR_COPY(resource->fragment);
364364
break;
365365
default:
366-
php_error_docref(NULL, E_WARNING, "Invalid URL component identifier " ZEND_LONG_FMT, key);
367-
RETVAL_FALSE;
366+
zend_value_error("Invalid URL component identifier: " ZEND_LONG_FMT, key);
367+
break;
368368
}
369369
goto done;
370370
}

0 commit comments

Comments
 (0)