Skip to content

Commit 14c4d7d

Browse files
garrettrayjgarrettrayj
authored
Merge pull request #12 from garrettrayj/image-test-fix
Fix image test broken by PHP upgrade.
2 parents eeb7b38 + 93d7c98 commit 14c4d7d

File tree

4 files changed

+14
-24
lines changed

4 files changed

+14
-24
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/codeStyles/codeStyleConfig.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/php7-mapnik.iml‎

Lines changed: 0 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/image.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--EXTENSIONS--
44
gd
55
--SKIPIF--
6-
<?php if (!extension_loaded("mapnik")) print "skip"; ?>
6+
<?php if (!extension_loaded("mapnik") || !extension_loaded("gd")) print "skip"; ?>
77
--FILE--
88
<?php
99

@@ -98,4 +98,4 @@ class ImageTest extends MapnikTestCase
9898
new ImageTest();
9999

100100
?>
101-
--EXPECT--
101+
--EXPECT--

0 commit comments

Comments
 (0)