diff --git a/.github/ISSUE_TEMPLATE/ValidationError-report.md b/.github/ISSUE_TEMPLATE/ValidationError-report.md index 0bf1e41b..a8591008 100644 --- a/.github/ISSUE_TEMPLATE/ValidationError-report.md +++ b/.github/ISSUE_TEMPLATE/ValidationError-report.md @@ -12,7 +12,7 @@ assignees: '' Steps to reproduce the behavior: 1. How was _cyclonedx-php-composer_ called? - + 2. What `composer.lock` file was processed? 3. Error report: diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 1784b3d6..8d68fe8f 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -143,7 +143,7 @@ jobs: if: ${{ ! matrix.stdout }} working-directory: ${{ env.DEMO_TOOL_PATH }} run: > - composer make-bom + composer CycloneDX:make-sbom -vvv $OMIT_RULES --spec-version=${{ matrix.spec-version }} @@ -156,7 +156,7 @@ jobs: if: ${{ matrix.stdout }} working-directory: ${{ env.DEMO_TOOL_PATH }} run: > - composer make-bom + composer CycloneDX:make-sbom -vvv $OMIT_RULES --spec-version=${{ matrix.spec-version }} diff --git a/HISTORY.md b/HISTORY.md index 4acc72ec..a4548ab3 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. * Removed support for PHP `<8.1` (via [#250]) * Removed support for Composer `<2.3` ([#153] via [#250]) * CLI + * Removed deprecated composer command `make-bom`, call `composer CycloneDX:make-sbom` instead ([#293] via [#309]) * Changed option `output-file` to default to `-` now, which causes to print to STDOUT (via [#250]) * Removed option `exclude-dev` in favour of new option `omit` (via [#250]) * Removed option `exclude-plugins` in favour of new option `omit` (via [#250]) @@ -45,6 +46,8 @@ All notable changes to this project will be documented in this file. [#250]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/250 [#261]: https://github.com/CycloneDX/cyclonedx-php-composer/issues/261 [#279]: https://github.com/CycloneDX/cyclonedx-php-composer/issues/279 +[#293]: https://github.com/CycloneDX/cyclonedx-php-composer/issues/293 +[#309]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/309 ## 3.10.2 - 2022-09-15 diff --git a/README.md b/README.md index 60e62823..d5895ed7 100644 --- a/README.md +++ b/README.md @@ -43,15 +43,15 @@ composer require --dev cyclonedx/cyclonedx-php-composer ## Usage -After successful installation, the composer command `make-bom` is available. +After successful installation, the composer command `CycloneDX:make-sbom` is available. ```text -$ composer make-bom --help +$ composer CycloneDX:make-sbom --help Description: Generate a CycloneDX Bill of Materials from a PHP composer project. Usage: - make-bom [options] [--] [] + CycloneDX:make-sbom [options] [--] [] Arguments: composer-file Path to composer config file. diff --git a/src/Plugin.php b/src/Plugin.php index a1596f75..78418336 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -68,7 +68,7 @@ public function getCommands(): array return [ new MakeBom\Command( new MakeBom\Options(), - 'make-bom' + 'CycloneDX:make-sbom' ), ]; } diff --git a/tests/PluginTest.php b/tests/PluginTest.php index 8e6b9ae6..3c382507 100644 --- a/tests/PluginTest.php +++ b/tests/PluginTest.php @@ -111,7 +111,7 @@ public function testMakeBomCommandIsRegistered(CommandProvider $commandProvider) self::assertCount(1, $commands); $command = reset($commands); self::assertInstanceOf(Command::class, $command); - self::assertSame('make-bom', $command->getName()); + self::assertSame('CycloneDX:make-sbom', $command->getName()); } #[\PHPUnit\Framework\Attributes\Depends('testPluginImplementsRequiredInterfaces')]