pass PSR2, README updates

README.md

@@ -94,7 +94,7 @@ $image = $image->add([[1, 2, 3], [4, 5, 6]]);
 
 To make a 2 x 3 image from the array, then add that image to the original.
 
-Almost all methods can take an optional final argument, an array of options.
+Almost all methods can take an extra final argument: an array of options.
 For example:
 
 ```
@@ -121,7 +121,7 @@ libvips properties as properties of the PHP `Vips\Image` class.
 ### Test and install
 
 ```
-$ phpcs src
+$ phpcs --standard=PSR2 src
 $ php ~/vips/php/composer.phar install
 $ vendor/bin/phpunit
 $ vendor/bin/phpdoc

examples/generate_phpdoc.rb

@@ -309,7 +309,8 @@ def generate_class(file, gtype)
  file << " * The #{name} enum.\n"
  file << class_header 
  file << " */\n"
- file << "abstract class #{name} {\n"
+ file << "abstract class #{name}\n"
+ file << "{\n"
 
  const.values.each do |value|
  next if value.nick == "last" 

examples/vips_class.php

@@ -9,7 +9,8 @@
 const DATE_FORMAT = "Y-m-d\TH:i:sP";
 
 Vips\Image::setLogger(new class implements Psr\Log\LoggerInterface {
- // Use the LoggerTait so that we only have to implement the generic log method.
+ // Use the LoggerTrait so that we only have to implement the generic 
+ // log method.
  use Psr\Log\LoggerTrait;
 
  /**

src/Enum/Access.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Access {
+abstract class Access
+{
  const RANDOM = 'random';
  const SEQUENTIAL = 'sequential';
  const SEQUENTIAL_UNBUFFERED = 'sequential-unbuffered';

src/Enum/Align.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Align {
+abstract class Align
+{
  const LOW = 'low';
  const CENTRE = 'centre';
  const HIGH = 'high';

src/Enum/Angle.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Angle {
+abstract class Angle
+{
  const D0 = 'd0';
  const D90 = 'd90';
  const D180 = 'd180';

src/Enum/Angle45.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Angle45 {
+abstract class Angle45
+{
  const D0 = 'd0';
  const D45 = 'd45';
  const D90 = 'd90';

src/Enum/BandFormat.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class BandFormat {
+abstract class BandFormat
+{
  const NOTSET = 'notset';
  const UCHAR = 'uchar';
  const CHAR = 'char';

src/Enum/Coding.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Coding {
+abstract class Coding
+{
  const ERROR = 'error';
  const NONE = 'none';
  const LABQ = 'labq';

src/Enum/Combine.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Combine {
+abstract class Combine
+{
  const MAX = 'max';
  const SUM = 'sum';
 }

src/Enum/CombineMode.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class CombineMode {
+abstract class CombineMode
+{
  const SET = 'set';
  const ADD = 'add';
 }

src/Enum/DemandStyle.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class DemandStyle {
+abstract class DemandStyle
+{
  const ERROR = 'error';
  const SMALLTILE = 'smalltile';
  const FATSTRIP = 'fatstrip';

src/Enum/Direction.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Direction {
+abstract class Direction
+{
  const HORIZONTAL = 'horizontal';
  const VERTICAL = 'vertical';
 }

src/Enum/Extend.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Extend {
+abstract class Extend
+{
  const BLACK = 'black';
  const COPY = 'copy';
  const REPEAT = 'repeat';

src/Enum/ForeignDzContainer.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ForeignDzContainer {
+abstract class ForeignDzContainer
+{
  const FS = 'fs';
  const ZIP = 'zip';
 }

src/Enum/ForeignDzDepth.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ForeignDzDepth {
+abstract class ForeignDzDepth
+{
  const ONEPIXEL = 'onepixel';
  const ONETILE = 'onetile';
  const ONE = 'one';

src/Enum/ForeignDzLayout.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ForeignDzLayout {
+abstract class ForeignDzLayout
+{
  const DZ = 'dz';
  const ZOOMIFY = 'zoomify';
  const GOOGLE = 'google';

src/Enum/ForeignTiffCompression.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ForeignTiffCompression {
+abstract class ForeignTiffCompression
+{
  const NONE = 'none';
  const JPEG = 'jpeg';
  const DEFLATE = 'deflate';

src/Enum/ForeignTiffPredictor.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ForeignTiffPredictor {
+abstract class ForeignTiffPredictor
+{
  const NONE = 'none';
  const HORIZONTAL = 'horizontal';
  const FLOAT = 'float';

src/Enum/ForeignTiffResunit.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ForeignTiffResunit {
+abstract class ForeignTiffResunit
+{
  const CM = 'cm';
  const INCH = 'inch';
 }

src/Enum/ForeignWebpPreset.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ForeignWebpPreset {
+abstract class ForeignWebpPreset
+{
  const DEFAULT = 'default';
  const PICTURE = 'picture';
  const PHOTO = 'photo';

src/Enum/ImageType.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class ImageType {
+abstract class ImageType
+{
  const ERROR = 'error';
  const NONE = 'none';
  const SETBUF = 'setbuf';

src/Enum/Intent.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Intent {
+abstract class Intent
+{
  const PERCEPTUAL = 'perceptual';
  const RELATIVE = 'relative';
  const SATURATION = 'saturation';

src/Enum/Interpretation.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Interpretation {
+abstract class Interpretation
+{
  const ERROR = 'error';
  const MULTIBAND = 'multiband';
  const B_W = 'b-w';

src/Enum/Kernel.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Kernel {
+abstract class Kernel
+{
  const NEAREST = 'nearest';
  const LINEAR = 'linear';
  const CUBIC = 'cubic';

src/Enum/OperationBoolean.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationBoolean {
+abstract class OperationBoolean
+{
  const AND = 'and';
  const OR = 'or';
  const EOR = 'eor';

src/Enum/OperationComplex.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationComplex {
+abstract class OperationComplex
+{
  const POLAR = 'polar';
  const RECT = 'rect';
  const CONJ = 'conj';

src/Enum/OperationComplex2.php

@@ -49,6 +49,7 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationComplex2 {
+abstract class OperationComplex2
+{
  const CROSS_PHASE = 'cross-phase';
 }

src/Enum/OperationComplexget.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationComplexget {
+abstract class OperationComplexget
+{
  const REAL = 'real';
  const IMAG = 'imag';
 }

src/Enum/OperationMath.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationMath {
+abstract class OperationMath
+{
  const SIN = 'sin';
  const COS = 'cos';
  const TAN = 'tan';

src/Enum/OperationMath2.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationMath2 {
+abstract class OperationMath2
+{
  const POW = 'pow';
  const WOP = 'wop';
 }

src/Enum/OperationMorphology.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationMorphology {
+abstract class OperationMorphology
+{
  const ERODE = 'erode';
  const DILATE = 'dilate';
 }

src/Enum/OperationRelational.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationRelational {
+abstract class OperationRelational
+{
  const EQUAL = 'equal';
  const NOTEQ = 'noteq';
  const LESS = 'less';

src/Enum/OperationRound.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class OperationRound {
+abstract class OperationRound
+{
  const RINT = 'rint';
  const CEIL = 'ceil';
  const FLOOR = 'floor';

src/Enum/PCS.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class PCS {
+abstract class PCS
+{
  const LAB = 'lab';
  const XYZ = 'xyz';
 }

src/Enum/Precision.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Precision {
+abstract class Precision
+{
  const INTEGER = 'integer';
  const FLOAT = 'float';
  const APPROXIMATE = 'approximate';

src/Enum/Saveable.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Saveable {
+abstract class Saveable
+{
  const MONO = 'mono';
  const RGB = 'rgb';
  const RGBA = 'rgba';

src/Enum/Token.php

@@ -49,7 +49,8 @@
  * @version Release:0.1.2
  * @link https://github.com/jcupitt/php-vips
  */
-abstract class Token {
+abstract class Token
+{
  const LEFT = 'left';
  const RIGHT = 'right';
  const STRING = 'string';