Skip to content

Commit cf8a2c5

Browse files
committed
change from review
1 parent 4c8ca72 commit cf8a2c5

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

ext/spl/spl_directory.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2706,12 +2706,13 @@ PHP_METHOD(SplFileObject, ftruncate)
27062706
RETURN_THROWS();
27072707
}
27082708

2709+
CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
2710+
27092711
if (size < 0) {
2710-
zend_argument_value_error(1, "must be greater or equal to 0");
2712+
zend_argument_value_error(1, "must be greater than or equal to 0");
27112713
RETURN_THROWS();
27122714
}
27132715

2714-
CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
27152716

27162717
if (!php_stream_truncate_supported(intern->u.file.stream)) {
27172718
zend_throw_exception_ex(spl_ce_LogicException, 0, "Can't truncate file %s", ZSTR_VAL(intern->file_name));

ext/spl/tests/gh17463.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313
}
1414
?>
1515
--EXPECT--
16-
SplFileObject::ftruncate(): Argument #1 ($size) must be greater or equal to 0
16+
SplFileObject::ftruncate(): Argument #1 ($size) must be greater than or equal to 0

main/php_version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* automatically generated by configure */
22
/* edit configure.ac to change version number */
33
#define PHP_MAJOR_VERSION 8
4-
#define PHP_MINOR_VERSION 3
5-
#define PHP_RELEASE_VERSION 17
4+
#define PHP_MINOR_VERSION 5
5+
#define PHP_RELEASE_VERSION 0
66
#define PHP_EXTRA_VERSION "-dev"
7-
#define PHP_VERSION "8.3.17-dev"
8-
#define PHP_VERSION_ID 80317
7+
#define PHP_VERSION "8.5.0-dev"
8+
#define PHP_VERSION_ID 80500

0 commit comments

Comments
 (0)