From 9e68804049d824b5664e985a5e37dc2646f17627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Thu, 3 Jun 2021 08:37:15 +0200
Subject: [PATCH] Format tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 .github/workflows/lint.yml    | 12 ++++++++++--
 .github/workflows/phpunit.yml | 20 +++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8fdd294800..1fa4f9c81b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,29 +3,35 @@ on: pull_request
 
 jobs:
   php-linters:
+    name: php${{ matrix.php-versions }} lint
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
         php-versions: ['7.3', '7.4', '8.0']
-    name: php${{ matrix.php-versions }} lint
+
     steps:
     - name: Checkout
       uses: actions/checkout@master
+
     - name: Set up php${{ matrix.php-versions }}
       uses: shivammathur/setup-php@master
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
         coverage: none
+
     - name: Lint
       run: composer run lint
 
   php-cs-fixer:
     name: php-cs check
     runs-on: ubuntu-latest
+
     steps:
     - name: Checkout
       uses: actions/checkout@master
+
     - name: Set up php
       uses: shivammathur/setup-php@master
       with:
@@ -33,8 +39,10 @@ jobs:
         extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
         coverage: none
         tools: cs2pr
+
     - name: Install dependencies
       run: composer i
+
     - name: Run coding standards check
       run: |
         composer run cs:check -- --format=checkstyle | cs2pr
@@ -42,13 +50,13 @@ jobs:
       shell: bash
 
   node:
+    name: eslint node${{ matrix.node-version }}
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         node-version: [12.x]
 
-    name: eslint node${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 854b129721..f924d9b9e6 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -13,14 +13,17 @@ env:
 jobs:
   phpunit-nodb:
     runs-on: ubuntu-20.04
+
     strategy:
       matrix:
-        php-versions: [ '7.3', '7.4', '8.0' ]
+        php-versions: ["7.3", "7.4", "8.0"]
+
     steps:
       - name: Checkout server
         uses: actions/checkout@v2
         with:
           submodules: true
+
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
         with:
@@ -28,6 +31,7 @@ jobs:
           extensions: ${{ env.php-extensions }}
           tools: phpunit:9.5.4
           coverage: none
+
       - name: PHPUnit
         env:
           NOCOVERAGE: true
@@ -47,14 +51,17 @@ jobs:
 
   phpunit-sqlite:
     runs-on: ubuntu-20.04
+
     strategy:
       matrix:
-        php-versions: [ '7.3', '7.4', '8.0' ]
+        php-versions: ["7.3", "7.4", "8.0"]
+
     steps:
       - name: Checkout server
         uses: actions/checkout@v2
         with:
           submodules: true
+
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
         with:
@@ -62,6 +69,7 @@ jobs:
           extensions: ${{ env.php-extensions }}
           tools: phpunit:9.5.4
           coverage: none
+
       - name: PHPUnit
         env:
           NOCOVERAGE: true
@@ -69,14 +77,12 @@ jobs:
 
   phpunit-oci8:
     runs-on: ubuntu-20.04
-    needs: phpunit-sqlite
+    # oci takes more time
+    needs: [phpunit-nodb, phpunit-sqlite]
 
     strategy:
       matrix:
-        php-versions: [ '7.4' ]
-        databases: [ 'oci' ]
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
+        php-versions: ["7.4"]
 
     services:
       oracle: