Convert newinstance to anonymous classes

xp-framework · Apr 10, 2020 · bd89acb · bd89acb
1 parent d78c411
commit bd89acb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/src/test/php/img/unittest/GifImageWriterTest.class.php b/src/test/php/img/unittest/GifImageWriterTest.class.php
@@ -2,8 +2,8 @@
 
 use img\ImagingException;
 use img\io\GifStreamWriter;
-use io\{FileUtil, IOException};
 use io\streams\{MemoryOutputStream, OutputStream};
+use io\{FileUtil, IOException};
 
 /**
  * Tests writing GIF images
@@ -16,11 +16,11 @@ class GifImageWriterTest extends AbstractImageWriterTest {
 
   #[@test, @expect(ImagingException::class)]
   public function write_error() {
-    $this->image->saveTo(new GifStreamWriter(newinstance(OutputStream::class, [], [
-      'write' => function($arg) { throw new IOException('Could not write: Intentional exception'); },
-      'flush' => function() { },
-      'close' => function() { }
-    ])));
+    $this->image->saveTo(new GifStreamWriter(new class() implements OutputStream {
+      public function write($arg) { throw new IOException('Could not write: Intentional exception'); }
+      public function flush() { }
+      public function close() { }
+    }));
   }
 
   #[@test]

diff --git a/src/test/php/img/unittest/ImageReaderTest.class.php b/src/test/php/img/unittest/ImageReaderTest.class.php
@@ -1,9 +1,9 @@
 <?php namespace img\unittest;
 
-use img\{Image, ImagingException};
 use img\io\{GifStreamReader, JpegStreamReader, PngStreamReader};
-use io\{FileUtil, IOException};
+use img\{Image, ImagingException};
 use io\streams\{InputStream, MemoryInputStream};
+use io\{FileUtil, IOException};
 use lang\Runtime;
 use unittest\TestCase;
 
@@ -17,12 +17,11 @@ class ImageReaderTest extends TestCase {
 
   #[@test, @expect(ImagingException::class)]
   public function readError() {
-    $s= newinstance(InputStream::class, [], [
-      'read' => function($limit= 8192) { throw new IOException('Could not read: Intentional exception'); },
-      'available' => function() { return 1; },
-      'close' => function() { }
-    ]);
-    Image::loadFrom(new GifStreamReader($s));
+    Image::loadFrom(new GifStreamReader(new class() implements InputStream {
+      public function read($limit= 8192) { throw new IOException('Could not read: Intentional exception'); }
+      public function available() { return 1; }
+      public function close() { }
+    }));
   }
 
   #[@test, @expect(ImagingException::class)]

diff --git a/src/test/php/img/unittest/JpegImageWriterTest.class.php b/src/test/php/img/unittest/JpegImageWriterTest.class.php
@@ -2,8 +2,8 @@
 
 use img\ImagingException;
 use img\io\JpegStreamWriter;
-use io\{FileUtil, IOException};
 use io\streams\{MemoryOutputStream, OutputStream};
+use io\{FileUtil, IOException};
 
 /**
  * Tests writing JPEG images
@@ -16,11 +16,11 @@ class JpegImageWriterTest extends AbstractImageWriterTest {
 
   #[@test, @expect(ImagingException::class)]
   public function write_error() {
-    $this->image->saveTo(new JpegStreamWriter(newinstance(OutputStream::class, [], [
-      'write' => function($arg) { throw new IOException('Could not write: Intentional exception'); },
-      'flush' => function() { },
-      'close' => function() { }
-    ])));
+    $this->image->saveTo(new JpegStreamWriter(new class() implements OutputStream {
+      public function write($arg) { throw new IOException('Could not write: Intentional exception'); }
+      public function flush() { }
+      public function close() { }
+    }));
   }
 
   #[@test]

diff --git a/src/test/php/img/unittest/PngImageWriterTest.class.php b/src/test/php/img/unittest/PngImageWriterTest.class.php
@@ -2,8 +2,8 @@
 
 use img\ImagingException;
 use img\io\PngStreamWriter;
-use io\{FileUtil, IOException};
 use io\streams\{MemoryOutputStream, OutputStream};
+use io\{FileUtil, IOException};
 
 /**
  * Tests writing PNG images
@@ -19,11 +19,11 @@ protected function imageType() { return 'PNG'; }
 
   #[@test, @expect(ImagingException::class)]
   public function write_error() {
-    $this->image->saveTo(new PngStreamWriter(newinstance(OutputStream::class, [], [
-      'write' => function($arg) { throw new IOException('Could not write: Intentional exception'); },
-      'flush' => function() { },
-      'close' => function() { }
-    ])));
+    $this->image->saveTo(new PngStreamWriter(new class() implements OutputStream {
+      public function write($arg) { throw new IOException('Could not write: Intentional exception'); }
+      public function flush() { }
+      public function close() { }
+    }));
   }
 
   #[@test]