Changed unreserved char definition in Zend\Uri (ZF2-533) and added shell escaping to the test runner #2383

Closed
wants to merge 3 commits into
from
@@ -23,7 +23,7 @@ class Uri implements UriInterface
/**
* Character classes defined in RFC-3986
*/
- const CHAR_UNRESERVED = '\w\-\.~';
+ const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
const CHAR_GEN_DELIMS = ':\/\?#\[\]@';
const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
const CHAR_RESERVED = ':\/\?#\[\]@!\$&\'\(\)\*\+,;=';
View
@@ -86,7 +86,7 @@
foreach ($components as $component) {
$component = 'ZendTest/' . basename(str_replace('_', '/', $component));
echo "$component:\n";
- system("$phpunit_bin $phpunit_opts $phpunit_coverage " . __DIR__ . '/' . $component, $c_result);
+ system("$phpunit_bin $phpunit_opts $phpunit_coverage " . escapeshellarg(__DIR__ . '/' . $component), $c_result);
echo "\n\n";
if ($c_result) {
$result = $c_result;