merge for 1.0

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to `:vips` will be documented in this file.
 - 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]
 
 ### Deprecated
 - removed `\Enum` from enum names

src/Image.php

@@ -412,6 +412,35 @@
 class Image extends ImageAutodoc implements \ArrayAccess
 {
 
+ /**
+ * The logger instance.
+ *
+ * @var LoggerInterface
+ */
+ private static $logger;
+
+ /**
+ * Sets a logger.
+ *
+ * @param LoggerInterface $logger
+ *
+ * @return void
+ */
+ public static function setLogger(LoggerInterface $logger)
+ {
+ self::$logger = $logger;
+ }
+
+ /**
+ * Gets a logger.
+ *
+ * @return LoggerInterface $logger|null
+ */
+ public static function getLogger()
+ {
+ return self::$logger;
+ }
+
  /**
  * The resource for the underlying VipsImage.
  *
@@ -884,11 +913,6 @@ public static function callBase(
 
  $arguments = array_merge([$name, $instance], $arguments);
 
- /*
- echo "after arg composition, arguments = ";
- var_dump($arguments);
- */
-
  $arguments = self::unwrap($arguments);
  $result = call_user_func_array("vips_call", $arguments);
  self::errorIsArray($result);

src/Main.php

@@ -63,7 +63,11 @@ class Main
  private static $logger;
 
  /**
- * Sets a logger.
+ * Sets a logger. This can be handy for debugging. For example:
+ *
+ * ```php
+ * Vips\Main::setLogger(new Vips\Logger);
+ * ```
  *
  * @param LoggerInterface $logger
  *