remove Enum\ prefix from @method lines

since we have them in the use declaration

Author: jcupitt

examples/generate_phpdoc.rb

@@ -68,12 +68,12 @@ def to_php
         # is there a "Vips" at the front of the type name? remove it and try the
         # enums again
         trim = type.to_s.tap{|s| s.slice!("Vips")}
-        return "Enum\\" + trim if $enums.include?(trim)
+        return trim if $enums.include?(trim)
 
         # is there a "::" at the front of the type name? remove it and try the
         # enums again
         trim.slice! "::"
-        return "Enum\\" + trim if $enums.include?(trim)
+        return trim if $enums.include?(trim)
 
         # no mapping found
         puts "no mapping found for #{type}"

src/ImageAutodoc.php

@@ -86,24 +86,24 @@
  * @link      https://github.com/jcupitt/php-vips
  *
  * @method static void system(string $cmd_format, array $options = []) Run an external command.
- * @method Image relational(Image $right, Enum\OperationRelational $relational, array $options = []) Relational operation on two images.
- * @method Image boolean(Image $right, Enum\OperationBoolean $boolean, array $options = []) Boolean operation on two images.
- * @method Image math2(Image $right, Enum\OperationMath2 $math2, array $options = []) Binary math operations.
- * @method Image complex2(Image $right, Enum\OperationComplex2 $cmplx, array $options = []) Complex binary operations on two images.
+ * @method Image relational(Image $right, OperationRelational $relational, array $options = []) Relational operation on two images.
+ * @method Image boolean(Image $right, OperationBoolean $boolean, array $options = []) Boolean operation on two images.
+ * @method Image math2(Image $right, OperationMath2 $math2, array $options = []) Binary math operations.
+ * @method Image complex2(Image $right, OperationComplex2 $cmplx, array $options = []) Complex binary operations on two images.
  * @method Image complexform(Image $right, array $options = []) Form a complex image from two real images.
  * @method static Image sum(array $in, array $options = []) Sum an array of images.
  * @method Image invert(array $options = []) Invert an image.
  * @method Image linear(array $a, array $b, array $options = []) Calculate (a * in + b).
- * @method Image math(Enum\OperationMath $math, array $options = []) Apply a math operation to an image.
+ * @method Image math(OperationMath $math, array $options = []) Apply a math operation to an image.
  * @method Image abs(array $options = []) Absolute value of an image.
  * @method Image sign(array $options = []) Unit vector of pixel.
- * @method Image round(Enum\OperationRound $round, array $options = []) Perform a round function on an image.
- * @method Image relational_const(array $c, Enum\OperationRelational $relational, array $options = []) Relational operations against a constant.
+ * @method Image round(OperationRound $round, array $options = []) Perform a round function on an image.
+ * @method Image relational_const(array $c, OperationRelational $relational, array $options = []) Relational operations against a constant.
  * @method Image remainder_const(array $c, array $options = []) Remainder after integer division of an image and a constant.
- * @method Image boolean_const(array $c, Enum\OperationBoolean $boolean, array $options = []) Boolean operations against a constant.
- * @method Image math2_const(array $c, Enum\OperationMath2 $math2, array $options = []) Pow( @in, @c ).
- * @method Image complex(Enum\OperationComplex $cmplx, array $options = []) Perform a complex operation on an image.
- * @method Image complexget(Enum\OperationComplexget $get, array $options = []) Get a component from a complex image.
+ * @method Image boolean_const(array $c, OperationBoolean $boolean, array $options = []) Boolean operations against a constant.
+ * @method Image math2_const(array $c, OperationMath2 $math2, array $options = []) Pow( @in, @c ).
+ * @method Image complex(OperationComplex $cmplx, array $options = []) Perform a complex operation on an image.
+ * @method Image complexget(OperationComplexget $get, array $options = []) Get a component from a complex image.
  * @method float avg(array $options = []) Find image average.
  * @method float min(array $options = []) Find image minimum.
  * @method float max(array $options = []) Find image maximum.
@@ -124,17 +124,17 @@
  * @method Image sequential(array $options = []) Check sequential access.
  * @method Image cache(array $options = []) Cache an image.
  * @method Image embed(integer $x, integer $y, integer $width, integer $height, array $options = []) Embed an image in a larger image.
- * @method Image flip(Enum\Direction $direction, array $options = []) Flip an image.
+ * @method Image flip(Direction $direction, array $options = []) Flip an image.
  * @method Image insert(Image $sub, integer $x, integer $y, array $options = []) Insert image @sub into @main at @x, @y.
- * @method Image join(Image $in2, Enum\Direction $direction, array $options = []) Join a pair of images.
+ * @method Image join(Image $in2, Direction $direction, array $options = []) Join a pair of images.
  * @method static Image arrayjoin(array $in, array $options = []) Join an array of images.
  * @method Image extract_band(integer $band, array $options = []) Extract band from an image.
  * @method Image bandjoin_const(array $c, array $options = []) Append a constant band to an image.
  * @method Image bandmean(array $options = []) Band-wise average.
- * @method Image bandbool(Enum\OperationBoolean $boolean, array $options = []) Boolean operation across image bands.
+ * @method Image bandbool(OperationBoolean $boolean, array $options = []) Boolean operation across image bands.
  * @method Image replicate(integer $across, integer $down, array $options = []) Replicate an image.
- * @method Image cast(Enum\BandFormat $format, array $options = []) Cast an image.
- * @method Image rot(Enum\Angle $angle, array $options = []) Rotate an image.
+ * @method Image cast(BandFormat $format, array $options = []) Cast an image.
+ * @method Image rot(Angle $angle, array $options = []) Rotate an image.
  * @method Image rot45(array $options = []) Rotate an image.
  * @method Image autorot(array $options = []) Autorotate image by exif tag.
  * @method Image recomb(Image $m, array $options = []) Linear recombination with matrix.
@@ -238,7 +238,7 @@
  * @method Image affine(array $matrix, array $options = []) Affine transform of an image.
  * @method Image similarity(array $options = []) Similarity transform of an image.
  * @method Image resize(float $scale, array $options = []) Resize an image.
- * @method Image colourspace(Enum\Interpretation $space, array $options = []) Convert to a new colourspace.
+ * @method Image colourspace(Interpretation $space, array $options = []) Convert to a new colourspace.
  * @method Image Lab2XYZ(array $options = []) Transform cielab to xyz.
  * @method Image XYZ2Lab(array $options = []) Transform xyz to lab.
  * @method Image Lab2LCh(array $options = []) Transform lab to lch.
@@ -296,9 +296,9 @@
  * @method Image freqmult(Image $mask, array $options = []) Frequency-domain filtering.
  * @method Image spectrum(array $options = []) Make displayable power spectrum.
  * @method Image phasecor(Image $in2, array $options = []) Calculate phase correlation.
- * @method Image morph(Image $mask, Enum\OperationMorphology $morph, array $options = []) Morphology operation.
+ * @method Image morph(Image $mask, OperationMorphology $morph, array $options = []) Morphology operation.
  * @method Image rank(integer $width, integer $height, integer $index, array $options = []) Rank filter.
- * @method float countlines(Enum\Direction $direction, array $options = []) Count lines in an image.
+ * @method float countlines(Direction $direction, array $options = []) Count lines in an image.
  * @method Image labelregions(array $options = []) Label regions in an image.
  * @method Image draw_rect(array $ink, integer $left, integer $top, integer $width, integer $height, array $options = []) Paint a rectangle on an image.
  * @method Image draw_mask(array $ink, Image $mask, integer $x, integer $y, array $options = []) Draw a mask on an image.
@@ -307,9 +307,9 @@
  * @method Image draw_flood(array $ink, integer $x, integer $y, array $options = []) Flood-fill an area.
  * @method Image draw_image(Image $sub, integer $x, integer $y, array $options = []) Paint an image into another image.
  * @method Image draw_smudge(integer $left, integer $top, integer $width, integer $height, array $options = []) Blur a rectangle on an image.
- * @method Image merge(Image $sec, Enum\Direction $direction, integer $dx, integer $dy, array $options = []) Merge two images.
- * @method Image mosaic(Image $sec, Enum\Direction $direction, integer $xref, integer $yref, integer $xsec, integer $ysec, array $options = []) Mosaic two images.
- * @method Image mosaic1(Image $sec, Enum\Direction $direction, integer $xr1, integer $yr1, integer $xs1, integer $ys1, integer $xr2, integer $yr2, integer $xs2, integer $ys2, array $options = []) First-order mosaic of two images.
+ * @method Image merge(Image $sec, Direction $direction, integer $dx, integer $dy, array $options = []) Merge two images.
+ * @method Image mosaic(Image $sec, Direction $direction, integer $xref, integer $yref, integer $xsec, integer $ysec, array $options = []) Mosaic two images.
+ * @method Image mosaic1(Image $sec, Direction $direction, integer $xr1, integer $yr1, integer $xs1, integer $ys1, integer $xr2, integer $yr2, integer $xs2, integer $ys2, array $options = []) First-order mosaic of two images.
  * @method Image match(Image $sec, integer $xr1, integer $yr1, integer $xs1, integer $ys1, integer $xr2, integer $yr2, integer $xs2, integer $ys2, array $options = []) First-order match of two images.
  * @method Image globalbalance(array $options = []) Global balance an image mosaic.
  * @method Image extract_area(integer $left, integer $top, integer $width, integer $height, array $options = []) Extract an area from an image.