merge for 1.0

.gitignore

@@ -1,3 +1,3 @@
 /vendor
+/docs
 *.swp
-docs

CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
 All notable changes to `:vips` will be documented in this file.
 
+## 1.0.0 - 2016-11-03
+
+### Added
+- logging with PSR-3 Logger Interface [Kleis Auke Wolthuizen]
+- switch to PSR2 formatting [Kleis Auke Wolthuizen]
+- add sig.php example [John Cupitt]
+- add Vips\Image::debugLogger() sample logger [John Cupitt]
+- added Vips\Config and Vips\Utils 
+
+### Deprecated
+- removed `\Enum` from enum names
+
+### Fixed
+- Nothing
+
+### Remove
+- Nothing
+
+### Security
+- Nothing
+
 ## 0.1.2 - 2016-10-02
 
 ### Added

README.md

@@ -1,17 +1,18 @@
 # High-level PHP binding for libvips 
 
-A high-level interface to the libvips image processing library. This
-module builds upon the `vips` extension, see:
-
-https://github.com/jcupitt/php-vips-ext
-
-You'll need to install that first. It's tested on Linux, OS X should work,
-Windows would need some work, but should be possible. 
+`php-vips` is a binding for [libvips](https://github.com/jcupitt/libvips), in
+line with [ruby-vips](https://github.com/jcupitt/ruby-vips),
+[pyvips](https://github.com/jcupitt/libvips/tree/master/python), the [libvips
+C++ API](https://github.com/jcupitt/libvips/tree/master/cplusplus) and the
+[libvips C API](https://github.com/jcupitt/libvips/tree/master/libvips). 
+It aims to be small and simple, and to provide a stable, well-documented
+platform that conforms to [PHP standards
+recommendations](http://www.php-fig.org/psr/).
 
 libvips is fast and it can work without needing to have the 
 entire image loaded into memory. Programs that use libvips don't
 manipulate images directly, instead they create pipelines of image processing
-operations starting from a source image. When the end of the pipe is connected
+operations starting from a source image. When the pipe is connected
 to a destination, the whole pipeline executes at once, streaming the image
 in parallel from source to destination in a set of small fragments. 
 
@@ -24,11 +25,27 @@ There's a handy blog post explaining [how libvips opens
 files](http://libvips.blogspot.co.uk/2012/06/how-libvips-opens-file.html)
 which gives some more background.
 
+Extra functionality, such as an image thumbnailer, for example, is 
+implemented in repositories which build on this one, and not incorporated
+directly in this code (though see `examples/`).
+As much of the binding as possible is auto-generated. This reduces
+maintenance effort, increases reliability, and makes it possible to
+reuse core libvips documentation.
+
+This
+module builds upon the `vips` binary extension, see:
+
+https://github.com/jcupitt/php-vips-ext
+
+You'll need to install that first. It's tested on Linux; OS X should work;
+Windows would need some work, but should be possible. 
+
 ### Example
 
 ```php
 #!/usr/bin/env php
 <?php
+require __DIR__ . '/vendor/autoload.php';
 use Jcupitt\Vips;
 
 $image = Vips\Image::newFromFile($argv[1]);
@@ -94,7 +111,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,8 +138,8 @@ libvips properties as properties of the PHP `Vips\Image` class.
 ### Test and install
 
 ```
-$ phpcs src
-$ php ~/vips/php/composer.phar install
+$ phpcs --standard=PSR2 src
+$ php ~/packages/php/composer.phar install
 $ vendor/bin/phpunit
 $ vendor/bin/phpdoc
 ```

composer.json

@@ -17,12 +17,14 @@
  }
  ],
  "require": {
- "php" : ">=7.0.11",
-"ext-vips" : ">=0.1.1"
+ "php": ">=7.0.11",
+ "ext-vips": ">=0.1.1",
+ "psr/log": "^1.0.1"
  },
  "require-dev": {
- "phpunit/phpunit": "~5.0",
- "phpdocumentor/phpdocumentor" : "2.*"
+ "phpunit/phpunit": "^5.5",
+ "phpdocumentor/phpdocumentor" : "2.*",
+ "jakub-onderka/php-parallel-lint": "^0.9"
  },
  "autoload": {
  "psr-4": {
@@ -34,9 +36,18 @@
  "Jcupitt\\Vips\\Test\\": "tests"
  }
  },
+ "provide": {
+ "psr/log-implementation": "1.0.0"
+ },
  "extra": {
  "branch-alias": {
  "dev-master": "1.0-dev"
  }
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor",
+ "phpunit"
+ ]
  }
 }

examples/vips_addconst.php → examples/addconst.php

@@ -1,11 +1,9 @@
 #!/usr/bin/env php
-<?php 
+<?php
 
-include '../src/Image.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use Jcupitt\Vips;
 
 $image = Vips\Image::newFromArray([[1, 2, 3], [4, 5, 6]]);
 $image = $image->linear(1, 1);
-
-?>