Merge pull request #63 from jcupitt/vips-8.6

Fix blendmode + add missing @throws declarations

Author: jcupitt

.travis.yml

@@ -11,8 +11,8 @@ php:
 env:
   global:
     - VIPS_VERSION_MAJOR=8
-    - VIPS_VERSION_MINOR=5
-    - VIPS_VERSION_MICRO=8
+    - VIPS_VERSION_MINOR=6
+    - VIPS_VERSION_MICRO=0
     - PATH=$HOME/vips/bin:$PATH
     - LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH
     - PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH

src/Config.php

@@ -146,7 +146,7 @@ public static function concurrencySet($value)
      *
      * @return string
      */
-    public static function version()
+    public static function version(): string
     {
         return vips_version();
     }

src/Image.php

@@ -537,6 +537,43 @@ class Image extends ImageAutodoc implements \ArrayAccess
         'openexrload' => 'VipsForeignLoadOpenexr'
     ];
 
+    /**
+     * Combine takes an array of blend modes, passed to libvips as an array of
+     * int. Because libvips does now know they should be enums, we have to do
+     * the string->int conversion ourselves. We ought to introspect to find the
+     * mapping, but until we have the machinery for that, we just hardwire the
+     * mapping here.
+     *
+     * @internal
+     */
+    private static $blendModeToInt = [
+        BlendMode::CLEAR => 0,
+        BlendMode::SOURCE => 1,
+        BlendMode::OVER => 2,
+        BlendMode::IN => 3,
+        BlendMode::OUT => 4,
+        BlendMode::ATOP => 5,
+        BlendMode::DEST => 6,
+        BlendMode::DEST_OVER => 7,
+        BlendMode::DEST_IN => 8,
+        BlendMode::DEST_OUT => 9,
+        BlendMode::DEST_ATOP => 10,
+        BlendMode::XOR => 11,
+        BlendMode::ADD => 12,
+        BlendMode::SATURATE => 13,
+        BlendMode::MULTIPLY => 14,
+        BlendMode::SCREEN => 15,
+        BlendMode::OVERLAY => 16,
+        BlendMode::DARKEN => 17,
+        BlendMode::LIGHTEN => 18,
+        BlendMode::COLOUR_DODGE => 19,
+        BlendMode::COLOUR_BURN => 20,
+        BlendMode::HARD_LIGHT => 21,
+        BlendMode::SOFT_LIGHT => 22,
+        BlendMode::DIFFERENCE => 23,
+        BlendMode::EXCLUSION => 24
+    ];
+
     /**
      * The resource for the underlying VipsImage.
      *
@@ -1013,6 +1050,8 @@ public static function newInterpolator(string $name)
      *
      * @param mixed $value The value to set each pixel to.
      *
+     * @throws Exception
+     *
      * @return Image A new Image.
      */
     public function newFromImage($value): Image
@@ -1483,6 +1522,7 @@ public function offsetGet($offset): Image
      * @param Image $value  The band to insert
      *
      * @throws \BadMethodCallException if the offset is not integer or null
+     * @throws Exception
      *
      * @return void
      */
@@ -1528,6 +1568,7 @@ public function offsetSet($offset, $value)
      *
      * @throws \BadMethodCallException if there is only one band left in
      * the image
+     * @throws Exception
      *
      * @return void
      */
@@ -1976,9 +2017,10 @@ public function composite($other, $mode, array $options = []): Image
             $mode = [$mode];
         }
 
-        foreach ($mode as &$x) {
-            $x = BlendMode::TO_INT[$x];
-        }
+        $mode = array_map(function ($x) {
+            // Use BlendMode::OVER if a non-existent value is given.
+            return self::$blendModeToInt[$x] ?? BlendMode::OVER;
+        }, $mode);
 
         return self::call(
             'composite',