Merge pull request #16 from tattersoftware/refactor

Refactor

Author: MGatner

.github/workflows/analyze.yml

@@ -1,17 +1,16 @@
-name: PHP Unit Tests
+name: Tests
 
 on:
   pull_request:
-    branches: 
+    branches:
+      - develop
+  push:
+    branches:
       - develop
 
 jobs:
   main:
-    name: Build and test
-
-    strategy:
-      matrix:
-        php-versions: ['7.3', '7.4']
+    name: Unit Tests
 
     runs-on: ubuntu-latest
 
@@ -21,29 +20,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@master
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: composer, pecl, phpunit
-          extensions: intl, json, mbstring, mysqlnd, xdebug, xml, sqlite3
-          coverage: xdebug
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --no-interaction --prefer-dist --optimize-autoloader
+      - name: Run Test Suite
+        run: tests/run
         env:
-          COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
-
-      - name: Test with phpunit
-        run: vendor/bin/phpunit --coverage-text
+          TERM: xterm-256color