Skip to content

Commit c58b123

Browse files
kocsismatecmb69
kocsismate
authored and
cmb69
committed
Add union return types with one class
1 parent 100552d commit c58b123

25 files changed

+172
-279
lines changed

Diff for: ‎ext/curl/curl.stub.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,9 @@ function curl_pause($handle, int $bitmask): int {}
8888
/** @param resource $handle */
8989
function curl_reset($handle): void {}
9090

91-
/**
92-
* @param resource $handle
93-
* @param array $options
94-
*/
91+
/** @param resource $handle */
9592
function curl_setopt_array($handle, array $options): bool {}
9693

97-
9894
/**
9995
* @param resource $handle
10096
* @param mixed $value

Diff for: ‎ext/gd/gd.stub.php

+22-44
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ function imageloadfont(string $filename): int|false {}
66

77
function imagesetstyle($im, array $styles): bool {}
88

9-
/** @return GdImage|false */
10-
function imagecreatetruecolor(int $x_size, int $y_size) {}
9+
function imagecreatetruecolor(int $x_size, int $y_size): GdImage|false {}
1110

1211
function imageistruecolor(GdImage $im): bool {}
1312

@@ -41,75 +40,58 @@ function imagecopyresampled(GdImage $dst_im, GdImage $src_im, int $dst_x, int $d
4140

4241
#ifdef PHP_WIN32
4342

44-
/** @return GdImage|false */
45-
function imagegrabwindow(int $handle, int $client_area = 0) {}
43+
function imagegrabwindow(int $handle, int $client_area = 0): GdImage|false {}
4644

47-
/** @return GdImage|false */
48-
function imagegrabscreen() {}
45+
function imagegrabscreen(): GdImage|false {}
4946

5047
#endif
5148

52-
/** @return GdImage|false */
53-
function imagerotate(GdImage $im, float $angle, int $bgdcolor, int $ignoretransparent = 0) {}
49+
function imagerotate(GdImage $im, float $angle, int $bgdcolor, int $ignoretransparent = 0): GdImage|false {}
5450

5551
function imagesettile(GdImage $im, $tile): bool {}
5652

5753
function imagesetbrush(GdImage $im, $brush): bool {}
5854

59-
/** @return GdImage|false */
60-
function imagecreate(int $x_size, int $y_size) {}
55+
function imagecreate(int $x_size, int $y_size): GdImage|false {}
6156

6257
function imagetypes(): int {}
6358

64-
/** @return GdImage|false */
65-
function imagecreatefromstring(string $image) {}
59+
function imagecreatefromstring(string $image): GdImage|false {}
6660

67-
/** @return GdImage|false */
68-
function imagecreatefromgif(string $filename) {}
61+
function imagecreatefromgif(string $filename): GdImage|false {}
6962

7063
#ifdef HAVE_GD_JPG
71-
/** @return GdImage|false */
72-
function imagecreatefromjpeg(string $filename) {}
64+
function imagecreatefromjpeg(string $filename): GdImage|false {}
7365
#endif
7466

7567
#ifdef HAVE_GD_PNG
76-
/** @return GdImage|false */
77-
function imagecreatefrompng(string $filename) {}
68+
function imagecreatefrompng(string $filename): GdImage|false {}
7869
#endif
7970

8071
#ifdef HAVE_GD_WEBP
81-
/** @return GdImage|false */
82-
function imagecreatefromwebp(string $filename) {}
72+
function imagecreatefromwebp(string $filename): GdImage|false {}
8373
#endif
8474

85-
/** @return GdImage|false */
86-
function imagecreatefromxbm(string $filename) {}
75+
function imagecreatefromxbm(string $filename): GdImage|false {}
8776

8877
#ifdef HAVE_GD_XPM
89-
/** @return GdImage|false */
90-
function imagecreatefromxpm(string $filename) {}
78+
function imagecreatefromxpm(string $filename): GdImage|false {}
9179
#endif
9280

93-
/** @return GdImage|false */
94-
function imagecreatefromwbmp(string $filename) {}
81+
function imagecreatefromwbmp(string $filename): GdImage|false {}
9582

96-
/** @return GdImage|false */
97-
function imagecreatefromgd(string $filename) {}
83+
function imagecreatefromgd(string $filename): GdImage|false {}
9884

99-
/** @return GdImage|false */
100-
function imagecreatefromgd2(string $filename) {}
85+
function imagecreatefromgd2(string $filename): GdImage|false {}
10186

102-
/** @return GdImage|false */
103-
function imagecreatefromgd2part(string $filename, int $srcX, int $srcY, int $width, int $height) {}
87+
function imagecreatefromgd2part(string $filename, int $srcX, int $srcY, int $width, int $height): GdImage|false {}
10488

10589
#ifdef HAVE_GD_BMP
106-
/** @return GdImage|false */
107-
function imagecreatefrombmp(string $filename) {}
90+
function imagecreatefrombmp(string $filename): GdImage|false {}
10891
#endif
10992

11093
#ifdef HAVE_GD_TGA
111-
/** @return GdImage|false */
112-
function imagecreatefromtga(string $filename) {}
94+
function imagecreatefromtga(string $filename): GdImage|false {}
11395
#endif
11496

11597
function imagexbm(GdImage $im, ?string $filename, int $foreground = UNKNOWN): bool {}
@@ -238,17 +220,13 @@ function imageflip(GdImage $im, int $mode): bool {}
238220

239221
function imageantialias(GdImage $im, bool $on): bool {}
240222

241-
/** @return GdImage|false */
242-
function imagecrop(GdImage $im, array $rect) {}
223+
function imagecrop(GdImage $im, array $rect): GdImage|false {}
243224

244-
/** @return GdImage|false */
245-
function imagecropauto(GdImage $im, int $mode = IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1) {}
225+
function imagecropauto(GdImage $im, int $mode = IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1): GdImage|false {}
246226

247-
/** @return GdImage|false */
248-
function imagescale(GdImage $im, int $new_width, int $new_height = UNKNOWN, int $mode = IMG_BILINEAR_FIXED) {}
227+
function imagescale(GdImage $im, int $new_width, int $new_height = UNKNOWN, int $mode = IMG_BILINEAR_FIXED): GdImage|false {}
249228

250-
/** @return GdImage|false */
251-
function imageaffine(GdImage $im, array $affine, array $clip = UNKNOWN) {}
229+
function imageaffine(GdImage $im, array $affine, array $clip = UNKNOWN): GdImage|false {}
252230

253231
function imageaffinematrixget(int $type, $options = UNKNOWN): array|false {}
254232

Diff for: ‎ext/gd/gd_arginfo.h

+17-17
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetstyle, 0, 2, _IS_BOOL, 0
1212
ZEND_ARG_TYPE_INFO(0, styles, IS_ARRAY, 0)
1313
ZEND_END_ARG_INFO()
1414

15-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatetruecolor, 0, 0, 2)
15+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatetruecolor, 0, 2, GdImage, MAY_BE_FALSE)
1616
ZEND_ARG_TYPE_INFO(0, x_size, IS_LONG, 0)
1717
ZEND_ARG_TYPE_INFO(0, y_size, IS_LONG, 0)
1818
ZEND_END_ARG_INFO()
@@ -103,18 +103,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecopyresampled, 0, 10, _IS_B
103103
ZEND_END_ARG_INFO()
104104

105105
#if defined(PHP_WIN32)
106-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegrabwindow, 0, 0, 1)
106+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagegrabwindow, 0, 1, GdImage, MAY_BE_FALSE)
107107
ZEND_ARG_TYPE_INFO(0, handle, IS_LONG, 0)
108108
ZEND_ARG_TYPE_INFO(0, client_area, IS_LONG, 0)
109109
ZEND_END_ARG_INFO()
110110
#endif
111111

112112
#if defined(PHP_WIN32)
113-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegrabscreen, 0, 0, 0)
113+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagegrabscreen, 0, 0, GdImage, MAY_BE_FALSE)
114114
ZEND_END_ARG_INFO()
115115
#endif
116116

117-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
117+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagerotate, 0, 3, GdImage, MAY_BE_FALSE)
118118
ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
119119
ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0)
120120
ZEND_ARG_TYPE_INFO(0, bgdcolor, IS_LONG, 0)
@@ -136,36 +136,36 @@ ZEND_END_ARG_INFO()
136136
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagetypes, 0, 0, IS_LONG, 0)
137137
ZEND_END_ARG_INFO()
138138

139-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromstring, 0, 0, 1)
139+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromstring, 0, 1, GdImage, MAY_BE_FALSE)
140140
ZEND_ARG_TYPE_INFO(0, image, IS_STRING, 0)
141141
ZEND_END_ARG_INFO()
142142

143-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromgif, 0, 0, 1)
143+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromgif, 0, 1, GdImage, MAY_BE_FALSE)
144144
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
145145
ZEND_END_ARG_INFO()
146146

147147
#if defined(HAVE_GD_JPG)
148-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromjpeg, 0, 0, 1)
148+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromjpeg, 0, 1, GdImage, MAY_BE_FALSE)
149149
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
150150
ZEND_END_ARG_INFO()
151151
#endif
152152

153153
#if defined(HAVE_GD_PNG)
154-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefrompng, 0, 0, 1)
154+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefrompng, 0, 1, GdImage, MAY_BE_FALSE)
155155
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
156156
ZEND_END_ARG_INFO()
157157
#endif
158158

159159
#if defined(HAVE_GD_WEBP)
160-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromwebp, 0, 0, 1)
160+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromwebp, 0, 1, GdImage, MAY_BE_FALSE)
161161
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
162162
ZEND_END_ARG_INFO()
163163
#endif
164164

165165
#define arginfo_imagecreatefromxbm arginfo_imagecreatefromgif
166166

167167
#if defined(HAVE_GD_XPM)
168-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromxpm, 0, 0, 1)
168+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromxpm, 0, 1, GdImage, MAY_BE_FALSE)
169169
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
170170
ZEND_END_ARG_INFO()
171171
#endif
@@ -176,7 +176,7 @@ ZEND_END_ARG_INFO()
176176

177177
#define arginfo_imagecreatefromgd2 arginfo_imagecreatefromgif
178178

179-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromgd2part, 0, 0, 5)
179+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromgd2part, 0, 5, GdImage, MAY_BE_FALSE)
180180
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
181181
ZEND_ARG_TYPE_INFO(0, srcX, IS_LONG, 0)
182182
ZEND_ARG_TYPE_INFO(0, srcY, IS_LONG, 0)
@@ -185,13 +185,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromgd2part, 0, 0, 5)
185185
ZEND_END_ARG_INFO()
186186

187187
#if defined(HAVE_GD_BMP)
188-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefrombmp, 0, 0, 1)
188+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefrombmp, 0, 1, GdImage, MAY_BE_FALSE)
189189
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
190190
ZEND_END_ARG_INFO()
191191
#endif
192192

193193
#if defined(HAVE_GD_TGA)
194-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromtga, 0, 0, 1)
194+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromtga, 0, 1, GdImage, MAY_BE_FALSE)
195195
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
196196
ZEND_END_ARG_INFO()
197197
#endif
@@ -521,26 +521,26 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageantialias, 0, 2, _IS_BOOL,
521521
ZEND_ARG_TYPE_INFO(0, on, _IS_BOOL, 0)
522522
ZEND_END_ARG_INFO()
523523

524-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecrop, 0, 0, 2)
524+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecrop, 0, 2, GdImage, MAY_BE_FALSE)
525525
ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
526526
ZEND_ARG_TYPE_INFO(0, rect, IS_ARRAY, 0)
527527
ZEND_END_ARG_INFO()
528528

529-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecropauto, 0, 0, 1)
529+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecropauto, 0, 1, GdImage, MAY_BE_FALSE)
530530
ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
531531
ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
532532
ZEND_ARG_TYPE_INFO(0, threshold, IS_DOUBLE, 0)
533533
ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
534534
ZEND_END_ARG_INFO()
535535

536-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagescale, 0, 0, 2)
536+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagescale, 0, 2, GdImage, MAY_BE_FALSE)
537537
ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
538538
ZEND_ARG_TYPE_INFO(0, new_width, IS_LONG, 0)
539539
ZEND_ARG_TYPE_INFO(0, new_height, IS_LONG, 0)
540540
ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
541541
ZEND_END_ARG_INFO()
542542

543-
ZEND_BEGIN_ARG_INFO_EX(arginfo_imageaffine, 0, 0, 2)
543+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imageaffine, 0, 2, GdImage, MAY_BE_FALSE)
544544
ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
545545
ZEND_ARG_TYPE_INFO(0, affine, IS_ARRAY, 0)
546546
ZEND_ARG_TYPE_INFO(0, clip, IS_ARRAY, 0)

0 commit comments

Comments
 (0)