Skip to content

Commit 2328b3f

Browse files
kocsismatekocsismate
committed
Remove support for a null default value
1 parent 0b86dcb commit 2328b3f

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
@@ -54,7 +54,7 @@ ZEND_END_ARG_INFO()
5454
#define arginfo_get_called_class arginfo_zend_version
5555

5656
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_get_parent_class, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
57-
ZEND_ARG_TYPE_MASK(0, object, MAY_BE_STRING|MAY_BE_OBJECT|MAY_BE_NULL, "null")
57+
ZEND_ARG_TYPE_MASK(0, object, MAY_BE_STRING|MAY_BE_OBJECT, NULL)
5858
ZEND_END_ARG_INFO()
5959

6060
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
@@ -71,7 +71,7 @@ $values = array(
7171
// loop through each element of the array for object
7272

7373
foreach ($values as $value) {
74-
echo "\nArg value " . (is_object($value) ? get_class($value) : $value) . " \n";
74+
echo "\nArg value " . (is_object($value) ? get_class($value) : $value) . "\n";
7575
try {
7676
var_dump(get_parent_class($value));
7777
} catch (TypeError $exception) {
@@ -86,97 +86,97 @@ echo "Done";
8686
Error: 2 - Undefined variable $undefined_var
8787
Error: 2 - Undefined variable $unset_var
8888

89-
Arg value 0
89+
Arg value 0
9090
In autoload(0)
9191
bool(false)
9292

93-
Arg value 1
93+
Arg value 1
9494
In autoload(1)
9595
bool(false)
9696

97-
Arg value 12345
97+
Arg value 12345
9898
In autoload(12345)
9999
bool(false)
100100

101-
Arg value -2345
101+
Arg value -2345
102102
bool(false)
103103

104-
Arg value 10.5
104+
Arg value 10.5
105105
bool(false)
106106

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

110-
Arg value 101234567000
110+
Arg value 101234567000
111111
In autoload(101234567000)
112112
bool(false)
113113

114-
Arg value 1.07654321E-9
114+
Arg value 1.07654321E-9
115115
bool(false)
116116

117-
Arg value 0.5
117+
Arg value 0.5
118118
bool(false)
119119
Error: 2 - Array to string conversion
120120

121-
Arg value Array
122-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
121+
Arg value Array
122+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
123123
Error: 2 - Array to string conversion
124124

125-
Arg value Array
126-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
125+
Arg value Array
126+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
127127
Error: 2 - Array to string conversion
128128

129-
Arg value Array
130-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
129+
Arg value Array
130+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
131131
Error: 2 - Array to string conversion
132132

133-
Arg value Array
134-
get_parent_class(): Argument #1 ($object) must be of type string|object|null, array given
133+
Arg value Array
134+
get_parent_class(): Argument #1 ($object) must be of type string|object, array given
135135
Error: 2 - Array to string conversion
136136

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

140-
Arg value
140+
Arg value
141141
bool(false)
142142

143-
Arg value
143+
Arg value
144144
bool(false)
145145

146-
Arg value 1
146+
Arg value 1
147147
In autoload(1)
148148
bool(false)
149149

150-
Arg value
150+
Arg value
151151
bool(false)
152152

153-
Arg value 1
153+
Arg value 1
154154
In autoload(1)
155155
bool(false)
156156

157-
Arg value
157+
Arg value
158158
bool(false)
159159

160-
Arg value
160+
Arg value
161161
bool(false)
162162

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

166-
Arg value string
166+
Arg value string
167167
In autoload(string)
168168
bool(false)
169169

170-
Arg value String
170+
Arg value String
171171
In autoload(String)
172172
bool(false)
173173

174-
Arg value stdClass
174+
Arg value stdClass
175175
bool(false)
176176

177-
Arg value
177+
Arg value
178178
bool(false)
179179

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

0 commit comments

Comments
 (0)