Drop XP 9 compatibility

See xp-framework/rfc#341
xp-framework · Feb 28, 2022 · 97373d2 · 97373d2
1 parent 4849448
commit 97373d2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,6 +3,11 @@ Imaging APIs for the XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 10.0.0 / 2022-02-28
+
+* Implemented xp-framework/rfc#341: Drop XP 9 compatibility - @thekid
+* Added XP 11 compatibility - @thekid
+
 ## 9.0.0 / 2020-04-10
 
 * Implemented xp-framework/rfc#334: Drop PHP 5.6:

diff --git a/composer.json b/composer.json
@@ -6,8 +6,8 @@
   "description" : "Imaging APIs for the XP Framework",
   "keywords": ["module", "xp"],
   "require" : {
-    "xp-framework/core": "^10.0 | ^8.0 | ^7.0",
-    "xp-framework/xml" : "^10.0 | ^9.0 | ^8.0 | ^7.0",
+    "xp-framework/core": "^11.0 | ^10.0",
+    "xp-framework/xml" : "^11.0 | ^10.0",
     "php" : ">=7.0.0"
   },
   "require-dev" : {

diff --git a/src/main/php/img/Image.class.php b/src/main/php/img/Image.class.php
@@ -91,7 +91,7 @@ public static function create($w, $h, $type= IMG_PALETTE, $class= __CLASS__) {
         throw new ImagingException('Unknown type '.$type);
     }
 
-    if (!is_resource($handle)) {
+    if (!$handle) {
       throw new ImagingException('Could not create image of type '.$type);
     }
     return new $class($handle);

diff --git a/src/test/php/img/unittest/GifImageWriterTest.class.php b/src/test/php/img/unittest/GifImageWriterTest.class.php
@@ -26,6 +26,6 @@ public function close() { }
   public function write() {
     $s= new MemoryOutputStream();
     $this->image->saveTo(new GifStreamWriter($s));
-    $this->assertNotEquals('', $s->getBytes());
+    $this->assertNotEquals('', $s->bytes());
   }
 }
diff --git a/src/test/php/img/unittest/JpegImageWriterTest.class.php b/src/test/php/img/unittest/JpegImageWriterTest.class.php
@@ -26,6 +26,6 @@ public function close() { }
   public function write() {
     $s= new MemoryOutputStream();
     $this->image->saveTo(new JpegStreamWriter($s));
-    $this->assertNotEquals('', $s->getBytes());
+    $this->assertNotEquals('', $s->bytes());
   }
 }
diff --git a/src/test/php/img/unittest/PngImageWriterTest.class.php b/src/test/php/img/unittest/PngImageWriterTest.class.php
@@ -29,6 +29,6 @@ public function close() { }
   public function write() {
     $s= new MemoryOutputStream();
     $this->image->saveTo(new PngStreamWriter($s));
-    $this->assertNotEquals('', $s->getBytes());
+    $this->assertNotEquals('', $s->bytes());
   }
 }