From d8795da16227a2c81abaef7ec5711ddad3a8881a Mon Sep 17 00:00:00 2001 From: Jason Bahl Date: Mon, 19 Jul 2021 13:55:12 -0600 Subject: [PATCH] - update install-test-env.sh --- .gitignore | 3 +++ bin/install-test-env.sh | 7 ++++--- composer.json | 2 +- vendor/composer/InstalledVersions.php | 12 ++++++------ vendor/composer/installed.php | 12 ++++++------ vendor/composer/platform_check.php | 4 ++-- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index e6c29ad..cbb1489 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ vendor/composer/installed.json vendor/composer/*/ composer.lock .log +local +wp-content + diff --git a/bin/install-test-env.sh b/bin/install-test-env.sh index c256bfc..b50f674 100644 --- a/bin/install-test-env.sh +++ b/bin/install-test-env.sh @@ -1,12 +1,13 @@ #!/usr/bin/env bash -if [[ ! -f ".env" ]]; then +if [ ! -f .env ]; then echo "No .env file was detected. .env.dist has been copied to .env" echo "Open the .env file and enter values to match your local environment" - cp .env.dist .env + cp ./.env.dist ./.env + export $(cat .env | xargs) fi -source .env.dist +source .env env | sort diff --git a/composer.json b/composer.json index a5fcb29..27e9200 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "phpstan": ["phpstan analyze --ansi --memory-limit=1G"] }, "require": { - "php": "^7" + "php": "^7.1 || ^8.0" }, "require-dev": { "lucatume/wp-browser": "^2.4", diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 6b5a555..9883b9f 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -25,24 +25,24 @@ class InstalledVersions private static $installed = array ( 'root' => array ( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', 'aliases' => array ( ), - 'reference' => 'dc5e83d190211baf88978a905ff44a9122fdaff8', + 'reference' => 'f34bb96ba52af54541439299b04e2b95d4f7564a', 'name' => 'wp-graphql/wp-graphql-acf', ), 'versions' => array ( 'wp-graphql/wp-graphql-acf' => array ( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', 'aliases' => array ( ), - 'reference' => 'dc5e83d190211baf88978a905ff44a9122fdaff8', + 'reference' => 'f34bb96ba52af54541439299b04e2b95d4f7564a', ), ), ); diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 933c2e4..ad9b805 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,24 +1,24 @@ array ( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', 'aliases' => array ( ), - 'reference' => 'dc5e83d190211baf88978a905ff44a9122fdaff8', + 'reference' => 'f34bb96ba52af54541439299b04e2b95d4f7564a', 'name' => 'wp-graphql/wp-graphql-acf', ), 'versions' => array ( 'wp-graphql/wp-graphql-acf' => array ( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', 'aliases' => array ( ), - 'reference' => 'dc5e83d190211baf88978a905ff44a9122fdaff8', + 'reference' => 'f34bb96ba52af54541439299b04e2b95d4f7564a', ), ), ); diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php index f79e574..6d3407d 100644 --- a/vendor/composer/platform_check.php +++ b/vendor/composer/platform_check.php @@ -4,8 +4,8 @@ $issues = array(); -if (!(PHP_VERSION_ID >= 70000)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.0.0". You are running ' . PHP_VERSION . '.'; +if (!(PHP_VERSION_ID >= 70100)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.0". You are running ' . PHP_VERSION . '.'; } if ($issues) {