fix some formatting

jcupitt · jcupitt · commit f2c3bf3b09cf · 2016-10-19T13:58:27.000+01:00
- four space indent everywhere
- no trailing ?&gt; anywhere
diff --git a/examples/generate_phpdoc.rb b/examples/generate_phpdoc.rb
@@ -283,8 +283,6 @@ def generate_class(file, gtype)
 abstract class ImageAutodoc
 {
 }
-
-?>
 EOF
 end
 
@@ -311,7 +309,6 @@ def generate_class(file, gtype)
         end
 
         file << "}\n"
-        file << "?>\n"
     end
 end
 
diff --git a/src/Enum/Access.php b/src/Enum/Access.php
@@ -54,4 +54,3 @@ abstract class Access {
     const SEQUENTIAL = 'sequential';
     const SEQUENTIAL_UNBUFFERED = 'sequential-unbuffered';
 }
-?>
diff --git a/src/Enum/Align.php b/src/Enum/Align.php
@@ -54,4 +54,3 @@ abstract class Align {
     const CENTRE = 'centre';
     const HIGH = 'high';
 }
-?>
diff --git a/src/Enum/Angle.php b/src/Enum/Angle.php
@@ -55,4 +55,3 @@ abstract class Angle {
     const D180 = 'd180';
     const D270 = 'd270';
 }
-?>
diff --git a/src/Enum/Angle45.php b/src/Enum/Angle45.php
@@ -59,4 +59,3 @@ abstract class Angle45 {
     const D270 = 'd270';
     const D315 = 'd315';
 }
-?>
diff --git a/src/Enum/BandFormat.php b/src/Enum/BandFormat.php
@@ -62,4 +62,3 @@ abstract class BandFormat {
     const DOUBLE = 'double';
     const DPCOMPLEX = 'dpcomplex';
 }
-?>
diff --git a/src/Enum/Coding.php b/src/Enum/Coding.php
@@ -55,4 +55,3 @@ abstract class Coding {
     const LABQ = 'labq';
     const RAD = 'rad';
 }
-?>
diff --git a/src/Enum/Combine.php b/src/Enum/Combine.php
@@ -53,4 +53,3 @@ abstract class Combine {
     const MAX = 'max';
     const SUM = 'sum';
 }
-?>
diff --git a/src/Enum/CombineMode.php b/src/Enum/CombineMode.php
@@ -53,4 +53,3 @@ abstract class CombineMode {
     const SET = 'set';
     const ADD = 'add';
 }
-?>
diff --git a/src/Enum/DemandStyle.php b/src/Enum/DemandStyle.php
@@ -56,4 +56,3 @@ abstract class DemandStyle {
     const THINSTRIP = 'thinstrip';
     const ANY = 'any';
 }
-?>
diff --git a/src/Enum/Direction.php b/src/Enum/Direction.php
@@ -53,4 +53,3 @@ abstract class Direction {
     const HORIZONTAL = 'horizontal';
     const VERTICAL = 'vertical';
 }
-?>
diff --git a/src/Enum/Extend.php b/src/Enum/Extend.php
@@ -57,4 +57,3 @@ abstract class Extend {
     const WHITE = 'white';
     const BACKGROUND = 'background';
 }
-?>
diff --git a/src/Enum/ForeignDzContainer.php b/src/Enum/ForeignDzContainer.php
@@ -53,4 +53,3 @@ abstract class ForeignDzContainer {
     const FS = 'fs';
     const ZIP = 'zip';
 }
-?>
diff --git a/src/Enum/ForeignDzDepth.php b/src/Enum/ForeignDzDepth.php
@@ -54,4 +54,3 @@ abstract class ForeignDzDepth {
     const ONETILE = 'onetile';
     const ONE = 'one';
 }
-?>
diff --git a/src/Enum/ForeignDzLayout.php b/src/Enum/ForeignDzLayout.php
@@ -54,4 +54,3 @@ abstract class ForeignDzLayout {
     const ZOOMIFY = 'zoomify';
     const GOOGLE = 'google';
 }
-?>
diff --git a/src/Enum/ForeignTiffCompression.php b/src/Enum/ForeignTiffCompression.php
@@ -57,4 +57,3 @@ abstract class ForeignTiffCompression {
     const CCITTFAX4 = 'ccittfax4';
     const LZW = 'lzw';
 }
-?>
diff --git a/src/Enum/ForeignTiffPredictor.php b/src/Enum/ForeignTiffPredictor.php
@@ -54,4 +54,3 @@ abstract class ForeignTiffPredictor {
     const HORIZONTAL = 'horizontal';
     const FLOAT = 'float';
 }
-?>
diff --git a/src/Enum/ForeignTiffResunit.php b/src/Enum/ForeignTiffResunit.php
@@ -53,4 +53,3 @@ abstract class ForeignTiffResunit {
     const CM = 'cm';
     const INCH = 'inch';
 }
-?>
diff --git a/src/Enum/ForeignWebpPreset.php b/src/Enum/ForeignWebpPreset.php
@@ -57,4 +57,3 @@ abstract class ForeignWebpPreset {
     const ICON = 'icon';
     const TEXT = 'text';
 }
-?>
diff --git a/src/Enum/ImageType.php b/src/Enum/ImageType.php
@@ -60,4 +60,3 @@ abstract class ImageType {
     const OPENOUT = 'openout';
     const PARTIAL = 'partial';
 }
-?>
diff --git a/src/Enum/Intent.php b/src/Enum/Intent.php
@@ -55,4 +55,3 @@ abstract class Intent {
     const SATURATION = 'saturation';
     const ABSOLUTE = 'absolute';
 }
-?>
diff --git a/src/Enum/Interpretation.php b/src/Enum/Interpretation.php
@@ -71,4 +71,3 @@ abstract class Interpretation {
     const SCRGB = 'scrgb';
     const HSV = 'hsv';
 }
-?>
diff --git a/src/Enum/Kernel.php b/src/Enum/Kernel.php
@@ -56,4 +56,3 @@ abstract class Kernel {
     const LANCZOS2 = 'lanczos2';
     const LANCZOS3 = 'lanczos3';
 }
-?>
diff --git a/src/Enum/OperationBoolean.php b/src/Enum/OperationBoolean.php
@@ -56,4 +56,3 @@ abstract class OperationBoolean {
     const LSHIFT = 'lshift';
     const RSHIFT = 'rshift';
 }
-?>
diff --git a/src/Enum/OperationComplex.php b/src/Enum/OperationComplex.php
@@ -54,4 +54,3 @@ abstract class OperationComplex {
     const RECT = 'rect';
     const CONJ = 'conj';
 }
-?>
diff --git a/src/Enum/OperationComplex2.php b/src/Enum/OperationComplex2.php
@@ -52,4 +52,3 @@
 abstract class OperationComplex2 {
     const CROSS_PHASE = 'cross-phase';
 }
-?>
diff --git a/src/Enum/OperationComplexget.php b/src/Enum/OperationComplexget.php
@@ -53,4 +53,3 @@ abstract class OperationComplexget {
     const REAL = 'real';
     const IMAG = 'imag';
 }
-?>
diff --git a/src/Enum/OperationMath.php b/src/Enum/OperationMath.php
@@ -61,4 +61,3 @@ abstract class OperationMath {
     const EXP = 'exp';
     const EXP10 = 'exp10';
 }
-?>
diff --git a/src/Enum/OperationMath2.php b/src/Enum/OperationMath2.php
@@ -53,4 +53,3 @@ abstract class OperationMath2 {
     const POW = 'pow';
     const WOP = 'wop';
 }
-?>
diff --git a/src/Enum/OperationMorphology.php b/src/Enum/OperationMorphology.php
@@ -53,4 +53,3 @@ abstract class OperationMorphology {
     const ERODE = 'erode';
     const DILATE = 'dilate';
 }
-?>
diff --git a/src/Enum/OperationRelational.php b/src/Enum/OperationRelational.php
@@ -57,4 +57,3 @@ abstract class OperationRelational {
     const MORE = 'more';
     const MOREEQ = 'moreeq';
 }
-?>
diff --git a/src/Enum/OperationRound.php b/src/Enum/OperationRound.php
@@ -54,4 +54,3 @@ abstract class OperationRound {
     const CEIL = 'ceil';
     const FLOOR = 'floor';
 }
-?>
diff --git a/src/Enum/PCS.php b/src/Enum/PCS.php
@@ -53,4 +53,3 @@ abstract class PCS {
     const LAB = 'lab';
     const XYZ = 'xyz';
 }
-?>
diff --git a/src/Enum/Precision.php b/src/Enum/Precision.php
@@ -54,4 +54,3 @@ abstract class Precision {
     const FLOAT = 'float';
     const APPROXIMATE = 'approximate';
 }
-?>
diff --git a/src/Enum/Saveable.php b/src/Enum/Saveable.php
@@ -57,4 +57,3 @@ abstract class Saveable {
     const RGB_CMYK = 'rgb-cmyk';
     const ANY = 'any';
 }
-?>
diff --git a/src/Enum/Token.php b/src/Enum/Token.php
@@ -56,4 +56,3 @@ abstract class Token {
     const EQUALS = 'equals';
     const COMMA = 'comma';
 }
-?>
diff --git a/src/Exception.php b/src/Exception.php
@@ -63,5 +63,3 @@ class Exception extends \Exception
  * vim600: expandtab sw=4 ts=4 fdm=marker
  * vim<600: expandtab sw=4 ts=4
  */
-
-?>
diff --git a/src/Image.php b/src/Image.php
@@ -1805,5 +1805,3 @@ public function rot270(): Image
  * vim600: expandtab sw=4 ts=4 fdm=marker
  * vim<600: expandtab sw=4 ts=4
  */
-
-?>
diff --git a/src/ImageAutodoc.php b/src/ImageAutodoc.php
@@ -109,7 +109,7 @@
  * @method Image remainder_const(array(float)|float $c, array $options = []) Remainder after integer division of an image and a constant.
  * @method Image boolean_const(array(float)|float $c, string $boolean, array $options = []) Boolean operations against a constant.
  *     @see OperationBoolean for possible values for $boolean
- * @method Image math2_const(array(float)|float $c, string $math2, array $options = []) Pow( @in, @c ).
+ * @method Image math2_const(array(float)|float $c, string $math2, array $options = []) Binary math operations with a constant.
  *     @see OperationMath2 for possible values for $math2
  * @method Image complex(string $cmplx, array $options = []) Perform a complex operation on an image.
  *     @see OperationComplex for possible values for $cmplx
@@ -231,7 +231,8 @@
  * @method void ppmsave(string $filename, array $options = []) Save image to ppm file.
  * @method void radsave(string $filename, array $options = []) Save image to radiance file.
  * @method string radsave_buffer(array $options = []) Save image to radiance buffer.
- * @method void dzsave(string $filename, array $options = []) Save image to deep zoom format.
+ * @method void dzsave(string $filename, array $options = []) Save image to deepzoom file.
+ * @method string dzsave_buffer(array $options = []) Save image to dz buffer.
  * @method void pngsave(string $filename, array $options = []) Save image to png file.
  * @method string pngsave_buffer(array $options = []) Save image to png buffer.
  * @method void jpegsave(string $filename, array $options = []) Save image to jpeg file.
@@ -240,6 +241,7 @@
  * @method void webpsave(string $filename, array $options = []) Save image to webp file.
  * @method string webpsave_buffer(array $options = []) Save image to webp buffer.
  * @method void tiffsave(string $filename, array $options = []) Save image to tiff file.
+ * @method string tiffsave_buffer(array $options = []) Save image to tiff buffer.
  * @method void fitssave(string $filename, array $options = []) Save image to fits file.
  * @method Image mapim(Image $index, array $options = []) Resample with an mapim image.
  * @method Image shrink(float $hshrink, float $vshrink, array $options = []) Shrink an image.
@@ -361,5 +363,3 @@
 abstract class ImageAutodoc
 {
 }
-
-?>
diff --git a/src/Main.php b/src/Main.php
@@ -116,5 +116,3 @@ public static function concurrencySet($value)
  * vim600: expandtab sw=4 ts=4 fdm=marker
  * vim<600: expandtab sw=4 ts=4
  */
-
-?>
diff --git a/tests/call.php b/tests/call.php
@@ -47,3 +47,12 @@ public function testVipsDraw()
     }
 
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: expandtab sw=4 ts=4 fdm=marker
+ * vim<600: expandtab sw=4 ts=4
+ */
diff --git a/tests/convenience.php b/tests/convenience.php
@@ -140,3 +140,12 @@ public function testVipsMedian()
     }
 
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: expandtab sw=4 ts=4 fdm=marker
+ * vim<600: expandtab sw=4 ts=4
+ */
diff --git a/tests/meta.php b/tests/meta.php
@@ -5,63 +5,72 @@
 class VipsMetaTest extends PHPUnit_Framework_TestCase 
 {
 
-  public function testVipsSetGet()
-  {
-    $filename = dirname(__FILE__) . "/images/img_0076.jpg";
-    $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
+    public function testVipsSetGet()
+    {
+        $filename = dirname(__FILE__) . "/images/img_0076.jpg";
+        $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
 
-    $image->poop = "banana";
-    $value = $image->poop;
+        $image->poop = "banana";
+        $value = $image->poop;
 
-    $this->assertEquals($value, "banana");
-  }
+        $this->assertEquals($value, "banana");
+    }
 
-  public function testVipsGetExifData()
-  {
-    $filename = dirname(__FILE__) . "/images/img_0076.jpg";
-    $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
+    public function testVipsGetExifData()
+    {
+        $filename = dirname(__FILE__) . "/images/img_0076.jpg";
+        $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
 
-    $name = "exif-data";
-    $exif = $image->$name;
+        $name = "exif-data";
+        $exif = $image->$name;
 
-    # 9724 bytes of exif attached ... this should work even without libexif
-    $this->assertEquals(strlen($exif), 9724);
-  }
+        # 9724 bytes of exif attached ... this should work even without libexif
+        $this->assertEquals(strlen($exif), 9724);
+    }
 
-  public function testVipsGetThumbnail()
-  {
-    $filename = dirname(__FILE__) . "/images/img_0076.jpg";
-    $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
+    public function testVipsGetThumbnail()
+    {
+        $filename = dirname(__FILE__) . "/images/img_0076.jpg";
+        $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
 
-    $thumbnail_data = $image->get("jpeg-thumbnail-data");
-    $thumb = Vips\Image::newFromBuffer($thumbnail_data);
+        $thumbnail_data = $image->get("jpeg-thumbnail-data");
+        $thumb = Vips\Image::newFromBuffer($thumbnail_data);
 
-    $this->assertEquals($thumb->width, 160);
-  }
+        $this->assertEquals($thumb->width, 160);
+    }
 
-  public function testVipsGetTypeof()
-  {
-    $filename = dirname(__FILE__) . "/images/img_0076.jpg";
-    $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
+    public function testVipsGetTypeof()
+    {
+        $filename = dirname(__FILE__) . "/images/img_0076.jpg";
+        $image = Vips\Image::newFromFile($filename, ["shrink" => 2]);
 
-    $gint = $image->typeof("width");
+        $gint = $image->typeof("width");
 
-    // should always be the same, I think
-    $this->assertEquals($gint, 24);
-  }
+        // should always be the same, I think
+        $this->assertEquals($gint, 24);
+    }
 
-  public function testVipsRemove()
-  {
-    $filename = dirname(__FILE__) . "/images/img_0076.jpg";
-    $image = Vips\Image::newFromFile($filename);
+    public function testVipsRemove()
+    {
+        $filename = dirname(__FILE__) . "/images/img_0076.jpg";
+        $image = Vips\Image::newFromFile($filename);
 
-    $exif = $image->get("exif-data");
-    $this->assertEquals(strlen($exif), 9724);
+        $exif = $image->get("exif-data");
+        $this->assertEquals(strlen($exif), 9724);
 
-    $image->remove("exif-data");
+        $image->remove("exif-data");
 
-    $this->expectException(Vips\Exception::class);
-    $exif = $image->get("exif-data");
-  }
+        $this->expectException(Vips\Exception::class);
+        $exif = $image->get("exif-data");
+    }
 
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: expandtab sw=4 ts=4 fdm=marker
+ * vim<600: expandtab sw=4 ts=4
+ */
diff --git a/tests/new.php b/tests/new.php
diff --git a/tests/shortcuts.php b/tests/shortcuts.php
diff --git a/tests/write.php b/tests/write.php

Original file line number	Diff line number	Diff line change
`@@ -283,8 +283,6 @@ def generate_class(file, gtype)`
`283`	`283`	`abstract class ImageAutodoc`
`284`	`284`	`{`
`285`	`285`	`}`
`286`		`-`
`287`		`-?>`
`288`	`286`	`EOF`
`289`	`287`	`end`
`290`	`288`
`@@ -311,7 +309,6 @@ def generate_class(file, gtype)`
`311`	`309`	`end`
`312`	`310`
`313`	`311`	`file << "}\n"`
`314`		`- file << "?>\n"`
`315`	`312`	`end`
`316`	`313`	`end`
`317`	`314`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,3 @@ abstract class Access {`
`54`	`54`	`const SEQUENTIAL = 'sequential';`
`55`	`55`	`const SEQUENTIAL_UNBUFFERED = 'sequential-unbuffered';`
`56`	`56`	`}`
`57`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,3 @@ abstract class Align {`
`54`	`54`	`const CENTRE = 'centre';`
`55`	`55`	`const HIGH = 'high';`
`56`	`56`	`}`
`57`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,3 @@ abstract class Angle {`
`55`	`55`	`const D180 = 'd180';`
`56`	`56`	`const D270 = 'd270';`
`57`	`57`	`}`
`58`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,3 @@ abstract class Angle45 {`
`59`	`59`	`const D270 = 'd270';`
`60`	`60`	`const D315 = 'd315';`
`61`	`61`	`}`
`62`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,3 @@ abstract class BandFormat {`
`62`	`62`	`const DOUBLE = 'double';`
`63`	`63`	`const DPCOMPLEX = 'dpcomplex';`
`64`	`64`	`}`
`65`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,3 @@ abstract class Coding {`
`55`	`55`	`const LABQ = 'labq';`
`56`	`56`	`const RAD = 'rad';`
`57`	`57`	`}`
`58`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,3 @@ abstract class Combine {`
`53`	`53`	`const MAX = 'max';`
`54`	`54`	`const SUM = 'sum';`
`55`	`55`	`}`
`56`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,3 @@ abstract class DemandStyle {`
`56`	`56`	`const THINSTRIP = 'thinstrip';`
`57`	`57`	`const ANY = 'any';`
`58`	`58`	`}`
`59`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,3 @@ abstract class Direction {`
`53`	`53`	`const HORIZONTAL = 'horizontal';`
`54`	`54`	`const VERTICAL = 'vertical';`
`55`	`55`	`}`
`56`		`-?>`