From 8c404644b05747810cf391e0bb8bf4386d252d3e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 4 Feb 2021 20:01:20 +1100
Subject: [PATCH] Fixes for tests

---
 .github/workflows/phpunit.yml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 7fb967fce0a7..701f419a249a 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,11 +1,11 @@
-on: 
+on:
   push:
     branches:
       - v5-develop
   pull_request:
-    branches: 
+    branches:
       - v5-develop
-      
+
 name: phpunit
 jobs:
   run:
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         operating-system: ['ubuntu-18.04', 'ubuntu-20.04']
-        php-versions: ['7.3', '7.4']
+        php-versions: ['7.4']
         phpunit-versions: ['latest']
 
     env:
@@ -24,7 +24,7 @@ jobs:
       DB_DATABASE: ninja
       DB_USERNAME: root
       DB_PASSWORD: ninja
-      DB_HOST: '127.0.0.1'  
+      DB_HOST: '127.0.0.1'
       BROADCAST_DRIVER: log
       CACHE_DRIVER: file
       QUEUE_CONNECTION: sync
@@ -47,13 +47,13 @@ jobs:
           MYSQL_DATABASE: ninja
           MYSQL_ROOT_PASSWORD: ninja
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-        
+
     steps:
     - name: Start mysql service
       run: |
         sudo /etc/init.d/mysql start
-    
-    - name: Sleep for 30 seconds //allows time for MySQL to start
+
+    - name: Sleep for 30 seconds to allow mysql to start
       uses: jakejarvis/wait-action@master
       with:
         time: '30s'
@@ -67,13 +67,12 @@ jobs:
         while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do
           sleep 1
         done
-    
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: mysql, mysqlnd, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml
-        
+
     - uses: actions/checkout@v1
       with:
         ref: v5-develop
@@ -82,7 +81,6 @@ jobs:
     - name: Copy .env
       run: |
         cp .env.ci .env
-        
     - name: Install composer dependencies
       run: |
         composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
@@ -93,12 +91,10 @@ jobs:
         php artisan optimize
         php artisan cache:clear
         php artisan config:cache
-        
     - name: Create DB and schemas
       run: |
         mkdir -p database
         touch database/database.sqlite
-        
     - name: Migrate Database
       run: |
         php artisan migrate:fresh --seed --force && php artisan db:seed --force
@@ -106,7 +102,6 @@ jobs:
       run: |
         npm i
         npm run production
-        
     - name: Run Testsuite
       run: |
         cat .env
@@ -117,4 +112,3 @@ jobs:
     - name: Run php-cs-fixer
       run: |
         vendor/bin/php-cs-fixer fix
-