Change int parameter types to bool when the parameter behaves as bool

Closes GH-6148

diff --git a/UPGRADING b/UPGRADING
index 632c50618f95d55bffb2774bfb53193fa1368486..090b221c712c30ff59d9ece94f2f9cedb05b8945 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -598,6 +598,8 @@ PHP 8.0 UPGRADE NOTES
   . sem_get() will now return an SysvSemaphore object rather than a resource.
     Return value checks using is_resource() should be replaced with checks
     for `false`.
+  . The $auto_release parameter of sem_get() was changed to accept bool values
+    rather than int.
 
 - Sysvshm:
   . shm_attach() will now return an SysvSharedMemory object rather than a resource.
@@ -786,6 +788,8 @@ PHP 8.0 UPGRADE NOTES
         array_diff($array, ...$excludes);
         // OK even if $arrays only contains a single array.
         array_intersect(...$arrays);
+  . The $flag parameter of ob_implicit_flush() was changed to accept bool
+    values rather than int.
 
 - Zip:
   . Extension updated to version 1.19.0

diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 7304223bfb7531d0d7f25776a2a0ef79972874b0..aae651df0240adf4ced6c47c913985a701c49b49 100755 (executable)
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -37,8 +37,7 @@ function ob_list_handlers(): array {}
 
 function ob_get_status(bool $full_status = false): array {}
 
-// TODO: Shouldn't this be a bool argument?
-function ob_implicit_flush(int $flag = 1): void {}
+function ob_implicit_flush(bool $flag = true): void {}
 
 function output_reset_rewrite_vars(): bool {}
 

diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index fcce980c3a54dcbbcac4ca24c95395cb8e47bc6f..37f6d8c159c6728e0942ce812e90b5055c19c154 100644 (file)
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 8f80246569ba9de48eebc8b68f476723f78b8f77 */
+ * Stub hash: df6d5ebb0449274b94f1e8707ab54978fd4b7d2f */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
        ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -45,7 +45,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ob_get_status, 0, 0, IS_ARRAY, 0
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ob_implicit_flush, 0, 0, IS_VOID, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flag, IS_LONG, 0, "1")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flag, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
 #define arginfo_output_reset_rewrite_vars arginfo_ob_flush

diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index c277009f11e473c5c5ef4b747260e11291fed773..dbde858ab94ee2b8b07769ed5603bc674469d048 100644 (file)
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -187,13 +187,14 @@ PHP_MINFO_FUNCTION(sysvsem)
 /* {{{ Return an id for the semaphore with the given key, and allow max_acquire (default 1) processes to acquire it simultaneously */
 PHP_FUNCTION(sem_get)
 {
-       zend_long key, max_acquire = 1, perm = 0666, auto_release = 1;
+       zend_long key, max_acquire = 1, perm = 0666;
+       zend_bool auto_release = 1;
        int semid;
        struct sembuf sop[3];
        int count;
        sysvsem_sem *sem_ptr;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l|lll", &key, &max_acquire, &perm, &auto_release)) {
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l|llb", &key, &max_acquire, &perm, &auto_release)) {
                RETURN_THROWS();
        }
 
@@ -289,7 +290,7 @@ PHP_FUNCTION(sem_get)
        sem_ptr->key   = key;
        sem_ptr->semid = semid;
        sem_ptr->count = 0;
-       sem_ptr->auto_release = auto_release;
+       sem_ptr->auto_release = (int) auto_release;
 }
 /* }}} */
 

diff --git a/ext/sysvsem/sysvsem.stub.php b/ext/sysvsem/sysvsem.stub.php
index 095720df601036608e8bfbbab9c18dbc690107c0..3265984e70f9c988aba2d931f742df39df0b0d93 100644 (file)
--- a/ext/sysvsem/sysvsem.stub.php
+++ b/ext/sysvsem/sysvsem.stub.php
@@ -6,10 +6,7 @@ final class SysvSemaphore
 {
 }
 
-/**
- * @todo use bool for $auto_release
- */
-function sem_get(int $key, int $max_acquire = 1, int $perm = 0666, int $auto_release = 1): SysvSemaphore|false {}
+function sem_get(int $key, int $max_acquire = 1, int $perm = 0666, bool $auto_release = true): SysvSemaphore|false {}
 
 function sem_acquire(SysvSemaphore $semaphore, bool $nowait = false): bool {}
 

diff --git a/ext/sysvsem/sysvsem_arginfo.h b/ext/sysvsem/sysvsem_arginfo.h
index d4666d640122fdc9ed2e1cc1aeb65f042333f367..07ebe6bf545e0f0f00e3e3ffd974e74d1423e341 100644 (file)
--- a/ext/sysvsem/sysvsem_arginfo.h
+++ b/ext/sysvsem/sysvsem_arginfo.h
@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a9de9877facd28112e1fe21cf7c6f1c7fdc8014d */
+ * Stub hash: d00524488977b77475f9aa78c132a6dd53ab4dd0 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_sem_get, 0, 1, SysvSemaphore, MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_acquire, IS_LONG, 0, "1")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, perm, IS_LONG, 0, "0666")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auto_release, IS_LONG, 0, "1")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auto_release, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sem_acquire, 0, 1, _IS_BOOL, 0)

diff --git a/main/output.c b/main/output.c
index aab080ba010908c11d0e70ebac44f0cc770987ff..c895d3856e441853d15f07822335c510dac20430 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -1507,11 +1507,11 @@ PHP_FUNCTION(ob_implicit_flush)
 {
        zend_long flag = 1;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flag) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &flag) == FAILURE) {
                RETURN_THROWS();
        }
 
-       php_output_set_implicit_flush(flag);
+       php_output_set_implicit_flush((int) flag);
 }
 /* }}} */