Skip to content

Commit fb80214

Browse files
authored
Merge pull request #127 from CycloneDX/issue-87/split
extracted "Core" library from source code to a new package: https://packagist.org/packages/cyclonedx/cyclonedx-library
2 parents 15216d1 + e354e83 commit fb80214

File tree

180 files changed

+212
-25476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+212
-25476
lines changed

HISTORY.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44

55
## unreleased
66

7+
* Changed
8+
* Core library
9+
* Was moved to an own package: https://packagist.org/packages/cyclonedx/cyclonedx-library
10+
The new external package/library is a one-to-one copy of the original code from this project, which now is a dependency/required of this project. So usage/leverage of the original code is still possible without any changes for third parties.
11+
See [#87] for details.
12+
13+
[#87]: https://github.com/CycloneDX/cyclonedx-php-composer/issues/87
14+
715
## 3.4.1 - 2021-09-16
816

917
* Fixed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ Help:
6868

6969
For a demo of _cyclonedx-php-composer_ see the [demo project][demo_readme].
7070

71+
## Internals
72+
73+
This Composer-Plugin utilizes the [CycloneDX library][cyclonedx-library] to generate the actual data structures.
74+
75+
This Composer-Plugin does not expose any additional _public_ api or classes - all code is marked as `@internal` and might change without any notice during version upgrades.
76+
7177
## Contributing
7278

7379
Feel free to open pull requests.
@@ -86,6 +92,8 @@ See the [LICENSE][license_file] file for the full license.
8692
[license_file]: https://github.com/CycloneDX/cyclonedx-php-composer/blob/master/LICENSE
8793
[demo_readme]: https://github.com/CycloneDX/cyclonedx-php-composer/blob/master/demo/README.md
8894

95+
[cyclonedx-library]: https://packagist.org/packages/cyclonedx/cyclonedx-library
96+
8997
[shield_gh-workflow-test]: https://img.shields.io/github/workflow/status/CycloneDX/cyclonedx-php-composer/PHP%20CI/master?logo=GitHub&logoColor=white "build"
9098
[shield_packagist-version]: https://img.shields.io/packagist/v/cyclonedx/cyclonedx-php-composer?logo=&logoColor=white "packagist"
9199
[shield_license]: https://img.shields.io/github/license/CycloneDX/cyclonedx-php-composer "license"

composer.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,11 @@
2727
],
2828
"require": {
2929
"php": "^7.3 || ^8.0",
30-
"ext-dom": "*",
31-
"ext-filter": "*",
32-
"ext-json": "*",
33-
"ext-libxml": "*",
3430
"composer-plugin-api": "^2.0",
35-
"package-url/packageurl-php": "^1.0",
36-
"swaggest/json-schema": "^0.12.38"
31+
"cyclonedx/cyclonedx-library": "^1.0",
32+
"package-url/packageurl-php": "^1.0"
3733
},
3834
"require-dev": {
39-
"ext-simplexml": "*",
4035
"composer/composer": "^2.0.13",
4136
"phpunit/phpunit": "9.5.10",
4237
"roave/security-advisories": "dev-latest"
@@ -60,13 +55,12 @@
6055
},
6156
"autoload": {
6257
"psr-4": {
63-
"CycloneDX\\Composer\\": "src/Composer/",
64-
"CycloneDX\\Core\\": "src/Core/"
58+
"CycloneDX\\Composer\\": "src/"
6559
}
6660
},
6761
"autoload-dev": {
6862
"psr-4": {
69-
"CycloneDX\\Tests\\": "tests"
63+
"Tests\\": "tests/"
7064
}
7165
},
7266
"prefer-stable": true,

demo/laravel-7.12.0/project/composer.lock

Lines changed: 90 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/local/project/composer.lock

Lines changed: 90 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)