From 63c714eb8bcb588e3567477cd6ff6a6d5e101933 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 14 Apr 2020 17:19:09 +0200
Subject: [PATCH 1/2] Travis: fix build and other tweaks

* The build was running on `xenial` which does not have `ant` installed by default, nor has PHP 5.4/5.5 images available.
    Switching to the `trusty` distribution fixes this.
* Support for `sudo: false` has been removed from Travis over a year ago.
* Test against PHP 7.3, 7.4 and PHP `nightly` (= PHP 8), allowing the build against PHP 8 to fail for now.
---
 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c88c4ec..281c504 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: php
 
 php:
@@ -7,8 +8,15 @@ php:
   - 7.0
   - 7.1
   - 7.2
-  
-sudo: false
+  - 7.3
+  - 7.4
+  - "nightly"
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    # Allow failures for unstable builds.
+    - php: "nightly"
 
 cache:
   directories:

From aa52151d2846c9dfeec6972c82b21221a7ad36fc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 14 Apr 2020 17:15:37 +0200
Subject: [PATCH 2/2] Fix build script

The build script was still pointing to an outdated dependency.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index d656ea9..8f2e1d9 100644
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,7 @@
 
         <exec executable="${phpcs}">
             <arg line='--extensions=php' />
-            <arg line='--standard="${basedir}/vendor/jakub-onderka/php-code-style/ruleset.xml"' />
+            <arg line='--standard="${basedir}/vendor/php-parallel-lint/php-code-style/ruleset.xml"' />
             <arg line='--report-checkstyle="${basedir}/build/logs/checkstyle.xml"' />
             <arg line='--report-full' />
             <arg line='"${basedir}/src"' />