Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add documentation on platform dependencies #10313

Merged
merged 6 commits into from Nov 27, 2021

Conversation

helhum
Copy link
Contributor

@helhum helhum commented Nov 25, 2021

No description provided.

@helhum
Copy link
Contributor Author

helhum commented Nov 25, 2021

Updated version of #9965

@helhum helhum force-pushed the composer-package-version branch 2 times, most recently from 1afadf7 to 092b2c1 Compare November 25, 2021 17:35
@Seldaek Seldaek added this to the 2.2 milestone Nov 26, 2021
Copy link
Member

@naderman naderman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the docs, I know I edited a lot, but really wouldn't have been this easy if you hadn't already provided all the content ;-)

doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
@naderman
Copy link
Member

Eh I see Jordi didn't wait for me to actually review as he asked, so my changes conflict with some of his. So ideally revert whatever @Seldaek tweaked in the docs and then just apply my suggestions?

@helhum
Copy link
Contributor Author

helhum commented Nov 26, 2021

Thanks for the doc updates. I can now take care integrating them cleanly, resolving the conflicts. What I wasn't able to figure out is what PHPStan's complaint is about. So that will be something you'll need to fix in the end.

@helhum
Copy link
Contributor Author

helhum commented Nov 26, 2021

@naderman I integrated your suggestions now (thanks all of them made a lot of sense), merged with @Seldaek changes where applicable and fixed some additional typos that I found after that.
Since PHPStan is also happy now, I think this is good to go as well?

@naderman
Copy link
Member

@helhum great thanks!

doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
doc/articles/composer-platform-dependencies.md Outdated Show resolved Hide resolved
Co-authored-by: Nils Adermann <naderman@naderman.de>
@Seldaek Seldaek merged commit ace8a17 into composer:main Nov 27, 2021
@Seldaek
Copy link
Member

Seldaek commented Nov 27, 2021

Thanks everyone!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants