Skip to content

Improve some TypeError and ValueError messages #5377

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

Improve some TypeError and ValueError messages #5377

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
2ae901a
Improve some TypeError and ValueError messages
kocsismate Apr 13, 2020
12329ef
Fix constant name
kocsismate Apr 14, 2020
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
2 changes: 1 addition & 1 deletion ext/bz2/bz2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ PHP_FUNCTION(bzopen)
}

if (mode_len != 1 || (mode[0] != 'r' && mode[0] != 'w')) {
zend_argument_value_error(2, "must be a valid mode. Only 'w' and 'r' are supported");
zend_argument_value_error(2, "must be either 'r' or 'w'");
RETURN_THROWS();
}

Expand Down
6 changes: 3 additions & 3 deletions ext/bz2/tests/001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ var_dump(bzopen($fp, "r"));

?>
--EXPECTF--
bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
bzopen(): Argument #2 ($mode) must be either 'r' or 'w'

Warning: bzopen(): Filename cannot be empty in %s on line %d
bool(false)

Warning: bzopen(): Filename cannot be empty in %s on line %d
bool(false)
bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
bzopen(): Argument #2 ($mode) must be either 'r' or 'w'
bzopen(): Argument #2 ($mode) must be either 'r' or 'w'

Warning: bzopen(no_such_file): Failed to open stream: No such file or directory in %s on line %d
bool(false)
Expand Down
6 changes: 3 additions & 3 deletions ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ PHP_MINIT_FUNCTION(gd)
/* GD2 image format types */
REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORINZONTAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
Expand Down Expand Up @@ -3536,7 +3536,7 @@ PHP_FUNCTION(imageflip)
gdImageFlipVertical(im);
break;

case GD_FLIP_HORINZONTAL:
case GD_FLIP_HORIZONTAL:
gdImageFlipHorizontal(im);
break;

Expand All @@ -3545,7 +3545,7 @@ PHP_FUNCTION(imageflip)
break;

default:
zend_argument_value_error(2, "must be a valid mode");
zend_argument_value_error(2, "must be either IMG_FLIP_VERTICAL, IMG_FLIP_HORIZONTAL, or IMG_FLIP_BOTH");
RETURN_THROWS();
}

Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ void gdImageFlipHorizontal(gdImagePtr im);
void gdImageFlipVertical(gdImagePtr im);
void gdImageFlipBoth(gdImagePtr im);

#define GD_FLIP_HORINZONTAL 1
#define GD_FLIP_HORIZONTAL 1
#define GD_FLIP_VERTICAL 2
#define GD_FLIP_BOTH 3

Expand Down
4 changes: 2 additions & 2 deletions ext/iconv/tests/iconv_strpos.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ var_dump(iconv_strpos("string", ""));
var_dump(iconv_strpos("", "string"));

?>
--EXPECTF--
--EXPECT--
bool(false)
bool(false)
int(5)
int(5)
Offset not contained in string
strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
bool(false)
int(7)
int(7)
Expand Down
4 changes: 2 additions & 2 deletions ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,10 +1986,10 @@ static void handle_strpos_error(size_t error) {
php_error_docref(NULL, E_WARNING, "Conversion error");
break;
case MBFL_ERROR_OFFSET:
zend_value_error("Offset not contained in string");
zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
break;
default:
zend_value_error("Unknown error in mb_strpos");
zend_value_error("mb_strpos(): Unknown error");
break;
}
}
Expand Down
12 changes: 6 additions & 6 deletions ext/mbstring/tests/bug43840.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ bool(false)

-- Offset is 22 --
--Multibyte String:--
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--ASCII String:--
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

-- Offset is 53 --
--Multibyte String:--
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--ASCII String:--
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

-- Offset is 54 --
--Multibyte String:--
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--ASCII String:--
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
12 changes: 6 additions & 6 deletions ext/mbstring/tests/bug43841.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,21 @@ foreach ($offsets as $i) {
--EXPECT--
-- Offset is -25 --
Multibyte String:
Offset not contained in string
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
ASCII String:
mb_strrpos:
Offset not contained in string
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
strrpos:
Offset not contained in string
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

-- Offset is -24 --
Multibyte String:
Offset not contained in string
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
ASCII String:
mb_strrpos:
Offset not contained in string
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
strrpos:
Offset not contained in string
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

-- Offset is -13 --
Multibyte String:
Expand Down
32 changes: 16 additions & 16 deletions ext/mbstring/tests/bug45923.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
bool(false)
> Offset: -3
int(8)
> Offset: -6
int(8)
> Offset: -20
Offset not contained in string
strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

------- mb_strpos -----------

Expand All @@ -67,15 +67,15 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
bool(false)
> Offset: -3
int(8)
> Offset: -6
int(8)
> Offset: -20
Offset not contained in string
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

------- stripos -----------

Expand All @@ -90,15 +90,15 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
bool(false)
> Offset: -3
int(8)
> Offset: -6
int(8)
> Offset: -20
Offset not contained in string
stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

------- mb_stripos -----------

Expand All @@ -113,15 +113,15 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
bool(false)
> Offset: -3
int(8)
> Offset: -6
int(8)
> Offset: -20
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

------- strrpos -----------

Expand All @@ -136,15 +136,15 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
int(8)
> Offset: -3
int(8)
> Offset: -6
int(4)
> Offset: -20
Offset not contained in string
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

------- mb_strrpos -----------

Expand All @@ -159,15 +159,15 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
int(8)
> Offset: -3
int(8)
> Offset: -6
int(4)
> Offset: -20
Offset not contained in string
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

------- strripos -----------

Expand All @@ -182,15 +182,15 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
int(8)
> Offset: -3
int(8)
> Offset: -6
int(4)
> Offset: -20
Offset not contained in string
strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

------- mb_strripos -----------

Expand All @@ -205,12 +205,12 @@ bool(false)
> Offset: 11
bool(false)
> Offset: 12
Offset not contained in string
mb_strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
> Offset: -1
int(8)
> Offset: -3
int(8)
> Offset: -6
int(4)
> Offset: -20
Offset not contained in string
mb_strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
8 changes: 4 additions & 4 deletions ext/mbstring/tests/mb_stripos_empty_needle.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ int(2)
int(5)

-- ASCII string with out of bound positive offset --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

-- ASCII string with out of bound negative offset --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

-- Multi-byte string without offset --
int(0)
Expand All @@ -88,7 +88,7 @@ int(2)
int(19)

-- Multi-byte string with out of bound positive offset --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

-- Multi-byte string with out of bound negative offset --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
20 changes: 10 additions & 10 deletions ext/mbstring/tests/mb_stripos_invalid_offset.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ try {
--EXPECT--
String len: 42
== INVALID OFFSET ==
Offset not contained in string
Offset not contained in string
Offset not contained in string
Offset not contained in string
Offset not contained in string
Offset not contained in string
Offset not contained in string
Offset not contained in string
Offset not contained in string
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
20 changes: 10 additions & 10 deletions ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ for ($i = -30; $i <= 60; $i += 10) {

**-- Offset is: -30 --**
-- ASCII String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--Multibyte String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

**-- Offset is: -20 --**
-- ASCII String --
Expand Down Expand Up @@ -91,24 +91,24 @@ int(20)

**-- Offset is: 30 --**
-- ASCII String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--Multibyte String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

**-- Offset is: 40 --**
-- ASCII String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--Multibyte String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

**-- Offset is: 50 --**
-- ASCII String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--Multibyte String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

**-- Offset is: 60 --**
-- ASCII String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
--Multibyte String --
Offset not contained in string
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
Loading