From 595b0c5e03b064595e2ac9fddc21d7a18fca1d8d Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 27 Feb 2017 22:22:52 +0000
Subject: [PATCH] Update to use PHP 7.1, and its multiple exception catching

---
 app/Services/TokenService.php | 4 +---
 composer.json                 | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/Services/TokenService.php b/app/Services/TokenService.php
index 1cabd925..d650d12f 100644
--- a/app/Services/TokenService.php
+++ b/app/Services/TokenService.php
@@ -41,9 +41,7 @@ class TokenService
         $signer = new Sha256();
         try {
             $token = (new Parser())->parse((string) $token);
-        } catch (InvalidArgumentException $e) {
-            return;
-        } catch (RuntimeException $e) {
+        } catch (InvalidArgumentException | RuntimeException $e) {
             return;
         }
         if ($token->verify($signer, config('app.key'))) {
diff --git a/composer.json b/composer.json
index 1c4b293a..8eab83ba 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,7 @@
     "license": "CC0-1.0",
     "type": "project",
     "require": {
-        "ext-intl": "*",
-        "php": ">=7.0.0",
+        "php": ">=7.1.0",
         "laravel/framework": "5.4.*",
         "jonnybarnes/indieweb": "dev-master",
         "jonnybarnes/webmentions-parser": "0.4.*",