Merge branch 'master' of github.com:libvips/php-vips

Author: jcupitt

Diff for: src/Config.php

@@ -346,6 +346,20 @@ private static function init(): void
 typedef int64_t gint64;
 
 typedef $gtype GType;
+
+typedef struct _GData GData;
+
+typedef struct _GTypeClass GTypeClass;
+
+typedef struct _GTypeInstance {
+    GTypeClass *g_class;
+} GTypeInstance;
+
+typedef struct _GObject {
+    GTypeInstance g_type_instance;
+    unsigned int ref_count;
+    GData *qdata;
+} GObject;
 EOS;
 
         // GLib declarations
@@ -361,14 +375,6 @@ private static function init(): void
     guint64 data[2];
 } GValue;
 
-typedef struct _GData GData;
-
-typedef struct _GTypeClass GTypeClass;
-
-typedef struct _GTypeInstance {
-    GTypeClass *g_class;
-} GTypeInstance;
-
 typedef struct _GParamSpec {
     GTypeInstance g_type_instance;
 
@@ -386,12 +392,6 @@ private static function init(): void
     unsigned int param_id;
 } GParamSpec;
 
-typedef struct _GObject {
-    GTypeInstance g_type_instance;
-    unsigned int ref_count;
-    GData *qdata;
-} GObject;
-
 const char* g_type_name (GType gtype);
 GType g_type_from_name (const char* name);
 
@@ -478,8 +478,7 @@ private static function init(): void
 typedef struct _VipsImage VipsImage;
 typedef struct _VipsProgress VipsProgress;
 
-// Defined in GObject, just typedef to void*
-typedef void* GObject;
+// Defined in GObject, just typedef to void
 typedef void GParamSpec;
 typedef void GValue;
 
@@ -781,6 +780,9 @@ private static function init(): void
         self::$gobject = \FFI::cdef($gobject_decls, $gobject_libname);
         self::$vips = \FFI::cdef($vips_decls, $vips_libname);
 
+        # Useful for debugging
+        # self::$vips->vips_leak_set(1);
+
         # force the creation of some types we need
         self::$vips->vips_blend_mode_get_type();
         self::$vips->vips_interpretation_get_type();

Diff for: tests/ConvenienceTest.php

@@ -24,6 +24,12 @@ protected function setUp(): void
         $this->pixel = $this->image->getpoint(0, 0);
     }
 
+    protected function tearDown(): void
+    {
+        unset($this->image);
+        unset($this->pixel);
+    }
+
     public function testVipsBandjoin()
     {
         $image = Vips\Image::newFromArray([[1, 2, 3], [4, 5, 6]]);

Diff for: tests/ExceptionTest.php

@@ -12,16 +12,15 @@ class ExceptionTest extends TestCase
      */
     private $image;
 
-    /**
-     * The original value of pixel (0, 0).
-     */
-    private $pixel;
-
     protected function setUp(): void
     {
         $filename = __DIR__ . '/images/img_0076.jpg';
         $this->image = Vips\Image::newFromFile($filename);
-        $this->pixel = $this->image->getpoint(0, 0);
+    }
+
+    protected function tearDown(): void
+    {
+        unset($this->image);
     }
 
     public function testVipsNewFromFileException()

Diff for: tests/MetaTest.php

@@ -26,6 +26,12 @@ protected function setUp(): void
         $this->png_image = Vips\Image::newFromFile($png_filename);
     }
 
+    protected function tearDown(): void
+    {
+        unset($this->image);
+        unset($this->png_image);
+    }
+
     public function testVipsSetGet()
     {
         $this->image->poop = 'banana';

Diff for: tests/ShortcutTest.php

@@ -37,6 +37,12 @@ protected function setUp(): void
         $this->pixel = $this->image->getpoint(0, 0);
     }
 
+    protected function tearDown(): void
+    {
+        unset($this->image);
+        unset($this->pixel);
+    }
+
     public function testVipsPow()
     {
         $real = self::mapNumeric($this->pixel, function ($value) {