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 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 28d0694907..a38f8f6090 100644 --- a/tests/integration/SecurityUpdatesTest.php +++ b/tests/integration/SecurityUpdatesTest.php @@ -16,10 +16,7 @@ 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']; + 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());