From 17df1ad13563e24b3baa954a17d99203f802e9d9 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Wed, 9 Aug 2023 16:30:02 -0700 Subject: [PATCH 01/12] run agianst nightly WordPress as well --- bin/phpunit-test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/phpunit-test.sh b/bin/phpunit-test.sh index 4b4d630..f0030fa 100755 --- a/bin/phpunit-test.sh +++ b/bin/phpunit-test.sh @@ -8,6 +8,11 @@ bash "${DIRNAME}/install-wp-tests.sh" wordpress_test root root 127.0.0.1 latest echo "Running PHPUnit on Single Site" composer phpunit rm -rf $WP_TESTS_DIR $WP_CORE_DIR + +bash "${DIRNAME}/install-wp-tests.sh" wordpress_test root root 127.0.0.1 nightly true +echo "Running PHPUnit on Single Site (Nightly WordPress)" +composer phpunit + bash "${DIRNAME}/install-wp-tests.sh" wordpress_test root root 127.0.0.1 latest true echo "Running PHPUnit on Multisite" WP_MULTISITE=1 composer phpunit From d804858e17f11c1bfc25eadb3398d97a3937df47 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Wed, 9 Aug 2023 16:30:48 -0700 Subject: [PATCH 02/12] Tested up to 6.3 --- README.md | 2 +- readme.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d405934..c7c81df 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ **Contributors:** [getpantheon](https://profiles.wordpress.org/getpantheon/), [danielbachhuber](https://profiles.wordpress.org/danielbachhuber/), [jspellman](https://profiles.wordpress.org/jspellman/), [jazzs3quence](https://profiles.wordpress.org/jazzs3quence) **Tags:** Pantheon, hosting, environment-indicator **Requires at least:** 4.9 -**Tested up to:** 6.2 +**Tested up to:** 6.3 **Stable tag:** 0.4.4-dev **License:** GPLv2 or later **License URI:** http://www.gnu.org/licenses/gpl-2.0.html diff --git a/readme.txt b/readme.txt index 9508278..1cb1152 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: getpantheon, danielbachhuber, jspellman, jazzs3quence Tags: Pantheon, hosting, environment-indicator Requires at least: 4.9 -Tested up to: 6.2 +Tested up to: 6.3 Stable tag: 0.4.4-dev License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html From 5bc993a9c4deeaf3834d36dc518ae143c5a528a4 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Wed, 9 Aug 2023 16:33:19 -0700 Subject: [PATCH 03/12] readme spacing thanks past me --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7c81df..93c9999 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ **Contributors:** [getpantheon](https://profiles.wordpress.org/getpantheon/), [danielbachhuber](https://profiles.wordpress.org/danielbachhuber/), [jspellman](https://profiles.wordpress.org/jspellman/), [jazzs3quence](https://profiles.wordpress.org/jazzs3quence) **Tags:** Pantheon, hosting, environment-indicator **Requires at least:** 4.9 -**Tested up to:** 6.3 +**Tested up to:** 6.3 **Stable tag:** 0.4.4-dev **License:** GPLv2 or later **License URI:** http://www.gnu.org/licenses/gpl-2.0.html From d1f8f519afaba1ed5f5a0f6dbba3da5936387bff Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Wed, 9 Aug 2023 16:34:43 -0700 Subject: [PATCH 04/12] Drop travis CI from .org readme --- readme.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/readme.txt b/readme.txt index 1cb1152..7fe56ba 100644 --- a/readme.txt +++ b/readme.txt @@ -11,8 +11,6 @@ A heads-up display into your Pantheon environment. == Description == -[![Build Status](https://travis-ci.org/pantheon-systems/pantheon-hud.svg?branch=master)](https://travis-ci.org/pantheon-systems/pantheon-hud) - This plugin provides situational awareness of the Pantheon plaform from within your WordPress dashboard. It's helpful to be reminded what environment you're in, as well as providing quick links to get back to Pantheon's dashboard, or to interface with your WordPress installation via the command line. Pantheon HUD is in early stages of development. We want your feedback! [Create a Github issue](https://github.com/pantheon-systems/pantheon-hud/issues) with questions, feature requests, or bug reports. From 9a6f55245b5fccdd331ba03bdf6476e962607b44 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Thu, 10 Aug 2023 10:37:29 -0700 Subject: [PATCH 05/12] Validate fixture WP version before running behat tests --- .circleci/config.yml | 1 + bin/validate-fixture-version.sh | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100755 bin/validate-fixture-version.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 9aefd1d..bc42723 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,6 +55,7 @@ jobs: exit 0 fi terminus auth:login --machine-token=$TERMINUS_TOKEN + - run: ./bin/validate-fixture-version.sh - run: ./bin/behat-prepare.sh - run: ./bin/behat-test.sh --strict - run: diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh new file mode 100755 index 0000000..8a836a5 --- /dev/null +++ b/bin/validate-fixture-version.sh @@ -0,0 +1,36 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +main(){ + export TERMINUS_HIDE_GIT_MODE_WARNING=1 + local DIRNAME=$(dirname "$0") + + if [ -z "${TERMINUS_SITE}" ]; then + echo "TERMINUS_SITE environment variable must be set" + exit 1 + fi + + if ! terminus whoami > /dev/null; then + if [ -z "${TERMINUS_TOKEN}" ]; then + echo "TERMINUS_TOKEN environment variable must be set or terminus already logged in." + exit 1 + fi + terminus auth:login --machine-token="${TERMINUS_TOKEN}" + fi + + local TESTED_UP_TO + TESTED_UP_TO=$(grep -i "Tested up to:" ${DIRNAME}/../README.txt | tr -d '\r\n' | awk -F ': ' '{ print $2 }') + echo "Tested Up To: ${TESTED_UP_TO}" + local FIXTURE_VERSION + FIXTURE_VERSION=$(terminus wp "${TERMINUS_SITE}.dev" -- core version) + echo "Fixture Version: ${FIXTURE_VERSION}" + + if ! php -r "exit(version_compare('${TESTED_UP_TO}', '${FIXTURE_VERSION}'));"; then + echo "${FIXTURE_VERSION} is less than ${TESTED_UP_TO}" + echo "Please update ${TERMINUS_SITE} to at least WordPress ${FIXTURE_VERSION}" + exit 1 + fi +} + +main From 0811bdb8cea88becd8f6a67c29e4ffeb79c35573 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Thu, 10 Aug 2023 10:55:28 -0700 Subject: [PATCH 06/12] case-insensitive readme file path --- bin/validate-fixture-version.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh index 8a836a5..30596a9 100755 --- a/bin/validate-fixture-version.sh +++ b/bin/validate-fixture-version.sh @@ -19,8 +19,17 @@ main(){ terminus auth:login --machine-token="${TERMINUS_TOKEN}" fi + + # Use find to locate the file with a case-insensitive search + README_FILE_PATH=$(find ${DIRNAME}/.. -iname "readme.txt" -print -quit) + + if [[ -z "$README_FILE_PATH" ]]; then + echo "File not found." + exit 1 + fi + local TESTED_UP_TO - TESTED_UP_TO=$(grep -i "Tested up to:" ${DIRNAME}/../README.txt | tr -d '\r\n' | awk -F ': ' '{ print $2 }') + TESTED_UP_TO=$(grep -i "Tested up to:" "${README_FILE_PATH}" | tr -d '\r\n' | awk -F ': ' '{ print $2 }') echo "Tested Up To: ${TESTED_UP_TO}" local FIXTURE_VERSION FIXTURE_VERSION=$(terminus wp "${TERMINUS_SITE}.dev" -- core version) From 15b328465656494c379a644e1aa49b30127d2731 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Thu, 10 Aug 2023 10:57:41 -0700 Subject: [PATCH 07/12] not found message --- bin/validate-fixture-version.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh index 30596a9..2109087 100755 --- a/bin/validate-fixture-version.sh +++ b/bin/validate-fixture-version.sh @@ -22,9 +22,8 @@ main(){ # Use find to locate the file with a case-insensitive search README_FILE_PATH=$(find ${DIRNAME}/.. -iname "readme.txt" -print -quit) - if [[ -z "$README_FILE_PATH" ]]; then - echo "File not found." + echo "readme.txt not found." exit 1 fi From acb2ecb319a3deeced954904b5be88397a0f8911 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Thu, 10 Aug 2023 11:10:16 -0700 Subject: [PATCH 08/12] fix message target version --- bin/validate-fixture-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh index 2109087..f369b8d 100755 --- a/bin/validate-fixture-version.sh +++ b/bin/validate-fixture-version.sh @@ -36,7 +36,7 @@ main(){ if ! php -r "exit(version_compare('${TESTED_UP_TO}', '${FIXTURE_VERSION}'));"; then echo "${FIXTURE_VERSION} is less than ${TESTED_UP_TO}" - echo "Please update ${TERMINUS_SITE} to at least WordPress ${FIXTURE_VERSION}" + echo "Please update ${TERMINUS_SITE} to at least WordPress ${TESTED_UP_TO}" exit 1 fi } From 5d190f90069330d2b58e5e8ba8f1f37143b2a294 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Thu, 10 Aug 2023 14:21:22 -0700 Subject: [PATCH 09/12] Composer Update --- composer.lock | 278 +++++++++++++++++++++++++------------------------- 1 file changed, 137 insertions(+), 141 deletions(-) diff --git a/composer.lock b/composer.lock index 05a3c6c..afed078 100644 --- a/composer.lock +++ b/composer.lock @@ -61,16 +61,16 @@ }, { "name": "behat/behat", - "version": "v3.12.0", + "version": "v3.13.0", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "2f059c9172764ba1f1759b3679aca499b665330a" + "reference": "9dd7cdb309e464ddeab095cd1a5151c2dccba4ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/2f059c9172764ba1f1759b3679aca499b665330a", - "reference": "2f059c9172764ba1f1759b3679aca499b665330a", + "url": "https://api.github.com/repos/Behat/Behat/zipball/9dd7cdb309e464ddeab095cd1a5151c2dccba4ab", + "reference": "9dd7cdb309e464ddeab095cd1a5151c2dccba4ab", "shasum": "" }, "require": { @@ -142,9 +142,9 @@ ], "support": { "issues": "https://github.com/Behat/Behat/issues", - "source": "https://github.com/Behat/Behat/tree/v3.12.0" + "source": "https://github.com/Behat/Behat/tree/v3.13.0" }, - "time": "2022-11-29T15:30:11+00:00" + "time": "2023-04-18T15:40:53+00:00" }, { "name": "behat/gherkin", @@ -455,6 +455,7 @@ "issues": "https://github.com/minkphp/MinkGoutteDriver/issues", "source": "https://github.com/minkphp/MinkGoutteDriver/tree/v1.3.0" }, + "abandoned": "behat/mink-browserkit-driver", "time": "2021-10-12T11:35:46+00:00" }, { @@ -884,16 +885,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -903,11 +904,6 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -948,7 +944,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/1.5.3" }, "funding": [ { @@ -964,20 +960,20 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -996,11 +992,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -1058,7 +1049,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.9.0" + "source": "https://github.com/guzzle/psr7/tree/1.9.1" }, "funding": [ { @@ -1074,7 +1065,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:03+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "myclabs/deep-copy", @@ -1137,16 +1128,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -1187,9 +1178,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" }, - "time": "2023-03-05T19:49:14+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "pantheon-systems/pantheon-wordpress-upstream-tests", @@ -1559,22 +1550,24 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.18.1", + "version": "1.23.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "22dcdfd725ddf99583bfe398fc624ad6c5004a0f" + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/22dcdfd725ddf99583bfe398fc624ad6c5004a0f", - "reference": "22dcdfd725ddf99583bfe398fc624ad6c5004a0f", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.5", @@ -1598,22 +1591,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.18.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" }, - "time": "2023-04-07T11:51:11+00:00" + "time": "2023-08-03T16:32:59+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", "shasum": "" }, "require": { @@ -1669,7 +1662,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27" }, "funding": [ { @@ -1677,7 +1671,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-07-26T13:44:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1922,16 +1916,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.7", + "version": "9.6.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2" + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", - "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", "shasum": "" }, "require": { @@ -2005,7 +1999,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10" }, "funding": [ { @@ -2021,7 +2015,7 @@ "type": "tidelift" } ], - "time": "2023-04-14T08:58:40+00:00" + "time": "2023-07-10T04:04:23+00:00" }, { "name": "psr/container", @@ -2518,16 +2512,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -2572,7 +2566,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -2580,7 +2574,7 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", @@ -2724,16 +2718,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -2776,7 +2770,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -2784,7 +2778,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", @@ -3184,16 +3178,16 @@ }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.16", + "version": "v2.11.17", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "dc5582dc5a93a235557af73e523c389aac9a8e88" + "reference": "3b71162a6bf0cde2bff1752e40a1788d8273d049" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/dc5582dc5a93a235557af73e523c389aac9a8e88", - "reference": "dc5582dc5a93a235557af73e523c389aac9a8e88", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/3b71162a6bf0cde2bff1752e40a1788d8273d049", + "reference": "3b71162a6bf0cde2bff1752e40a1788d8273d049", "shasum": "" }, "require": { @@ -3238,36 +3232,36 @@ "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2023-03-31T16:46:32+00:00" + "time": "2023-08-05T23:46:11+00:00" }, { "name": "slevomat/coding-standard", - "version": "8.10.0", + "version": "8.13.4", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "c4e213e6e57f741451a08e68ef838802eec92287" + "reference": "4b2af2fb17773656d02fbfb5d18024ebd19fe322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/c4e213e6e57f741451a08e68ef838802eec92287", - "reference": "c4e213e6e57f741451a08e68ef838802eec92287", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/4b2af2fb17773656d02fbfb5d18024ebd19fe322", + "reference": "4b2af2fb17773656d02fbfb5d18024ebd19fe322", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.18.0 <1.19.0", + "phpstan/phpdoc-parser": "^1.23.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.10.11", + "phpstan/phpstan": "1.10.26", "phpstan/phpstan-deprecation-rules": "1.1.3", - "phpstan/phpstan-phpunit": "1.0.0|1.3.11", + "phpstan/phpstan-phpunit": "1.3.13", "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "7.5.20|8.5.21|9.6.6|10.0.19" + "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.2.6" }, "type": "phpcodesniffer-standard", "extra": { @@ -3291,7 +3285,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.10.0" + "source": "https://github.com/slevomat/coding-standard/tree/8.13.4" }, "funding": [ { @@ -3303,7 +3297,7 @@ "type": "tidelift" } ], - "time": "2023-04-10T07:39:29+00:00" + "time": "2023-07-25T10:28:55+00:00" }, { "name": "spryker/code-sniffer", @@ -3572,16 +3566,16 @@ }, { "name": "symfony/console", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8" + "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8", - "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8", + "url": "https://api.github.com/repos/symfony/console/zipball/b504a3d266ad2bb632f196c0936ef2af5ff6e273", + "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273", "shasum": "" }, "require": { @@ -3651,7 +3645,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.22" + "source": "https://github.com/symfony/console/tree/v5.4.26" }, "funding": [ { @@ -3667,20 +3661,20 @@ "type": "tidelift" } ], - "time": "2023-03-25T09:27:28+00:00" + "time": "2023-07-19T20:11:33+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.21", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d" + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/95f3c7468db1da8cc360b24fa2a26e7cefcb355d", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", "shasum": "" }, "require": { @@ -3717,7 +3711,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.21" + "source": "https://github.com/symfony/css-selector/tree/v5.4.26" }, "funding": [ { @@ -3733,7 +3727,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-07-07T06:10:25+00:00" }, { "name": "symfony/dependency-injection", @@ -3823,25 +3817,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.0.2", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3870,7 +3864,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -3886,7 +3880,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/dom-crawler", @@ -3964,16 +3958,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f" + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f", - "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac", + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac", "shasum": "" }, "require": { @@ -4029,7 +4023,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26" }, "funding": [ { @@ -4045,24 +4039,24 @@ "type": "tidelift" } ], - "time": "2023-03-17T11:31:58+00:00" + "time": "2023-07-06T06:34:20+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.0.2", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "7bc61cc2db649b4637d331240c5346dcc7708051" + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051", - "reference": "7bc61cc2db649b4637d331240c5346dcc7708051", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=7.2.5", "psr/event-dispatcher": "^1" }, "suggest": { @@ -4071,7 +4065,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -4108,7 +4102,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" }, "funding": [ { @@ -4124,20 +4118,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.21", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f" + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", - "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", "shasum": "" }, "require": { @@ -4172,7 +4166,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.21" + "source": "https://github.com/symfony/filesystem/tree/v5.4.25" }, "funding": [ { @@ -4188,7 +4182,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-05-31T13:04:02+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5009,33 +5003,34 @@ }, { "name": "symfony/string", - "version": "v6.0.19", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a" + "reference": "1181fe9270e373537475e826873b5867b863883c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a", - "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a", + "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c", + "reference": "1181fe9270e373537475e826873b5867b863883c", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": ">=3.0" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/translation-contracts": "^2.0|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -5074,7 +5069,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.19" + "source": "https://github.com/symfony/string/tree/v5.4.26" }, "funding": [ { @@ -5090,7 +5085,7 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:36:10+00:00" + "time": "2023-06-28T12:46:07+00:00" }, { "name": "symfony/translation", @@ -5261,27 +5256,28 @@ }, { "name": "symfony/yaml", - "version": "v6.0.19", + "version": "v5.4.23", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "deec3a812a0305a50db8ae689b183f43d915c884" + "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/deec3a812a0305a50db8ae689b183f43d915c884", - "reference": "deec3a812a0305a50db8ae689b183f43d915c884", + "url": "https://api.github.com/repos/symfony/yaml/zipball/4cd2e3ea301aadd76a4172756296fe552fb45b0b", + "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<5.4" + "symfony/console": "<5.3" }, "require-dev": { - "symfony/console": "^5.4|^6.0" + "symfony/console": "^5.3|^6.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -5315,7 +5311,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.0.19" + "source": "https://github.com/symfony/yaml/tree/v5.4.23" }, "funding": [ { @@ -5331,7 +5327,7 @@ "type": "tidelift" } ], - "time": "2023-01-11T11:50:03+00:00" + "time": "2023-04-23T19:33:36+00:00" }, { "name": "theseer/tokenizer", From 653bf307dc029fceb3a675740c5fe991652c0bb1 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Fri, 11 Aug 2023 10:09:11 -0700 Subject: [PATCH 10/12] Update upstream behat tests --- composer.lock | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index afed078..4bd180e 100644 --- a/composer.lock +++ b/composer.lock @@ -1187,13 +1187,13 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/pantheon-systems/pantheon-wordpress-upstream-tests.git", - "reference": "1a0d50c12413b3643a24b578a23b819f11e35ebf" + "url": "git@github.com:pantheon-systems/pantheon-wordpress-upstream-tests.git", + "reference": "004fc97a604950aef4f62773417691d23b3d75b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pantheon-systems/pantheon-wordpress-upstream-tests/zipball/1a0d50c12413b3643a24b578a23b819f11e35ebf", - "reference": "1a0d50c12413b3643a24b578a23b819f11e35ebf", + "url": "https://api.github.com/repos/pantheon-systems/pantheon-wordpress-upstream-tests/zipball/004fc97a604950aef4f62773417691d23b3d75b0", + "reference": "004fc97a604950aef4f62773417691d23b3d75b0", "shasum": "" }, "require": { @@ -1215,11 +1215,7 @@ "email": "noreply@pantheon.io" } ], - "support": { - "issues": "https://github.com/pantheon-systems/pantheon-wordpress-upstream-tests/issues", - "source": "https://github.com/pantheon-systems/pantheon-wordpress-upstream-tests/tree/master" - }, - "time": "2020-04-17T11:46:11+00:00" + "time": "2023-08-11T17:05:44+00:00" }, { "name": "pantheon-systems/pantheon-wp-coding-standards", From 0579dbe54de05ed0e37a1ab7bab80b41b93890b4 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Fri, 11 Aug 2023 10:11:24 -0700 Subject: [PATCH 11/12] rm classic editor from behat prepare --- bin/behat-prepare.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bin/behat-prepare.sh b/bin/behat-prepare.sh index be735ba..afab871 100755 --- a/bin/behat-prepare.sh +++ b/bin/behat-prepare.sh @@ -53,12 +53,6 @@ cd $BASH_DIR/.. rsync -av --exclude='vendor/' --exclude='node_modules/' --exclude='tests/' ./* $PREPARE_DIR/wp-content/plugins/pantheon-hud rm -rf $PREPARE_DIR/wp-content/plugins/pantheon-hud/.git -# Download the latest Classic Editor release from WordPress.org -wget -O $PREPARE_DIR/classic-editor.zip https://downloads.wordpress.org/plugin/classic-editor.zip -unzip $PREPARE_DIR/classic-editor.zip -d $PREPARE_DIR -mv $PREPARE_DIR/classic-editor $PREPARE_DIR/wp-content/plugins/ -rm $PREPARE_DIR/classic-editor.zip - ### # Push files to the environment ### @@ -80,6 +74,6 @@ terminus build:workflow:wait $TERMINUS_SITE.$TERMINUS_ENV terminus wp $SITE_ENV -- core install --title=$TERMINUS_ENV-$TERMINUS_SITE --url=$PANTHEON_SITE_URL --admin_user=$WORDPRESS_ADMIN_USERNAME --admin_email=pantheon-hud@getpantheon.com --admin_password=$WORDPRESS_ADMIN_PASSWORD } &> /dev/null terminus wp $SITE_ENV -- cache flush -terminus wp $SITE_ENV -- plugin activate pantheon-hud classic-editor -terminus wp $SITE_ENV -- theme activate twentyseventeen +terminus wp $SITE_ENV -- plugin activate pantheon-hud +terminus wp $SITE_ENV -- theme activate twentytwentythree terminus wp $SITE_ENV -- rewrite structure '/%year%/%monthnum%/%day%/%postname%/' From cad871b172b4392985120451530422c469838697 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Fri, 11 Aug 2023 13:16:27 -0700 Subject: [PATCH 12/12] Update bin/validate-fixture-version.sh --- bin/validate-fixture-version.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/validate-fixture-version.sh b/bin/validate-fixture-version.sh index f369b8d..5a27b99 100755 --- a/bin/validate-fixture-version.sh +++ b/bin/validate-fixture-version.sh @@ -18,8 +18,6 @@ main(){ fi terminus auth:login --machine-token="${TERMINUS_TOKEN}" fi - - # Use find to locate the file with a case-insensitive search README_FILE_PATH=$(find ${DIRNAME}/.. -iname "readme.txt" -print -quit) if [[ -z "$README_FILE_PATH" ]]; then