From b270769fc88bd12cfbf647f2d93b687c8c9b0922 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Tue, 18 Jan 2022 14:52:21 -0500 Subject: [PATCH 1/3] Add back semver_example test on highest. --- composer.json | 2 +- composer.lock | 16 ++++++++-------- tests/integration/SecurityUpdatesTest.php | 3 --- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 11eddebf3b..bfe3e6f2b7 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "consolidation/filter-via-dot-access-data": "^1", "consolidation/robo": "^3", "consolidation/site-alias": "^3.1.3", - "consolidation/site-process": "^4", + "consolidation/site-process": "^4.1.3", "enlightn/security-checker": "^1", "guzzlehttp/guzzle": "^6.3 || ^7.0", "league/container": "^3.4", diff --git a/composer.lock b/composer.lock index eeae7ae6b0..f0b1e764cd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "101833872d33f2b7c5702a49c06577b8", + "content-hash": "0741387fd6370a7498f593fd139d63e3", "packages": [ { "name": "chi-teck/drupal-code-generator", @@ -685,16 +685,16 @@ }, { "name": "consolidation/site-process", - "version": "4.1.0", + "version": "4.1.3", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "ef57711d7049f7606ce936ded16ad93f1ad7f02c" + "reference": "ca41dc82b280bccdf1b231d5599c7d506fba5c04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/ef57711d7049f7606ce936ded16ad93f1ad7f02c", - "reference": "ef57711d7049f7606ce936ded16ad93f1ad7f02c", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/ca41dc82b280bccdf1b231d5599c7d506fba5c04", + "reference": "ca41dc82b280bccdf1b231d5599c7d506fba5c04", "shasum": "" }, "require": { @@ -702,7 +702,7 @@ "consolidation/site-alias": "^3", "php": ">=7.1.3", "symfony/console": "^2.8.52|^3|^4.4|^5", - "symfony/process": "^4.3.4" + "symfony/process": "^4.3.4|^5" }, "require-dev": { "phpunit/phpunit": "^7.5.20|^8.5.14", @@ -737,9 +737,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/4.1.0" + "source": "https://github.com/consolidation/site-process/tree/4.1.3" }, - "time": "2021-02-21T02:53:33+00:00" + "time": "2022-01-18T23:04:54+00:00" }, { "name": "dflydev/dot-access-data", diff --git a/tests/integration/SecurityUpdatesTest.php b/tests/integration/SecurityUpdatesTest.php index 28d0694907..4baa6aafa3 100644 --- a/tests/integration/SecurityUpdatesTest.php +++ b/tests/integration/SecurityUpdatesTest.php @@ -16,9 +16,6 @@ class SecurityUpdatesTest extends UnishIntegrationTestCase */ public function testInsecureDrupalPackage() { - if (Semver::satisfies(\Drupal::VERSION, '^10')) { - $this->markTestSkipped('drupal/semver_example not yet compatible.'); - } list($expected_package, $expected_version) = ['drupal/semver_example', '2.2.0']; $this->drush('pm:security', [], ['format' => 'json'], self::EXIT_ERROR_WITH_CLARITY); $this->assertStringContainsString('One or more of your dependencies has an outstanding security update.', $this->getErrorOutput()); From 8bb1cf0cd5334c6771411b80588ba478e74a8900 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Fri, 21 Jan 2022 14:05:55 -0500 Subject: [PATCH 2/3] 3.0 --- composer.json | 2 +- composer.lock | 22 +++++++++++++--------- tests/integration/SecurityUpdatesTest.php | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index bfe3e6f2b7..be126d8923 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "cweagans/composer-patches": "~1.0", "david-garcia/phpwhois": "4.3.0", "drupal/core-recommended": "^9 || ^10", - "drupal/semver_example": "2.2.0", + "drupal/semver_example": "2.3.0", "phpunit/phpunit": ">=7.5.20", "rector/rector": "^0.12", "squizlabs/php_codesniffer": "^3.6", diff --git a/composer.lock b/composer.lock index f0b1e764cd..0deb693837 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0741387fd6370a7498f593fd139d63e3", + "content-hash": "7e54876426a30fe150ea012e9d53de25", "packages": [ { "name": "chi-teck/drupal-code-generator", @@ -4284,26 +4284,26 @@ }, { "name": "drupal/semver_example", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/semver_example.git", - "reference": "2.2.0" + "reference": "2.3.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/semver_example-2.2.0.zip", - "reference": "2.2.0", - "shasum": "8cb04baee5ca950a96ef825434b1da3b5bc985a2" + "url": "https://ftp.drupal.org/files/projects/semver_example-2.3.0.zip", + "reference": "2.3.0", + "shasum": "3de7ff51a8ce4bdf71c2f32059631f5bd8d71458" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": ">=8" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.2.0", - "datestamp": "1593188229", + "version": "2.3.0", + "datestamp": "1642787442", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -4323,6 +4323,10 @@ "name": "dww", "homepage": "https://www.drupal.org/user/46549" }, + { + "name": "moshe weitzman", + "homepage": "https://www.drupal.org/user/23" + }, { "name": "tedbow", "homepage": "https://www.drupal.org/user/240860" diff --git a/tests/integration/SecurityUpdatesTest.php b/tests/integration/SecurityUpdatesTest.php index 4baa6aafa3..a38f8f6090 100644 --- a/tests/integration/SecurityUpdatesTest.php +++ b/tests/integration/SecurityUpdatesTest.php @@ -16,7 +16,7 @@ class SecurityUpdatesTest extends UnishIntegrationTestCase */ public function testInsecureDrupalPackage() { - list($expected_package, $expected_version) = ['drupal/semver_example', '2.2.0']; + list($expected_package, $expected_version) = ['drupal/semver_example', '2.3.0']; $this->drush('pm:security', [], ['format' => 'json'], self::EXIT_ERROR_WITH_CLARITY); $this->assertStringContainsString('One or more of your dependencies has an outstanding security update.', $this->getErrorOutput()); $this->assertStringContainsString("$expected_package", $this->getErrorOutput()); From 34f0d394cc3956d9679d52abac43e00ec6146ae2 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Mon, 24 Jan 2022 18:50:34 -0500 Subject: [PATCH 3/3] Bring back CI for highest --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1883ccf605..3673f29275 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,8 +123,6 @@ jobs: - run: php --version - run: composer -n config platform.php --unset - run: composer -n require --dev drupal/core-recommended:10.0.x-dev --no-update - # Bring it back when it is compatible with Drupal 10. - - run: composer -n remove drupal/semver_example --no-update --dev - run: composer -n update - run: mkdir -p /tmp/results - run: composer -n lint