Incorporate review

+ bump Travis libvips to 8.5.8

Author: kleisauke

.travis.yml

@@ -12,7 +12,7 @@ env:
   global:
     - VIPS_VERSION_MAJOR=8
     - VIPS_VERSION_MINOR=5
-    - VIPS_VERSION_MICRO=3
+    - VIPS_VERSION_MICRO=8
     - PATH=$HOME/vips/bin:$PATH
     - LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH
     - PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH

composer.json

@@ -46,7 +46,7 @@
         "test": [
             "parallel-lint . --exclude vendor",
             "phpunit",
-            "phpcs -np --standard=PSR2 --extensions=php --ignore=/vendor/ ."
+            "phpcs --standard=phpcs-ruleset.xml ."
         ]
     }
 }

phpcs-ruleset.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<ruleset name="php-vips">
+    <!-- Set a description for this ruleset -->
+    <description>php-vips coding standard. Inherits from PSR-2.</description>
+
+    <!-- Check all files in this directory and the directories below it -->
+    <file>.</file>
+
+    <!-- Ignore Composer dependencies -->
+    <exclude-pattern>vendor/</exclude-pattern>
+
+    <!-- Display progress -->
+    <arg value="p"/>
+
+    <!-- Only check PHP files -->
+    <arg name="extensions" value="php"/>
+
+    <!-- Include the whole PSR-2 standard -->
+    <rule ref="PSR2"/>
+
+    <!-- Exclude this rule for code examples -->
+    <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
+        <exclude-pattern>examples/</exclude-pattern>
+    </rule>
+
+    <!-- File is generated automatically -->
+    <rule ref="Generic.Files.LineLength">
+        <exclude-pattern>src/ImageAutodoc.php</exclude-pattern>
+    </rule>
+</ruleset>

tests/ShortcutTest.php

@@ -130,8 +130,8 @@ public function testVipsRelational()
         $this->assertEquals($vips, $real);
 
         $real = self::mapNumeric($this->pixel, function ($value) {
-            // FIXME: Left and right operands are identical
-            return $value > $value ? 255 : 0;
+            // $value > $value is always false
+            return 0;
         });
         $vips = $this->image->more($this->image)->getpoint(0, 0);
         $this->assertEquals($vips, $real);