From e1426394f36ec523c0a81eaa7a50f22b5f434916 Mon Sep 17 00:00:00 2001
From: Ben XO <ben@Bens-MacBook-Air.local>
Date: Fri, 31 Dec 2021 00:27:30 +0000
Subject: [PATCH] Move composer.json into test dir

---
 .github/workflows/testing.yml       | 2 +-
 test/combine_coverage.php           | 2 +-
 composer.json => test/composer.json | 0
 test/dir2castWithCoverage.php       | 2 +-
 test/run.sh                         | 6 +++++-
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename composer.json => test/composer.json (100%)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index af0590c..eb14e3a 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -26,5 +26,5 @@ jobs:
         run: ./test/run.sh --do-not-cache-result .
       - name: Test with phpunit (Windows)
         if: ${{ contains(matrix.operating-system, 'windows') }}
-        run: cd test ; ..\vendor\bin\phpunit --bootstrap "bootstrap.php" .
+        run: cd test ; vendor\bin\phpunit --bootstrap "bootstrap.php" .
 
diff --git a/test/combine_coverage.php b/test/combine_coverage.php
index f33c99b..1fc757c 100644
--- a/test/combine_coverage.php
+++ b/test/combine_coverage.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-require_once('../vendor/autoload.php');
+require_once('vendor/autoload.php');
 
 use SebastianBergmann\CodeCoverage\Report\Text as PHP_CodeCoverage_Report_Text;
 
diff --git a/composer.json b/test/composer.json
similarity index 100%
rename from composer.json
rename to test/composer.json
diff --git a/test/dir2castWithCoverage.php b/test/dir2castWithCoverage.php
index 48028d6..9996f3a 100644
--- a/test/dir2castWithCoverage.php
+++ b/test/dir2castWithCoverage.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-require_once('../../vendor/autoload.php');
+require_once('../vendor/autoload.php');
 
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\Driver\Selector;
diff --git a/test/run.sh b/test/run.sh
index 836f383..3a4665f 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -5,6 +5,10 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 cd "$SCRIPT_DIR"
 
+if [[ ! -e vendor ]]; then
+	composer install ||	(echo "Error: Make sure you have php, composer and xdebug installed."; exit 1)
+fi
+
 tests=($@)
 if [[ "${tests[@]}" == "" ]]; then
 	tests=('.')
@@ -12,6 +16,6 @@ fi
 
 export XDEBUG_MODE=coverage
 rm -f /tmp/cov-*
-../vendor/bin/phpunit --bootstrap "$SCRIPT_DIR/bootstrap.php" --coverage-php /tmp/cov-main --coverage-filter ../dir2cast.php ${tests[@]}
+vendor/bin/phpunit --bootstrap "$SCRIPT_DIR/bootstrap.php" --coverage-php /tmp/cov-main --coverage-filter ../dir2cast.php ${tests[@]}
 php combine_coverage.php
 rm -rf testdir /tmp/cov-*