Skip to content

Commit 58783a1

Browse files
kocsismatekocsismate
committed
Remove support for a null default value
1 parent 1d3d540 commit 58783a1

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎Zend/tests/010.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ bool(false)
5858
bool(false)
5959
bool(false)
6060
bool(false)
61-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
61+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
6262
bool(false)
6363
Done

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ ZEND_FUNCTION(get_parent_class)
643643

644644
ZEND_PARSE_PARAMETERS_START(0, 1)
645645
Z_PARAM_OPTIONAL
646-
Z_PARAM_STR_OR_OBJ_OR_NULL(str, object)
646+
Z_PARAM_STR_OR_OBJ(str, object)
647647
ZEND_PARSE_PARAMETERS_END();
648648

649649
if (object) {

‎Zend/zend_builtin_functions.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function get_class(object $object = UNKNOWN): string {}
3030

3131
function get_called_class(): string {}
3232

33-
function get_parent_class(string|object|null $object = null): string|false {}
33+
function get_parent_class(string|object $object = UNKNOWN): string|false {}
3434

3535
function is_subclass_of($object, string $class_name, bool $allow_string = true): bool {}
3636

‎Zend/zend_builtin_functions_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ZEND_END_ARG_INFO()
5353
#define arginfo_get_called_class arginfo_zend_version
5454

5555
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_get_parent_class, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
56-
ZEND_ARG_TYPE_MASK(0, object, MAY_BE_STRING|MAY_BE_OBJECT|MAY_BE_NULL, "null")
56+
ZEND_ARG_TYPE_MASK(0, object, MAY_BE_STRING|MAY_BE_OBJECT, NULL)
5757
ZEND_END_ARG_INFO()
5858

5959
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_is_subclass_of, 0, 2, _IS_BOOL, 0)

‎ext/standard/tests/class_object/get_parent_class_variation_002.phpt

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $values = array(
7777
// loop through each element of the array for object
7878

7979
foreach ($values as $value) {
80-
echo "\nArg value " . (is_object($value) ? get_class($value) : $value) . " \n";
80+
echo "\nArg value " . (is_object($value) ? get_class($value) : $value) . "\n";
8181
try {
8282
var_dump(get_parent_class($value));
8383
} catch (TypeError $exception) {
@@ -92,97 +92,97 @@ echo "Done";
9292
Error: 2 - Undefined variable $undefined_var
9393
Error: 2 - Undefined variable $unset_var
9494

95-
Arg value 0
95+
Arg value 0
9696
In autoload(0)
9797
bool(false)
9898

99-
Arg value 1
99+
Arg value 1
100100
In autoload(1)
101101
bool(false)
102102

103-
Arg value 12345
103+
Arg value 12345
104104
In autoload(12345)
105105
bool(false)
106106

107-
Arg value -2345
107+
Arg value -2345
108108
bool(false)
109109

110-
Arg value 10.5
110+
Arg value 10.5
111111
bool(false)
112112

113-
Arg value -10.5
113+
Arg value -10.5
114114
bool(false)
115115

116-
Arg value 101234567000
116+
Arg value 101234567000
117117
In autoload(101234567000)
118118
bool(false)
119119

120-
Arg value 1.07654321E-9
120+
Arg value 1.07654321E-9
121121
bool(false)
122122

123-
Arg value 0.5
123+
Arg value 0.5
124124
bool(false)
125125
Error: 2 - Array to string conversion
126126

127-
Arg value Array
128-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
127+
Arg value Array
128+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
129129
Error: 2 - Array to string conversion
130130

131-
Arg value Array
132-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
131+
Arg value Array
132+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
133133
Error: 2 - Array to string conversion
134134

135-
Arg value Array
136-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
135+
Arg value Array
136+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
137137
Error: 2 - Array to string conversion
138138

139-
Arg value Array
140-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
139+
Arg value Array
140+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
141141
Error: 2 - Array to string conversion
142142

143-
Arg value Array
144-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
143+
Arg value Array
144+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
145145

146-
Arg value
146+
Arg value
147147
bool(false)
148148

149-
Arg value
149+
Arg value
150150
bool(false)
151151

152-
Arg value 1
152+
Arg value 1
153153
In autoload(1)
154154
bool(false)
155155

156-
Arg value
156+
Arg value
157157
bool(false)
158158

159-
Arg value 1
159+
Arg value 1
160160
In autoload(1)
161161
bool(false)
162162

163-
Arg value
163+
Arg value
164164
bool(false)
165165

166-
Arg value
166+
Arg value
167167
bool(false)
168168

169-
Arg value
169+
Arg value
170170
bool(false)
171171

172-
Arg value string
172+
Arg value string
173173
In autoload(string)
174174
bool(false)
175175

176-
Arg value String
176+
Arg value String
177177
In autoload(String)
178178
bool(false)
179179

180-
Arg value stdClass
180+
Arg value stdClass
181181
bool(false)
182182

183-
Arg value
183+
Arg value
184184
bool(false)
185185

186-
Arg value
186+
Arg value
187187
bool(false)
188188
Done

0 commit comments

Comments
 (0)