From 70d38fbe494ce0c70d30fabdf37c1b802c9d1db5 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Tue, 4 Apr 2017 23:16:24 +0100
Subject: [PATCH 01/24] Try apt imagick install instead of pecl.

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fa5c13424..283867358 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 sudo: false
+apt:
+  packages:
+  - php-imagick
 
 language: php
 
@@ -35,7 +38,6 @@ matrix:
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then printf "\n" | pecl install imagick; fi
   - php -m
 
 install:

From b27beee47f2155a5e6d80a1875d7fde1d7c5c5ad Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Tue, 4 Apr 2017 23:24:19 +0100
Subject: [PATCH 02/24] Correct apt/addons syntax.

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 283867358..fd9d9f27f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
 sudo: false
-apt:
-  packages:
-  - php-imagick
 
 language: php
 
+addons:
+  apt:
+    packages:
+    - php-imagick
+
 notifications:
   email:
     on_success: never

From 08d6f4d274fea870f68d75a564aca99b1a08228d Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Tue, 4 Apr 2017 23:42:00 +0100
Subject: [PATCH 03/24] Try php 5.6 version apt php5-imagick.

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd9d9f27f..e7652bf43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,6 @@ sudo: false
 
 language: php
 
-addons:
-  apt:
-    packages:
-    - php-imagick
-
 notifications:
   email:
     on_success: never
@@ -35,6 +30,10 @@ matrix:
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=trunk
+      addons:
+        apt:
+          packages:
+          - php5-imagick
     - php: 5.3
       env: WP_VERSION=latest
 

From ffc4dbc3e523d9147cf944a6e283d54435bf1ed1 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Tue, 4 Apr 2017 23:49:15 +0100
Subject: [PATCH 04/24] Try ppa:ondrej php-imagick.

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e7652bf43..4afcbee68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,10 @@ matrix:
       env: WP_VERSION=trunk
       addons:
         apt:
+		  sources:
+		  - sourceline 'deb http://ppa.launchpad.net/ondrej/php/ubuntu precise main'
           packages:
-          - php5-imagick
+          - php-imagick
     - php: 5.3
       env: WP_VERSION=latest
 

From d78082c8d79db212401cebf29886fd280f1f6eae Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Tue, 4 Apr 2017 23:50:22 +0100
Subject: [PATCH 05/24] Remove tabs.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4afcbee68..a62008c13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,8 @@ matrix:
       env: WP_VERSION=trunk
       addons:
         apt:
-		  sources:
-		  - sourceline 'deb http://ppa.launchpad.net/ondrej/php/ubuntu precise main'
+          sources:
+          - sourceline 'deb http://ppa.launchpad.net/ondrej/php/ubuntu precise main'
           packages:
           - php-imagick
     - php: 5.3

From 7a56008ca6be6544379242b52843645c8dd73dd6 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Wed, 5 Apr 2017 00:26:47 +0100
Subject: [PATCH 06/24] Try explicit PHP 7.0.16.

---
 .travis.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a62008c13..3f883eff3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,23 +24,18 @@ matrix:
   include:
     - php: 7.1
       env: WP_VERSION=latest
-    - php: 7.0
+    - php: 7.0.16
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=trunk
-      addons:
-        apt:
-          sources:
-          - sourceline 'deb http://ppa.launchpad.net/ondrej/php/ubuntu precise main'
-          packages:
-          - php-imagick
     - php: 5.3
       env: WP_VERSION=latest
 
 before_install:
   - phpenv config-rm xdebug.ini
+  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.16' ]]; then printf "\n" | pecl install imagick; fi
   - php -m
 
 install:

From 37107ef552e1fd18d77ccb9ad3f898aff846e54c Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Wed, 5 Apr 2017 00:28:52 +0100
Subject: [PATCH 07/24] Try explicit PHP 7.0.13.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f883eff3..44996232a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
   include:
     - php: 7.1
       env: WP_VERSION=latest
-    - php: 7.0.16
+    - php: 7.0.13
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=latest
@@ -35,7 +35,7 @@ matrix:
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.16' ]]; then printf "\n" | pecl install imagick; fi
+  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.13' ]]; then printf "\n" | pecl install imagick; fi
   - php -m
 
 install:

From a1de9da486dae7968a0d28845a34b04c2b7e9cbb Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Wed, 5 Apr 2017 00:32:13 +0100
Subject: [PATCH 08/24] Try explicit PHP 7.0.14.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44996232a..6b47c0b11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
   include:
     - php: 7.1
       env: WP_VERSION=latest
-    - php: 7.0.13
+    - php: 7.0.14
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=latest
@@ -35,7 +35,7 @@ matrix:
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.13' ]]; then printf "\n" | pecl install imagick; fi
+  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.14' ]]; then printf "\n" | pecl install imagick; fi
   - php -m
 
 install:

From e60783273c8b7a2c0b209712e8ee00cbeebd6d02 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Wed, 5 Apr 2017 00:57:43 +0100
Subject: [PATCH 09/24] Try imagick 3.4.2.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b47c0b11..798de14f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
   include:
     - php: 7.1
       env: WP_VERSION=latest
-    - php: 7.0.14
+    - php: 7.0
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=latest
@@ -35,7 +35,7 @@ matrix:
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.14' ]]; then printf "\n" | pecl install imagick; fi
+  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0' ]]; then printf "\n" | pecl install imagick-3.4.2; fi
   - php -m
 
 install:

From 18b0da3976f8e59542aee720097a16687a9025d6 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Wed, 5 Apr 2017 01:01:26 +0100
Subject: [PATCH 10/24] Try explicit PHP 7.0.15.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 798de14f2..fa6b23217 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
   include:
     - php: 7.1
       env: WP_VERSION=latest
-    - php: 7.0
+    - php: 7.0.15
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=latest
@@ -35,7 +35,7 @@ matrix:
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0' ]]; then printf "\n" | pecl install imagick-3.4.2; fi
+  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.15' ]]; then printf "\n" | pecl install imagick-3.4.2; fi
   - php -m
 
 install:

From 60d31573e485f829fb1c7b9a9fe773bcbb189672 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 08:14:28 +0100
Subject: [PATCH 11/24] Try building against ImageMagick 6.9.

---
 .travis.yml            | 19 +++++++++----------
 bin/install-imagick.sh | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 bin/install-imagick.sh

diff --git a/.travis.yml b/.travis.yml
index fa6b23217..f9a4ed210 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,22 +20,21 @@ env:
     - PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
     - WP_CLI_BIN_DIR="$TRAVIS_BUILD_DIR/vendor/bin"
 
+addons:
+  apt:
+    packages:
+      - libjpeg-dev
+      - libpng-dev
+      - libgif-dev
+
 matrix:
   include:
-    - php: 7.1
-      env: WP_VERSION=latest
-    - php: 7.0.15
-      env: WP_VERSION=latest
-    - php: 5.6
-      env: WP_VERSION=latest
-    - php: 5.6
-      env: WP_VERSION=trunk
-    - php: 5.3
+    - php: 7.0
       env: WP_VERSION=latest
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ $TRAVIS_PHP_VERSION = '5.6' || $TRAVIS_PHP_VERSION = '7.0.15' ]]; then printf "\n" | pecl install imagick-3.4.2; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:2} = '7.' ]]; then ./bin/install_imagick.sh; fi
   - php -m
 
 install:
diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
new file mode 100644
index 000000000..e7c4a4235
--- /dev/null
+++ b/bin/install-imagick.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -ex
+
+IMAGEMAGICK_VERSION='6.9.8-3'
+
+cd /tmp
+
+curl -O https://www.imagemagick.org/download/ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
+tar xvzf ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
+cd ImageMagick-$IMAGEMAGICK_VERSION
+
+./configure --prefix=$HOME/opt
+make
+make install
+
+cd $TRAVIS_BUILD_DIR
+
+ls $HOME/opt
+
+echo "$HOME/opt\n" | pecl install imagick

From 4b5bdf3458f723d3f5b9d783205ae536f7d110d2 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 08:16:04 +0100
Subject: [PATCH 12/24] Try building against ImageMagick 6.9.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f9a4ed210..309cea320 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ matrix:
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ ${TRAVIS_PHP_VERSION:0:2} = '7.' ]]; then ./bin/install_imagick.sh; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:2} = '7.' ]]; then ./bin/install-imagick.sh; fi
   - php -m
 
 install:

From f7d5d0be8065090897c9fdbcc6363eb386b129d8 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 08:18:00 +0100
Subject: [PATCH 13/24] Try building against ImageMagick 6.9.

---
 .travis.yml            | 7 -------
 bin/install-imagick.sh | 0
 2 files changed, 7 deletions(-)
 mode change 100644 => 100755 bin/install-imagick.sh

diff --git a/.travis.yml b/.travis.yml
index 309cea320..3197fdd8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,13 +20,6 @@ env:
     - PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
     - WP_CLI_BIN_DIR="$TRAVIS_BUILD_DIR/vendor/bin"
 
-addons:
-  apt:
-    packages:
-      - libjpeg-dev
-      - libpng-dev
-      - libgif-dev
-
 matrix:
   include:
     - php: 7.0
diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
old mode 100644
new mode 100755

From fb0833dbe2aba0e894881e1da6a3d1a312f87134 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 08:30:46 +0100
Subject: [PATCH 14/24] Try building against ImageMagick 6.9.

---
 bin/install-imagick.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
index e7c4a4235..2190289b2 100755
--- a/bin/install-imagick.sh
+++ b/bin/install-imagick.sh
@@ -2,12 +2,14 @@
 
 set -ex
 
+# Taken from http://stackoverflow.com/a/41138688/664741
+
 IMAGEMAGICK_VERSION='6.9.8-3'
 
 cd /tmp
 
 curl -O https://www.imagemagick.org/download/ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
-tar xvzf ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
+tar xzf ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
 cd ImageMagick-$IMAGEMAGICK_VERSION
 
 ./configure --prefix=$HOME/opt
@@ -18,4 +20,8 @@ cd $TRAVIS_BUILD_DIR
 
 ls $HOME/opt
 
-echo "$HOME/opt\n" | pecl install imagick
+export LD_FLAGS=-L$HOME/opt/lib
+export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib:$HOME/opt/lib
+export CPATH=$CPATH:$HOME/opt/include
+
+echo $HOME/opt | pecl install imagick

From e28df20427a6dacdecb25ade5858c3edceebcc82 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 09:45:35 +0100
Subject: [PATCH 15/24] Try caching imagemagick build.

---
 .travis.yml            |  4 +++-
 bin/install-imagick.sh | 20 ++++++++++++--------
 utils/behat-tags.php   | 19 ++++++++++++++++---
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3197fdd8b..3f7dc2e23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ branches:
 cache:
   - composer
   - $HOME/.composer/cache
+  directories:
+    - $HOME/opt
 
 env:
   global:
@@ -27,7 +29,7 @@ matrix:
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ ${TRAVIS_PHP_VERSION:0:2} = '7.' ]]; then ./bin/install-imagick.sh; fi
+  - if [[ $TRAVIS_PHP_VERSION = '7.0' ]]; then ./bin/install-imagick.sh; fi
   - php -m
 
 install:
diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
index 2190289b2..e94372a99 100755
--- a/bin/install-imagick.sh
+++ b/bin/install-imagick.sh
@@ -6,17 +6,21 @@ set -ex
 
 IMAGEMAGICK_VERSION='6.9.8-3'
 
-cd /tmp
+install_imagemagick() {
+	cd /tmp
 
-curl -O https://www.imagemagick.org/download/ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
-tar xzf ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
-cd ImageMagick-$IMAGEMAGICK_VERSION
+	curl -O https://www.imagemagick.org/download/ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
+	tar xzf ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
+	cd ImageMagick-$IMAGEMAGICK_VERSION
 
-./configure --prefix=$HOME/opt
-make
-make install
+	./configure --prefix=$HOME/opt
+	make
+	make install
 
-cd $TRAVIS_BUILD_DIR
+	cd $TRAVIS_BUILD_DIR
+}
+
+PATH=$HOME/opt/bin:$PATH convert -v | grep $IMAGEMAGICK_VERSION || install_imagemagick
 
 ls $HOME/opt
 
diff --git a/utils/behat-tags.php b/utils/behat-tags.php
index df836b830..fa1e60185 100644
--- a/utils/behat-tags.php
+++ b/utils/behat-tags.php
@@ -17,10 +17,23 @@ function version_tags( $prefix, $current, $operator = '<' ) {
 	if ( ! $current )
 		return array();
 
-	exec( "grep '@{$prefix}-[0-9\.]*' -h -o features/*.feature | uniq", $existing_tags );
-
 	$skip_tags = array();
 
+	if ( 'require-wp' === $prefix ) {
+		if ( 'trunk' === $current ) {
+			// Exclude nothing.
+			return array();
+		}
+		// Exclude cutting-edge.
+		$skip_tags[] = '@require-wp-trunk';
+
+		if ( 'latest' === $current ) {
+			return $skip_tags;
+		}
+	}
+
+	exec( "grep '@{$prefix}-[0-9\.]*' -h -o features/*.feature | sort -u", $existing_tags );
+
 	foreach ( $existing_tags as $tag ) {
 		$compare = str_replace( "@{$prefix}-", '', $tag );
 		if ( version_compare( $current, $compare, $operator ) ) {
@@ -43,7 +56,7 @@ function version_tags( $prefix, $current, $operator = '<' ) {
 # Require PHP extension, eg 'imagick'.
 function extension_tags() {
 	$extension_tags = array();
-	exec( "grep '@require-extension-[A-Za-z_]*' -h -o features/*.feature | uniq", $extension_tags );
+	exec( "grep '@require-extension-[A-Za-z_]*' -h -o features/*.feature | sort -u", $extension_tags );
 
 	$skip_tags = array();
 

From 927a86896c2966ebb90392887fdb177327299964 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 09:47:37 +0100
Subject: [PATCH 16/24] Try caching imagemagick build.

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f7dc2e23..6331fd4a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,7 @@ branches:
 cache:
   - composer
   - $HOME/.composer/cache
-  directories:
-    - $HOME/opt
+  - $HOME/opt
 
 env:
   global:

From 56992269499e75308aa74a035f46c3fbc26a3d0c Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 09:58:50 +0100
Subject: [PATCH 17/24] Try apt php5-imagick.

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6331fd4a0..9233790d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,12 @@ matrix:
   include:
     - php: 7.0
       env: WP_VERSION=latest
+    - php: 5.6
+      env: WP_VERSION=latest
+      addons:
+        apt:
+          packages:
+            - php5-imagick
 
 before_install:
   - phpenv config-rm xdebug.ini

From 701c0e1dc64f694df81fa82cefdc2ea5b90c2181 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 10:30:59 +0100
Subject: [PATCH 18/24] Don't try apt php5-imagick.

---
 .travis.yml            | 11 ++++-------
 bin/install-imagick.sh | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9233790d0..add0ec92a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,9 @@ branches:
 
 cache:
   - composer
-  - $HOME/.composer/cache
-  - $HOME/opt
+  - directories:
+    - $HOME/.composer/cache
+    - $HOME/opt
 
 env:
   global:
@@ -27,14 +28,10 @@ matrix:
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=latest
-      addons:
-        apt:
-          packages:
-            - php5-imagick
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - if [[ $TRAVIS_PHP_VERSION = '7.0' ]]; then ./bin/install-imagick.sh; fi
+  - ./bin/install-imagick.sh
   - php -m
 
 install:
diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
index e94372a99..fa79cd121 100755
--- a/bin/install-imagick.sh
+++ b/bin/install-imagick.sh
@@ -20,12 +20,19 @@ install_imagemagick() {
 	cd $TRAVIS_BUILD_DIR
 }
 
-PATH=$HOME/opt/bin:$PATH convert -v | grep $IMAGEMAGICK_VERSION || install_imagemagick
+if [[ $TRAVIS_PHP_VERSION == '7.0' ]]; then
 
-ls $HOME/opt
+	PATH=$HOME/opt/bin:$PATH convert -v | grep $IMAGEMAGICK_VERSION || install_imagemagick
 
-export LD_FLAGS=-L$HOME/opt/lib
-export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib:$HOME/opt/lib
-export CPATH=$CPATH:$HOME/opt/include
+	ls $HOME/opt
 
-echo $HOME/opt | pecl install imagick
+	export LD_FLAGS=-L$HOME/opt/lib
+	export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib:$HOME/opt/lib
+	export CPATH=$CPATH:$HOME/opt/include
+
+	echo $HOME/opt | pecl install imagick
+
+elif [[ $TRAVIS_PHP_VERSION == 5.6 ]]; then
+
+	echo | pecl install imagick
+fi

From 230e180078dfcf9b825df6c6cabd0d85d48f1497 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 10:42:00 +0100
Subject: [PATCH 19/24] Add back all builds.

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index add0ec92a..6b377bfb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,10 +24,16 @@ env:
 
 matrix:
   include:
+    - php: 7.1
+      env: WP_VERSION=latest
     - php: 7.0
       env: WP_VERSION=latest
     - php: 5.6
       env: WP_VERSION=latest
+    - php: 5.6
+      env: WP_VERSION=trunk
+    - php: 5.3
+      env: WP_VERSION=latest
 
 before_install:
   - phpenv config-rm xdebug.ini

From addf17696c56535e253eb8998d52ef2442af24de Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 10:54:50 +0100
Subject: [PATCH 20/24] Try imagick install for PHP 7.1 as well.

---
 bin/install-imagick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
index fa79cd121..f2b35e6a8 100755
--- a/bin/install-imagick.sh
+++ b/bin/install-imagick.sh
@@ -20,7 +20,7 @@ install_imagemagick() {
 	cd $TRAVIS_BUILD_DIR
 }
 
-if [[ $TRAVIS_PHP_VERSION == '7.0' ]]; then
+if [[ ${TRAVIS_PHP_VERSION:0:2} == '7.' ]]; then
 
 	PATH=$HOME/opt/bin:$PATH convert -v | grep $IMAGEMAGICK_VERSION || install_imagemagick
 

From e1f96bb2a74ae757625f71e1a042100fb771e93e Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 19:44:23 +0100
Subject: [PATCH 21/24] Use separate dirs for PHP 7.x builds.

---
 bin/install-imagick.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
index f2b35e6a8..d3165261d 100755
--- a/bin/install-imagick.sh
+++ b/bin/install-imagick.sh
@@ -13,7 +13,7 @@ install_imagemagick() {
 	tar xzf ImageMagick-$IMAGEMAGICK_VERSION.tar.gz
 	cd ImageMagick-$IMAGEMAGICK_VERSION
 
-	./configure --prefix=$HOME/opt
+	./configure --prefix=$HOME/opt/$TRAVIS_PHP_VERSION
 	make
 	make install
 
@@ -22,15 +22,15 @@ install_imagemagick() {
 
 if [[ ${TRAVIS_PHP_VERSION:0:2} == '7.' ]]; then
 
-	PATH=$HOME/opt/bin:$PATH convert -v | grep $IMAGEMAGICK_VERSION || install_imagemagick
+	PATH=$HOME/opt/$TRAVIS_PHP_VERSION/bin:$PATH convert -v | grep $IMAGEMAGICK_VERSION || install_imagemagick
 
-	ls $HOME/opt
+	ls $HOME/opt/$TRAVIS_PHP_VERSION
 
-	export LD_FLAGS=-L$HOME/opt/lib
-	export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib:$HOME/opt/lib
-	export CPATH=$CPATH:$HOME/opt/include
+	export LD_FLAGS=-L$HOME/opt/$TRAVIS_PHP_VERSION/lib
+	export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib:$HOME/opt/$TRAVIS_PHP_VERSION/lib
+	export CPATH=$CPATH:$HOME/opt/$TRAVIS_PHP_VERSION/include
 
-	echo $HOME/opt | pecl install imagick
+	echo $HOME/opt/$TRAVIS_PHP_VERSION | pecl install imagick
 
 elif [[ $TRAVIS_PHP_VERSION == 5.6 ]]; then
 

From 9b53e643b0df88e6b63c005bcb7ca43038541667 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 19:59:09 +0100
Subject: [PATCH 22/24] Test caching.

---
 bin/install-imagick.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
index d3165261d..aa7ae1f56 100755
--- a/bin/install-imagick.sh
+++ b/bin/install-imagick.sh
@@ -4,6 +4,7 @@ set -ex
 
 # Taken from http://stackoverflow.com/a/41138688/664741
 
+# ImageMagick version to use for PHP 7.x
 IMAGEMAGICK_VERSION='6.9.8-3'
 
 install_imagemagick() {

From 700b6d734faa3dbb894edf368e465c34edd8817d Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 20:04:53 +0100
Subject: [PATCH 23/24] Spec separate dirs in cache.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6b377bfb3..4a4bcb2a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ cache:
   - composer
   - directories:
     - $HOME/.composer/cache
-    - $HOME/opt
+    - $HOME/opt/$TRAVIS_PHP_VERSION
 
 env:
   global:

From bd3df4e4f0302a6ef6af45d4b3653847e1daa6fa Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 8 Apr 2017 20:11:58 +0100
Subject: [PATCH 24/24] Check build agin.

---
 bin/install-imagick.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/install-imagick.sh b/bin/install-imagick.sh
index aa7ae1f56..9022da287 100755
--- a/bin/install-imagick.sh
+++ b/bin/install-imagick.sh
@@ -2,6 +2,7 @@
 
 set -ex
 
+# Install imagick for PHP 5.6, 7.0 and 7.1.
 # Taken from http://stackoverflow.com/a/41138688/664741
 
 # ImageMagick version to use for PHP 7.x