Skip to content

Convert some warnings to errors in SPL #4991

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 2 commits into from
Closed

Convert some warnings to errors in SPL #4991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72684e2
Convert warnings to TypeError in php_spl.c
Girgias Dec 8, 2019
049cbf0
Convert warnings to ValueError in spl_directory.c
Girgias Dec 8, 2019
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
12 changes: 6 additions & 6 deletions ext/spl/php_spl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ PHP_FUNCTION(class_parents)
}

if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
php_error_docref(NULL, E_WARNING, "object or string expected");
RETURN_FALSE;
zend_type_error("object or string expected");
return;
}

if (Z_TYPE_P(obj) == IS_STRING) {
Expand Down Expand Up @@ -125,8 +125,8 @@ PHP_FUNCTION(class_implements)
return;
}
if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
php_error_docref(NULL, E_WARNING, "object or string expected");
RETURN_FALSE;
zend_type_error("object or string expected");
return;
}

if (Z_TYPE_P(obj) == IS_STRING) {
Expand Down Expand Up @@ -154,8 +154,8 @@ PHP_FUNCTION(class_uses)
return;
}
if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
php_error_docref(NULL, E_WARNING, "object or string expected");
RETURN_FALSE;
zend_type_error("object or string expected");
return;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in this file are okay (pls commit), but the changes to SplFileObject should imho only be done if we have modified normal f* functions in the same way, which doesn't seem to be the case.

}

if (Z_TYPE_P(obj) == IS_STRING) {
Expand Down
40 changes: 20 additions & 20 deletions ext/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2575,8 +2575,8 @@ SPL_METHOD(SplFileObject, fgetcsv)
{
case 3:
if (esc_len > 1) {
php_error_docref(NULL, E_WARNING, "escape must be empty or a single character");
RETURN_FALSE;
zend_value_error("escape must be empty or a single character");
return;
}
if (esc_len == 0) {
escape = PHP_CSV_NO_ESCAPE;
Expand All @@ -2586,15 +2586,15 @@ SPL_METHOD(SplFileObject, fgetcsv)
/* no break */
case 2:
if (e_len != 1) {
php_error_docref(NULL, E_WARNING, "enclosure must be a character");
RETURN_FALSE;
zend_value_error("enclosure must be a character");
return;
}
enclosure = enclo[0];
/* no break */
case 1:
if (d_len != 1) {
php_error_docref(NULL, E_WARNING, "delimiter must be a character");
RETURN_FALSE;
zend_value_error("delimiter must be a character");
return;
}
delimiter = delim[0];
/* no break */
Expand Down Expand Up @@ -2630,21 +2630,21 @@ SPL_METHOD(SplFileObject, fputcsv)
escape = (unsigned char) esc[0];
break;
default:
php_error_docref(NULL, E_WARNING, "escape must be empty or a single character");
RETURN_FALSE;
zend_value_error("escape must be empty or a single character");
return;
}
/* no break */
case 3:
if (e_len != 1) {
php_error_docref(NULL, E_WARNING, "enclosure must be a character");
RETURN_FALSE;
zend_value_error("enclosure must be a character");
return;
}
enclosure = enclo[0];
/* no break */
case 2:
if (d_len != 1) {
php_error_docref(NULL, E_WARNING, "delimiter must be a character");
RETURN_FALSE;
zend_value_error("delimiter must be a character");
return;
}
delimiter = delim[0];
/* no break */
Expand Down Expand Up @@ -2680,21 +2680,21 @@ SPL_METHOD(SplFileObject, setCsvControl)
escape = (unsigned char) esc[0];
break;
default:
php_error_docref(NULL, E_WARNING, "escape must be empty or a single character");
RETURN_FALSE;
zend_value_error("escape must be empty or a single character");
return;
}
/* no break */
case 2:
if (e_len != 1) {
php_error_docref(NULL, E_WARNING, "enclosure must be a character");
RETURN_FALSE;
zend_value_error("enclosure must be a character");
return;
}
enclosure = enclo[0];
/* no break */
case 1:
if (d_len != 1) {
php_error_docref(NULL, E_WARNING, "delimiter must be a character");
RETURN_FALSE;
zend_value_error("delimiter must be a character");
return;
}
delimiter = delim[0];
/* no break */
Expand Down Expand Up @@ -2910,8 +2910,8 @@ SPL_METHOD(SplFileObject, fread)
}

if (length <= 0) {
php_error_docref(NULL, E_WARNING, "Length parameter must be greater than 0");
RETURN_FALSE;
zend_value_error("Length parameter must be greater than 0");
return;
}

str = php_stream_read_to_str(intern->u.file.stream, length);
Expand Down
12 changes: 8 additions & 4 deletions ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@ fputcsv($fp, array(
fclose($fp);

$fo = new SplFileObject('SplFileObject__fgetcsv3.csv');
var_dump($fo->fgetcsv('invalid'));
try {
var_dump($fo->fgetcsv('invalid'));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}

?>
--CLEAN--
<?php
unlink('SplFileObject__fgetcsv3.csv');
?>
--EXPECTF--
Warning: SplFileObject::fgetcsv(): delimiter must be a character in %s on line %d
bool(false)
--EXPECT--
delimiter must be a character
11 changes: 7 additions & 4 deletions ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ fputcsv($fp, array(
fclose($fp);

$fo = new SplFileObject('SplFileObject__fgetcsv5.csv');
var_dump($fo->fgetcsv(',', 'invalid'));
try {
var_dump($fo->fgetcsv(',', 'invalid'));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
?>
--CLEAN--
<?php
unlink('SplFileObject__fgetcsv5.csv');
?>
--EXPECTF--
Warning: SplFileObject::fgetcsv(): enclosure must be a character in %s on line %d
bool(false)
--EXPECT--
enclosure must be a character
12 changes: 8 additions & 4 deletions ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@ fwrite($fp, '"aaa","b""bb","ccc"');
fclose($fp);

$fo = new SplFileObject('SplFileObject__fgetcsv8.csv');
var_dump($fo->fgetcsv(',', '"', 'invalid'));
try {
var_dump($fo->fgetcsv(',', '"', 'invalid'));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}

?>
--CLEAN--
<?php
unlink('SplFileObject__fgetcsv8.csv');
?>
--EXPECTF--
Warning: SplFileObject::fgetcsv(): escape must be empty or a single character in %s on line %d
bool(false)
--EXPECT--
escape must be empty or a single character
16 changes: 7 additions & 9 deletions ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,19 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two ch
echo "*** Testing fputcsv() : with default enclosure & delimiter of two chars ***\n";

$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv_variation13.csv', 'w');

var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '"'));
try {
var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '"'));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}

unset($fo);

echo "Done\n";
?>
--CLEAN--
<?php
$file = __DIR__ . '/SplFileObject_fputcsv_variation13.csv';
unlink($file);
?>
--EXPECTF--
--EXPECT--
*** Testing fputcsv() : with default enclosure & delimiter of two chars ***

Warning: SplFileObject::fputcsv(): delimiter must be a character in %s on line %d
bool(false)
Done
delimiter must be a character
15 changes: 7 additions & 8 deletions ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars
echo "*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***\n";

$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv_variation14.csv', 'w');

var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '""'));
try {
var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '""'));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}

unset($fo);

echo "Done\n";
?>
--CLEAN--
<?php
$file = __DIR__ . '/SplFileObject_fputcsv_variation14.csv';
unlink($file);
?>
--EXPECTF--
--EXPECT--
*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***

Warning: SplFileObject::fputcsv(): enclosure must be a character in %s on line %d
bool(false)
Done
enclosure must be a character
11 changes: 8 additions & 3 deletions ext/spl/tests/SplFileObject_setCsvControl_error001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ CDATA
);
$s = new SplFileObject('csv_control_data_error001.csv');
$s->setFlags(SplFileObject::READ_CSV);
$s->setCsvControl('||');

try {
$s->setCsvControl('||');
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
?>
--CLEAN--
<?php
unlink('csv_control_data_error001.csv');
?>
--EXPECTF--
Warning: SplFileObject::setCsvControl(): delimiter must be a character in %s on line %d
--EXPECT--
delimiter must be a character
11 changes: 8 additions & 3 deletions ext/spl/tests/SplFileObject_setCsvControl_error002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ CDATA
);
$s = new SplFileObject('csv_control_data_error002.csv');
$s->setFlags(SplFileObject::READ_CSV);
$s->setCsvControl('|', 'two');

try {
$s->setCsvControl('|', 'two');
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
?>
--CLEAN--
<?php
unlink('csv_control_data_error002.csv');
?>
--EXPECTF--
Warning: SplFileObject::setCsvControl(): enclosure must be a character in %s on line %d
--EXPECT--
enclosure must be a character
11 changes: 8 additions & 3 deletions ext/spl/tests/SplFileObject_setCsvControl_error003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@ CDATA
);
$s = new SplFileObject('csv_control_data_error003.csv');
$s->setFlags(SplFileObject::READ_CSV);
$s->setCsvControl('|', '\'', 'three');

try {
$s->setCsvControl('|', '\'', 'three');
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
?>
--CLEAN--
<?php
unlink('csv_control_data_error003.csv');
?>
--EXPECTF--
Warning: SplFileObject::setCsvControl(): escape must be empty or a single character in %s on line %d
--EXPECT--
escape must be empty or a single character
14 changes: 8 additions & 6 deletions ext/spl/tests/bug65545.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ $obj = new SplFileObject(__FILE__, 'r');
$data = $obj->fread(5);
var_dump($data);

$data = $obj->fread(0);
var_dump($data);
try {
$data = $obj->fread(0);
var_dump($data);
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}

// read more data than is available
$data = $obj->fread(filesize(__FILE__) + 32);
var_dump(strlen($data) === filesize(__FILE__) - 5);

?>
--EXPECTF--
--EXPECT--
string(5) "<?php"

Warning: SplFileObject::fread(): Length parameter must be greater than 0 in %s on line %d
bool(false)
Length parameter must be greater than 0
bool(true)
Loading