From 100b7d115f79f0db8986800bb28bb04287d1e723 Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Thu, 11 Feb 2021 23:40:40 +0100
Subject: [PATCH] Build: Fix version check and composer version

---
 build.xml     | 2 +-
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 203bd6e6..3c78eb99 100644
--- a/build.xml
+++ b/build.xml
@@ -189,6 +189,6 @@
     </target>
 
     <target name="-phar-determine-version">
-        <exec command="php ${project.basedir}/phpdraft --version | grep -ohE '([0-9]{1,}\.)+[0-9]{1,}'" outputproperty="version"/>
+        <exec command="php ${project.basedir}/phpdraft --version | grep -ohE '([0-9]{1,}\.)+[0-9]{1,}-?(rc|beta)?[0-9]?'" outputproperty="version"/>
     </target>
 </project>
diff --git a/composer.json b/composer.json
index 717557bf..10012cf8 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     }
   ],
   "require": {
-    "php": "^7.3",
+    "php": "^7.3||^8.0",
     "ql/uri-template": "~1.0",
     "vanilla/garden-cli": "~3.0",
     "michelf/php-markdown": "~1.9",