Skip to content

Commit 80fc1a7

Browse files
DanackDanack
committed
Whitespace CS.
1 parent ed784bc commit 80fc1a7

File tree

2 files changed

+37
-111
lines changed

2 files changed

+37
-111
lines changed

Diff for: ‎Imagick.stub.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function compareImageLayers(int $metric): Imagick {}
1212

1313
public function pingImageBlob(string $image): bool {}
1414

15-
public function pingImageFile(resource $filehandle, ?string $filename=null): bool {}
15+
public function pingImageFile(resource $filehandle, ?string $filename = null): bool {}
1616

1717
public function transposeImage(): bool {}
1818

@@ -195,9 +195,9 @@ public function getImageProfiles(string $pattern = "*", bool $include_values = t
195195
// DISTORTION_*
196196
public function distortImage(int $distortion, array $arguments, bool $bestfit): bool {}
197197

198-
public function writeImageFile(resource $filehandle, ?string $format=null): bool {}
198+
public function writeImageFile(resource $filehandle, ?string $format = null): bool {}
199199

200-
public function writeImagesFile(resource $filehandle, ?string $format=null): bool {}
200+
public function writeImagesFile(resource $filehandle, ?string $format = null): bool {}
201201

202202
public function resetImagePage(string $page): bool {}
203203

@@ -435,7 +435,7 @@ public function smushImages(bool $stack, int $offset): Imagick {}
435435

436436
// PHP_ME(imagick, __construct, imagick_construct_args, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
437437
// TODO int|float? :spocks_eyebrow.gif:
438-
public function __construct(string|array|int|float|null $files=null) {}
438+
public function __construct(string|array|int|float|null $files = null) {}
439439

440440
public function __toString(): string {}
441441

@@ -456,13 +456,13 @@ public function readImage(string $filename): bool {}
456456

457457
public function readImages(array $filenames): bool {}
458458

459-
public function readImageBlob(string $image, ?string $filename=null): bool {}
459+
public function readImageBlob(string $image, ?string $filename = null): bool {}
460460

461461
public function setImageFormat(string $format): bool {}
462462

463463
public function scaleImage(int $columns, int $rows, bool $bestfit = false, bool $legacy = false): bool {}
464464

465-
public function writeImage(?string $filename=null): bool {}
465+
public function writeImage(?string $filename = null): bool {}
466466

467467
public function writeImages(string $filename, bool $adjoin): bool {}
468468

@@ -710,7 +710,7 @@ public static function queryFormats(string $pattern = "*"): array {}
710710
public static function queryFonts(string $pattern = "*"): array {}
711711

712712
/* TODO $multiline == null, means we should autodetect */
713-
public function queryFontMetrics(ImagickDraw $settings, string $text, ?bool $multiline=null): array {}
713+
public function queryFontMetrics(ImagickDraw $settings, string $text, ?bool $multiline = null): array {}
714714

715715
public function steganoImage(Imagick $watermark, int $offset): Imagick {}
716716

@@ -1127,7 +1127,7 @@ public function newImage(
11271127
int $columns,
11281128
int $rows,
11291129
ImagickPixel|string $background_color,
1130-
string $format=null
1130+
string $format = null
11311131
): bool {}
11321132

11331133
// TODO - canvas? description
@@ -1139,7 +1139,7 @@ public function getCompressionQuality(): int {}
11391139

11401140
public static function getCopyright(): string {}
11411141

1142-
public static function getConfigureOptions(string $pattern="*"): string {}
1142+
public static function getConfigureOptions(string $pattern = "*"): string {}
11431143

11441144

11451145
#if MagickLibVersion > 0x660
@@ -1266,10 +1266,10 @@ public function statisticImage(
12661266
#endif
12671267

12681268
#if MagickLibVersion >= 0x652
1269-
public function subimageMatch(Imagick $image, ?array &$offset=null, ?float &$similarity=null, float $threshold = 0.0, int metric=0): Imagick {}
1269+
public function subimageMatch(Imagick $image, ?array &$offset = null, ?float &$similarity = null, float $threshold = 0.0, int $metric = 0): Imagick {}
12701270

12711271
/** @alias Imagick::subimageMatch */
1272-
public function similarityimage(imagick $image, ?array &$offset=null, ?float &$similarity=null, float $threshold = 0.0, int metric=0): Imagick {}
1272+
public function similarityimage(imagick $image, ?array &$offset = null, ?float &$similarity = null, float $threshold = 0.0, int $metric = 0): Imagick {}
12731273
#endif
12741274

12751275
public static function setRegistry(string $key, string $value): bool {}

Diff for: ‎Imagick_arginfo.h

+26-100
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 0, 1)
6262
ZEND_ARG_INFO(0, filehandle)
6363
#endif
6464

65-
66-
#if PHP_VERSION_ID >= 80000
67-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null")
68-
#else
69-
ZEND_ARG_INFO(0, filename)
70-
#endif
65+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null")
7166
ZEND_END_ARG_INFO()
7267
#endif
7368

@@ -827,12 +822,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 0, 1)
827822
ZEND_ARG_INFO(0, filehandle)
828823
#endif
829824

830-
831-
#if PHP_VERSION_ID >= 80000
832-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 1, "null")
833-
#else
834-
ZEND_ARG_INFO(0, format)
835-
#endif
825+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 1, "null")
836826
ZEND_END_ARG_INFO()
837827
#endif
838828

@@ -1679,13 +1669,7 @@ ZEND_END_ARG_INFO()
16791669
#endif
16801670

16811671
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick___construct, 0, 0, 0)
1682-
1683-
#if PHP_VERSION_ID >= 80000
1684-
ZEND_ARG_TYPE_MASK(0, files, MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_NULL, "null")
1685-
#else
1686-
ZEND_ARG_INFO(0, files)
1687-
#endif
1688-
1672+
ZEND_ARG_TYPE_MASK(0, files, MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_NULL, "null")
16891673
ZEND_END_ARG_INFO()
16901674

16911675

@@ -1805,12 +1789,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_readImageBlob, 0, 0, 1)
18051789
#else
18061790
ZEND_ARG_INFO(0, image)
18071791
#endif
1808-
1809-
#if PHP_VERSION_ID >= 80000
1810-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null")
1811-
#else
1812-
ZEND_ARG_INFO(0, filename)
1813-
#endif
1792+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null")
18141793
ZEND_END_ARG_INFO()
18151794

18161795

@@ -1858,12 +1837,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_writeImage, 0, 0,
18581837
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImage, 0, 0, 0)
18591838
#endif
18601839

1861-
1862-
#if PHP_VERSION_ID >= 80000
1863-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null")
1864-
#else
1865-
ZEND_ARG_INFO(0, filename)
1866-
#endif
1840+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null")
18671841
ZEND_END_ARG_INFO()
18681842

18691843

@@ -1906,12 +1880,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_blurImage, 0, 0, 2)
19061880
#else
19071881
ZEND_ARG_INFO(0, sigma)
19081882
#endif
1909-
1910-
#if PHP_VERSION_ID >= 80000
1911-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT")
1912-
#else
1913-
ZEND_ARG_INFO(0, channel)
1914-
#endif
1883+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT")
19151884
ZEND_END_ARG_INFO()
19161885

19171886

@@ -2913,27 +2882,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageUnits, 0, 0, 1)
29132882
#endif
29142883
ZEND_END_ARG_INFO()
29152884

2916-
2917-
#if PHP_VERSION_ID >= 80000
2918-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_sharpenImage, 0, 2, _IS_BOOL, 0)
2919-
#else
2920-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_sharpenImage, 0, 0, 2)
2921-
#endif
2922-
2923-
2924-
#if PHP_VERSION_ID >= 80000
2925-
ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0)
2926-
#else
2927-
ZEND_ARG_INFO(0, radius)
2928-
#endif
2929-
2930-
#if PHP_VERSION_ID >= 80000
2931-
ZEND_ARG_TYPE_INFO(0, sigma, IS_DOUBLE, 0)
2932-
#else
2933-
ZEND_ARG_INFO(0, sigma)
2934-
#endif
2935-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT")
2936-
ZEND_END_ARG_INFO()
2885+
#define arginfo_class_Imagick_sharpenImage arginfo_class_Imagick_blurImage
29372886

29382887
#define arginfo_class_Imagick_shaveImage arginfo_class_Imagick_sampleImage
29392888

@@ -3042,12 +2991,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_queryFontMetrics, 0, 0, 2)
30422991
#else
30432992
ZEND_ARG_INFO(0, text)
30442993
#endif
3045-
3046-
#if PHP_VERSION_ID >= 80000
3047-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, multiline, _IS_BOOL, 1, "null")
3048-
#else
3049-
ZEND_ARG_INFO(0, multiline)
3050-
#endif
2994+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, multiline, _IS_BOOL, 1, "null")
30512995
ZEND_END_ARG_INFO()
30522996

30532997

@@ -3540,7 +3484,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_gammaImage, 0, 0, 1)
35403484
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT")
35413485
ZEND_END_ARG_INFO()
35423486

3543-
#define arginfo_class_Imagick_gaussianBlurImage arginfo_class_Imagick_sharpenImage
3487+
#define arginfo_class_Imagick_gaussianBlurImage arginfo_class_Imagick_blurImage
35443488

35453489
#if MagickLibVersion < 0x700 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
35463490

@@ -4468,12 +4412,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_newImage, 0, 0, 3)
44684412
ZEND_ARG_INFO(0, rows)
44694413
#endif
44704414
ZEND_ARG_OBJ_TYPE_MASK(0, background_color, ImagickPixel, MAY_BE_STRING, NULL)
4471-
4472-
#if PHP_VERSION_ID >= 80000
4473-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 0, "null")
4474-
#else
4475-
ZEND_ARG_INFO(0, format)
4476-
#endif
4415+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 0, "null")
44774416
ZEND_END_ARG_INFO()
44784417

44794418

@@ -4516,12 +4455,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getConfigureOption
45164455
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getConfigureOptions, 0, 0, 0)
45174456
#endif
45184457

4519-
4520-
#if PHP_VERSION_ID >= 80000
4521-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 0, "*")
4522-
#else
4523-
ZEND_ARG_INFO(0, pattern)
4524-
#endif
4458+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 0, "\"*\"")
45254459
ZEND_END_ARG_INFO()
45264460

45274461
#if MagickLibVersion > 0x660
@@ -4835,35 +4769,27 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 0, 1)
48354769
#endif
48364770

48374771
ZEND_ARG_OBJ_INFO(0, image, Imagick, 0)
4838-
4839-
#if PHP_VERSION_ID >= 80000
4840-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, offset, IS_ARRAY, 1, "null")
4841-
#else
4842-
ZEND_ARG_INFO(1, offset)
4843-
#endif
4844-
4845-
#if PHP_VERSION_ID >= 80000
4846-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, similarity, IS_DOUBLE, 1, "0.0")
4847-
#else
4848-
ZEND_ARG_INFO(1, similarity)
4772+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, offset, IS_ARRAY, 1, "null")
4773+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, similarity, IS_DOUBLE, 1, "null")
4774+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, threshold, IS_DOUBLE, 0, "0.0")
4775+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, metric, IS_LONG, 0, "0")
4776+
ZEND_END_ARG_INFO()
48494777
#endif
48504778

4851-
#if PHP_VERSION_ID >= 80000
4852-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, threshold, IS_DOUBLE, 0, "0.0")
4853-
#else
4854-
ZEND_ARG_INFO(1, threshold)
4855-
#endif
4779+
#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652
48564780

48574781
#if PHP_VERSION_ID >= 80000
4858-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, metric, IS_LONG, 0, "0")
4782+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_similarityimage, 0, 1, Imagick, 0)
48594783
#else
4860-
ZEND_ARG_INFO(1, metric)
4861-
#endif
4862-
ZEND_END_ARG_INFO()
4784+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_similarityimage, 0, 0, 1)
48634785
#endif
48644786

4865-
#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652
4866-
#define arginfo_class_Imagick_similarityimage arginfo_class_Imagick_subimageMatch
4787+
ZEND_ARG_OBJ_INFO(0, image, imagick, 0)
4788+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, offset, IS_ARRAY, 1, "null")
4789+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, similarity, IS_DOUBLE, 1, "null")
4790+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, threshold, IS_DOUBLE, 0, "0.0")
4791+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, metric, IS_LONG, 0, "0")
4792+
ZEND_END_ARG_INFO()
48674793
#endif
48684794

48694795
#if MagickLibVersion > 0x628
@@ -6485,4 +6411,4 @@ static const zend_function_entry class_Imagick_methods[] = {
64856411
ZEND_ME(Imagick, setImageMask, arginfo_class_Imagick_setImageMask, ZEND_ACC_PUBLIC)
64866412
#endif
64876413
ZEND_FE_END
6488-
};
6414+
};

0 commit comments

Comments
 (0)