Skip to content

Commit 6385006

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Mark PDO::setAttribute() $value as mixed
2 parents 2ff496e + 2e343fc commit 6385006

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

ext/pdo/pdo_dbh.stub.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ public function quote(string $string, int $type = PDO::PARAM_STR): string|false
4646
/** @tentative-return-type */
4747
public function rollBack(): bool {}
4848

49-
/**
50-
* @param array|int $value
51-
* @tentative-return-type
52-
*/
53-
public function setAttribute(int $attribute, $value): bool {}
49+
/** @tentative-return-type */
50+
public function setAttribute(int $attribute, mixed $value): bool {}
5451
}

ext/pdo/pdo_dbh_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: ec880c39e211dbfd4c239292b8cc9e7babab105b */
2+
* Stub hash: 7d10dbdfd55eb4a4dc779cbf4fa000cdf4fb3539 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO___construct, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, dsn, IS_STRING, 0)
@@ -55,7 +55,7 @@ ZEND_END_ARG_INFO()
5555

5656
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_PDO_setAttribute, 0, 2, _IS_BOOL, 0)
5757
ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
58-
ZEND_ARG_INFO(0, value)
58+
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
5959
ZEND_END_ARG_INFO()
6060

6161

0 commit comments

Comments
 (0)