Rename "PhpComposer" to just "Composer"

This implicitly fixes the mapping in GitLabLicenseModelMapper and Identifier which are already using the "Composer", as that simply is the common name. Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Dec 18, 2020 · 3db97fe · 3db97fe
1 parent 5dea2dd
commit 3db97fe
Show file tree

Hide file tree

Showing 31 changed files with 216 additions and 216 deletions.
diff --git a/.ort.yml b/.ort.yml
@@ -55,7 +55,7 @@ curations:
     reason: "DATA_OF"
     comment: "This file contains official SPDX.org license ids. SPDX is licensed under\
       \ CC0-1.0, see https://github.com/spdx/license-list-XML/blob/master/package.json#L33"
-  - path: "analyzer/src/funTest/assets/projects/synthetic/php-composer/{empty-deps,lockfile,no-lockfile,no-deps,with-provide,with-replace}/composer.phar"
+  - path: "analyzer/src/funTest/assets/projects/synthetic/composer/{empty-deps,lockfile,no-lockfile,no-deps,with-provide,with-replace}/composer.phar"
     concluded_license: "MIT"
     reason: "DATA_OF"
     comment: "These files are part of PHP Composer and include a mapping from human\

diff --git a/README.md b/README.md
@@ -314,6 +314,7 @@ Currently, the following package managers are supported:
 * [Bundler](http://bundler.io/) (Ruby)
 * [Cargo](https://doc.rust-lang.org/cargo/) (Rust)
 * [Carthage](https://github.com/Carthage/Carthage) (iOS / Cocoa)
+* [Composer](https://getcomposer.org/) (PHP)
 * [Conan](https://conan.io/) (C / C++, *experimental* as the VCS locations often times do not contain the actual source
   code, see [issue #2037](https://github.com/oss-review-toolkit/ort/issues/2037))
 * [dep](https://golang.github.io/dep/) (Go)
@@ -328,7 +329,6 @@ Currently, the following package managers are supported:
 * [NPM](https://www.npmjs.com/) (Node.js)
 * [NuGet](https://www.nuget.org/) (.NET, with currently some
   [limitations](https://github.com/oss-review-toolkit/ort/pull/1303#issue-253860146))
-* [Composer](https://getcomposer.org/) (PHP)
 * [PIP](https://pip.pypa.io/) (Python)
 * [Pipenv](https://pipenv.readthedocs.io/) (Python)
 * [Pub](https://pub.dev/) (Dart / Flutter)

diff --git a/.../php-composer-expected-output-no-deps.yml → ...etic/composer-expected-output-no-deps.yml b/.../php-composer-expected-output-no-deps.yml → ...etic/composer-expected-output-no-deps.yml
@@ -1,6 +1,6 @@
 ---
 project:
-  id: "PhpComposer:ort:composer-test-project:0.1.0"
+  id: "Composer:ort:composer-test-project:0.1.0"
   definition_file_path: "<REPLACE_DEFINITION_FILE_PATH>"
   declared_licenses:
   - "Apache-2.0"

diff --git a/...composer-expected-output-with-provide.yml → ...composer-expected-output-with-provide.yml b/...composer-expected-output-with-provide.yml → ...composer-expected-output-with-provide.yml
@@ -1,7 +1,7 @@
 ---
 project:
-  id: "PhpComposer:ort:composer-test-project:0.1.0"
-  definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/php-composer/with-provide/composer.json"
+  id: "Composer:ort:composer-test-project:0.1.0"
+  definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/composer/with-provide/composer.json"
   declared_licenses:
   - "Apache-2.0"
   - "MIT"
@@ -21,13 +21,13 @@ project:
   scopes:
   - name: "require"
     dependencies:
-    - id: "PhpComposer:ort:child:1.0.0"
-    - id: "PhpComposer:ort:virtual2:1.0.0"
+    - id: "Composer:ort:child:1.0.0"
+    - id: "Composer:ort:virtual2:1.0.0"
   - name: "require-dev"
     dependencies: []
 packages:
-- id: "PhpComposer:ort:child:1.0.0"
-  purl: "pkg:phpcomposer/ort/[email protected]"
+- id: "Composer:ort:child:1.0.0"
+  purl: "pkg:composer/ort/[email protected]"
   declared_licenses: []
   declared_licenses_processed: {}
   description: ""
@@ -52,8 +52,8 @@ packages:
     url: ""
     revision: ""
     path: ""
-- id: "PhpComposer:ort:virtual2:1.0.0"
-  purl: "pkg:phpcomposer/ort/[email protected]"
+- id: "Composer:ort:virtual2:1.0.0"
+  purl: "pkg:composer/ort/[email protected]"
   declared_licenses: []
   declared_licenses_processed: {}
   description: ""

diff --git a/...composer-expected-output-with-replace.yml → ...composer-expected-output-with-replace.yml b/...composer-expected-output-with-replace.yml → ...composer-expected-output-with-replace.yml
@@ -1,7 +1,7 @@
 ---
 project:
-  id: "PhpComposer:ort:composer-test-project:0.1.0"
-  definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/php-composer/with-replace/composer.json"
+  id: "Composer:ort:composer-test-project:0.1.0"
+  definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/composer/with-replace/composer.json"
   declared_licenses:
   - "Apache-2.0"
   - "MIT"
@@ -21,12 +21,12 @@ project:
   scopes:
   - name: "require"
     dependencies:
-    - id: "PhpComposer:ort:child2:1.0.0"
+    - id: "Composer:ort:child2:1.0.0"
   - name: "require-dev"
     dependencies: []
 packages:
-- id: "PhpComposer:ort:child2:1.0.0"
-  purl: "pkg:phpcomposer/ort/[email protected]"
+- id: "Composer:ort:child2:1.0.0"
+  purl: "pkg:composer/ort/[email protected]"
   declared_licenses: []
   declared_licenses_processed: {}
   description: ""