diff --git a/composer.json b/composer.json index 11eddebf3b..6e776344af 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": "dev-2.x", "phpunit/phpunit": ">=7.5.20", "rector/rector": "^0.12", "squizlabs/php_codesniffer": "^3.6", diff --git a/composer.lock b/composer.lock index eeae7ae6b0..a0bc028f37 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": "12d96bec95f91d2d1a00ba2e08864690", "packages": [ { "name": "chi-teck/drupal-code-generator", @@ -4284,26 +4284,23 @@ }, { "name": "drupal/semver_example", - "version": "2.2.0", + "version": "dev-2.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/semver_example.git", - "reference": "2.2.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/semver_example-2.2.0.zip", - "reference": "2.2.0", - "shasum": "8cb04baee5ca950a96ef825434b1da3b5bc985a2" + "reference": "dcf20123fbbdb7cd70803a6f9b4c7596dcdd53aa" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": ">=8" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + }, "drupal": { - "version": "2.2.0", - "datestamp": "1593188229", + "version": "2.x-dev", + "datestamp": "1593187905", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -8708,7 +8705,9 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "drupal/semver_example": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { 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());