Allow flexibilty in CI unit test runner

Author: johnstevenson

.github/workflows/continuous-integration.yml

@@ -54,5 +54,12 @@ jobs:
       - name: Install latest dependencies
         run: composer update ${{ env.COMPOSER_FLAGS }}
 
+      # Provides flexibilty for using either simple-phpunit or phpunit
+      - name: Determine PHPUnit binary
+        run: |
+          name=$([ -f vendor/bin/simple-phpunit ] && echo simple-phpunit || echo phpunit)
+          echo "BIN_PHPUNIT=vendor/bin/$name" >> $GITHUB_ENV
+        shell: bash
+
       - name: Run tests
-        run: vendor/bin/simple-phpunit --verbose
+        run: ${{ env.BIN_PHPUNIT }} --verbose

tests/bootstrap_phpstan.php

@@ -1,13 +1,29 @@
 <?php
+/**
+ * Provides flexibilty for using either simple-phpunit or phpunit
+ */
 
 $vendorBin = __DIR__.'/../vendor/bin';
+
+// See if we using simple-phpunit
 $path = realpath($vendorBin.'/simple-phpunit');
 
-if (!file_exists($vendorBin.'/phpunit') && $path !== false) {
-    passthru(escapeshellarg($path).' install');
+if ($path !== false) {
+    // simple-phpunit will update the .phpunit symlink/junction
+    $phpunit = escapeshellarg(PHP_BINARY).' '.escapeshellarg($path);
+    passthru($phpunit.' install');
 
     $autoloader = $vendorBin.'/.phpunit/phpunit/vendor/autoload.php';
-    if (file_exists($autoloader)) {
-        require $autoloader;
+    if (!file_exists($autoloader)) {
+        echo 'Cannot run PHPStan: simple-phpunit did not install PHPUnit as expected'.PHP_EOL;
+        exit(1);
     }
+
+    include $autoloader;
+    return;
+}
+
+if (realpath($vendorBin.'/phpunit') === false) {
+    echo 'Cannot run PHPStan: PHPUnit has not been installed'.PHP_EOL;
+    exit(1);
 }