From f3e4770425363b8246dac18e7d61cd802f9811dc Mon Sep 17 00:00:00 2001
From: Chris Hulton <chris@codeclimate.com>
Date: Wed, 10 May 2017 11:23:22 -0400
Subject: [PATCH 1/2] Dockerfile fixes to get image building

---
 Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 458e09b..0595fce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,15 @@ RUN apk --update add \
       php7-openssl \
       php7-pcntl \
       php7-phar \
+      php7-simplexml \
       php7-sockets \
+      php7-tokenizer \
+      php7-xml \
+      php7-xmlwriter \
       curl \
       git && \
     rm /var/cache/apk/* && \
-    ln -s /usr/bin/php7 /usr/bin/php
+    ln -sf /usr/bin/php7 /usr/bin/php
 
 RUN adduser -u 9000 -D app
 

From 4d9097ea2bd4346d5dd27adffaae114cc4ba023f Mon Sep 17 00:00:00 2001
From: Chris Hulton <chris@codeclimate.com>
Date: Wed, 10 May 2017 11:34:44 -0400
Subject: [PATCH 2/2] Fixes exception bubbling for php7

---
 Runner.php | 2 +-
 engine.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Runner.php b/Runner.php
index 9184bec..52c9628 100644
--- a/Runner.php
+++ b/Runner.php
@@ -120,7 +120,7 @@ public function run($files)
             }
 
             return $resultFile;
-        } catch (Exception $e) {
+        } catch (\Throwable $e) {
             error_log("Exception: " . $e->getMessage() . " in " . $e->getFile() . "\n" . $e->getTraceAsString());
             return $e;
         }
diff --git a/engine.php b/engine.php
index 9d2beab..b86b006 100644
--- a/engine.php
+++ b/engine.php
@@ -32,7 +32,7 @@
 $results = $server->get_all_results();
 
 foreach ($results as $result_file) {
-    if (is_a($result_file, "Exception")) {
+    if (is_a($result_file, "Throwable")) {
         exit(1);
     }