Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@bomoko
Copy link
Contributor

@bomoko bomoko commented Nov 23, 2021

closes #642

This is, as far as possible, a copy-pasta from the earlier PHP composer.lock parser. I'm still new to the code base, so I've tried to work out what needs to be changed/added, etc.

Thanks for taking the time to look at this.

signed off by Blaize M. Kaye: [email protected]

@spiffcs
Copy link
Contributor

spiffcs commented Nov 23, 2021

Thanks for the PR @bomoko! I'll take a look when I have some free cycles.

@wagoodman
Copy link
Contributor

wagoodman commented Nov 29, 2021

Nice work @bomoko --great follow up to #609. I made a couple of tweaks, but otherwise looks great 💯 :

  • Unexported the PHP types used for unmarshaling
  • Removed the unused V1 composer install.json type
  • Small rename of the PHP cataloger names

@wagoodman
Copy link
Contributor

One last change is needed before we can merge this, @bomoko; we require that all commits are signed before merging into the baseline (see CONTRIBUTING.md) . Shout out if you have any questions about this!

@bomoko
Copy link
Contributor Author

bomoko commented Nov 29, 2021

Thanks so much @wagoodman - I think I understand how to sign the previous commits if I rebase and amend with -S, does this seem right?
Problem with this is that I believe I end up signing your commits (whether I rebase on the branch directly, or if I cherry-pick into another branch). I'm a little unsure about how best to deal with that (or whether it's even a problem).

Is it a problem that I end up signing your commits? Or do the commits simply need to be signed?
Alternatively, I could make a new commit out of yours and sign that.
Any advice you could give here would be great.

@wagoodman
Copy link
Contributor

@bomoko indeed rebasing with -S will do the trick 👍 (it's OK if you end up signing my commits)

@bomoko
Copy link
Contributor Author

bomoko commented Nov 30, 2021

Awesome, thanks @wagoodman - since signing the commit changes the hashes, I think I'm going to need to push force the branch to get the history right. Any objections? (I can also open a new PR)

Edit: Let me just do it - if it's a faux pas I'll open up a new PR ;)

@wagoodman
Copy link
Contributor

@bomoko force push away! Our take on this is that commits on development branches are up to the author, so you can rearrange as you like. We tend to squash merge PRs into main in the end.

@wagoodman wagoodman merged commit 6af132e into anchore:main Nov 30, 2021
fengshunli pushed a commit to fengshunli/syft that referenced this pull request Jan 24, 2022
* Adds installed.json functionality and tests

Signed-off-by: Blaize Kaye <[email protected]>

* Adds php-installed-cataloger

Signed-off-by: Blaize Kaye <[email protected]>

* Changes fallback logic

Signed-off-by: Blaize Kaye <[email protected]>

* Adds image tests for installed.json composer packages

Signed-off-by: Blaize Kaye <[email protected]>

* tweak PHP cataloger names

Signed-off-by: Alex Goodman <[email protected]>

* unexport PHP types and fix CLI tests

Signed-off-by: Alex Goodman <[email protected]>

* rename PHP cataloger file

Signed-off-by: Alex Goodman <[email protected]>

Co-authored-by: Alex Goodman <[email protected]>
Signed-off-by: fsl <[email protected]>
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
* Adds installed.json functionality and tests

Signed-off-by: Blaize Kaye <[email protected]>

* Adds php-installed-cataloger

Signed-off-by: Blaize Kaye <[email protected]>

* Changes fallback logic

Signed-off-by: Blaize Kaye <[email protected]>

* Adds image tests for installed.json composer packages

Signed-off-by: Blaize Kaye <[email protected]>

* tweak PHP cataloger names

Signed-off-by: Alex Goodman <[email protected]>

* unexport PHP types and fix CLI tests

Signed-off-by: Alex Goodman <[email protected]>

* rename PHP cataloger file

Signed-off-by: Alex Goodman <[email protected]>

Co-authored-by: Alex Goodman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support for PHP/composer installed.json files (i.e. syft php image support)

3 participants