Merge pull request #8403 from paulfedorow/imageinterlace-callmap-fix-4.x

Fix `imageinterlace` function signature
vimeo · Aug 12, 2022 · 24b8b8e · 24b8b8e
2 parents 7e010a7 + 8908638
commit 24b8b8e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -5410,7 +5410,7 @@
 'imagegif' => ['bool', 'image'=>'GdImage', 'file='=>'string|resource|null'],
 'imagegrabscreen' => ['false|GdImage'],
 'imagegrabwindow' => ['false|GdImage', 'handle'=>'int', 'client_area='=>'int'],
-'imageinterlace' => ['int|false', 'image'=>'GdImage', 'enable='=>'int'],
+'imageinterlace' => ['bool', 'image'=>'GdImage', 'enable='=>'bool|null'],
 'imageistruecolor' => ['bool', 'image'=>'GdImage'],
 'imagejpeg' => ['bool', 'image'=>'GdImage', 'file='=>'string|resource|null', 'quality='=>'int'],
 'imagelayereffect' => ['bool', 'image'=>'GdImage', 'effect'=>'int'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -647,7 +647,7 @@
     ],
     'imageinterlace' => [
       'old' => ['int|false', 'image'=>'resource', 'enable='=>'int'],
-      'new' => ['int|false', 'image'=>'GdImage', 'enable='=>'int'],
+      'new' => ['int|bool', 'image'=>'GdImage', 'enable='=>'bool|null'],
     ],
     'imageistruecolor' => [
       'old' => ['bool', 'image'=>'resource'],

diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php
@@ -233,6 +233,10 @@
       'old' => ['HashContext', 'algo'=>'string', 'flags='=>'int', 'key='=>'string'],
       'new' => ['HashContext', 'algo'=>'string', 'flags='=>'int', 'key='=>'string', 'options='=>'array'],
     ],
+    'imageinterlace' => [
+      'old' => ['int|bool', 'image'=>'GdImage', 'enable='=>'bool|null'],
+      'new' => ['bool', 'image'=>'GdImage', 'enable='=>'bool|null'],
+    ],
     'imap_append' => [
         'old' => ['bool', 'imap'=>'resource', 'folder'=>'string', 'message'=>'string', 'options='=>'string', 'internal_date='=>'string'],
         'new' => ['bool', 'imap'=>'IMAP\Connection', 'folder'=>'string', 'message'=>'string', 'options='=>'string', 'internal_date='=>'string'],

diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -112,7 +112,6 @@ class InternalCallMapHandlerTest extends TestCase
         'imagefilter',
         'imagegd',
         'imagegd2',
-        'imageinterlace',
         'imageopenpolygon',
         'imagepolygon',
         'imagerotate',