Commit 361644b

committed

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: ext/gd/tests/gh10614.phpt: skip if no PNG support

2 parents 4c95cb3 + 09957ab commit 361644bCopy full SHA for 361644b

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ PHP NEWS`
`14`	`14`	`- Dom:`
`15`	`15`	`. Fixed bug GH-14702 (DOMDocument::xinclude() crash). (nielsdos)`
`16`	`16`
	`17`	`+- Gd:`
	`18`	`+ . ext/gd/tests/gh10614.phpt: skip if no PNG support. (orlitzky)`
	`19`	`+`
`17`	`20`	`- LibXML:`
`18`	`21`	`. Fixed bug GH-14563 (Build failure with libxml2 v2.13.0). (nielsdos)`
`19`	`22`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@ gd`
`5`	`5`	`--SKIPIF--`
`6`	`6`	`<?php`
`7`	`7`	`if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.4', '>=')) die("skip test requires GD 2.3.4 or older");`
	`8`	`+if (!(imagetypes() & IMG_PNG)) {`
	`9`	`+ die("skip No PNG support");`
	`10`	`+}`
`8`	`11`	`?>`
`9`	`12`	`--FILE--`
`10`	`13`	`<?php`

Comments

(0)