add @throws declarations

try the simplest way of doing it fist

also, regenerated docs for 8.6

see #62

Author: jcupitt

examples/generate_phpdoc.rb

@@ -12,12 +12,14 @@
 #   ../examples/generate_phpdoc.rb 
 
 # this needs version 1.x of ruby-vips
+#
+#   gem install ruby-vips -v 1.0.6
 
 # gobject-introspection 3.0.7 crashes a lot if it GCs while doing 
 # something
 GC.disable
 
-Vips::init
+Vips::init("")
 
 # these have hand-written methods, don't autodoc them
 $no_generate = %w( 
@@ -208,6 +210,8 @@ def generate_operation(file, op)
         end
         file << " *     ];\n"
     end
+
+    file << " *     @throws Exception\n"
 end
 
 def generate_class(file, gtype)

src/BlendMode.php

@@ -56,10 +56,10 @@ abstract class BlendMode
     const OUT = 'out';
     const ATOP = 'atop';
     const DEST = 'dest';
-    const DEST_OVER = 'dest_over';
-    const DEST_IN = 'dest_in';
-    const DEST_OUT = 'dest_out';
-    const DEST_ATOP = 'dest_atop';
+    const DEST_OVER = 'dest-over';
+    const DEST_IN = 'dest-in';
+    const DEST_OUT = 'dest-out';
+    const DEST_ATOP = 'dest-atop';
     const XOR = 'xor';
     const ADD = 'add';
     const SATURATE = 'saturate';
@@ -68,44 +68,10 @@ abstract class BlendMode
     const OVERLAY = 'overlay';
     const DARKEN = 'darken';
     const LIGHTEN = 'lighten';
-    const COLOUR_DOFGE = 'colour_dodge';
-    const COLOUR_BURN = 'colour_burn';
-    const HARD_LIGHT = 'hard_light';
-    const SOFT_LIGHT = 'soft_light';
+    const COLOUR_DODGE = 'colour-dodge';
+    const COLOUR_BURN = 'colour-burn';
+    const HARD_LIGHT = 'hard-light';
+    const SOFT_LIGHT = 'soft-light';
     const DIFFERENCE = 'difference';
     const EXCLUSION = 'exclusion';
-
-    /* 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.
-     */
-    const TO_INT = [
-        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_DOFGE => 19,
-        BlendMode::COLOUR_BURN => 20,
-        BlendMode::HARD_LIGHT => 21,
-        BlendMode::SOFT_LIGHT => 22,
-        BlendMode::DIFFERENCE => 23,
-        BlendMode::EXCLUSION => 24
-    ];
 }

src/Combine.php

@@ -51,4 +51,5 @@ abstract class Combine
 {
     const MAX = 'max';
     const SUM = 'sum';
+    const MIN = 'min';
 }

src/CompassDirection.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file was generated automatically. Do not edit!
+ *
+ * PHP version 7
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2016 John Cupitt
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @category  Images
+ * @package   Jcupitt\Vips
+ * @author    John Cupitt <jcupitt@gmail.com>
+ * @copyright 2016 John Cupitt
+ * @license   https://opensource.org/licenses/MIT MIT
+ * @link      https://github.com/jcupitt/php-vips
+ */
+
+namespace Jcupitt\Vips;
+
+/**
+ * The CompassDirection enum.
+ * @category  Images
+ * @package   Jcupitt\Vips
+ * @author    John Cupitt <jcupitt@gmail.com>
+ * @copyright 2016 John Cupitt
+ * @license   https://opensource.org/licenses/MIT MIT
+ * @link      https://github.com/jcupitt/php-vips
+ */
+abstract class CompassDirection
+{
+    const CENTRE = 'centre';
+    const NORTH = 'north';
+    const EAST = 'east';
+    const SOUTH = 'south';
+    const WEST = 'west';
+    const NORTH_EAST = 'north-east';
+    const SOUTH_EAST = 'south-east';
+    const SOUTH_WEST = 'south-west';
+    const NORTH_WEST = 'north-west';
+}