[2.x] Fix CI #363
Merged
[2.x] Fix CI #363
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Makes hacking on Graby more convenient. (cherry picked from commit 8ce0ec6)
PHP-CS-Fixer 3.17.0 enables new rules, let’s apply them to code. (partially cherry picked from commit 22ac9ca) Fix coding style with newer PHP-CS-Fixer - Fix newly detected `native_function_invocation` and `array_indentation` rule violations. - ~~Disable union_types option in `phpdoc_to_*_type` rules since we still support PHP 7.4.~~ Not relevant - Fix the following warning: > Option "use_nullable_type_declaration" for rule "nullable_type_declaration_for_default_null_value" is deprecated and will be removed in version 4.0. Behaviour will follow default one. This happened was needed when I upgraded PHP-CS-Fixer from v3.51.0 to v3.64.0. (cherry picked from commit cd13fbb)
(cherry picked from commit aac2f73)
The `testWithEmptyReplaceString` page now returns 410 Gone HTTP response. Not including the rector config changes since I do not want to bother maintaining it in the 2.x branch. (partially cherry picked from commit bc5ec79)
Since we install `php-http/guzzle6-adapter` by default and our Guzzle 5 CI job just removes it and installs `php-http/guzzle5-adapter` instead, we already have a lockfile, which prevents installation of the older adapter:
Your requirements could not be resolved to an installable set of packages.
Problem 1
- Root composer.json requires php-http/guzzle5-adapter * -> satisfiable by php-http/guzzle5-adapter[dev-master, v0.1.0, ..., v0.6.0, v1.0.0, v1.0.1, 2.0.0, 2.0.x-dev].
- guzzlehttp/guzzle[5.1.0, ..., 5.2.0] require guzzlehttp/ringphp ~1.0 -> satisfiable by guzzlehttp/ringphp[1.0.0, ..., 1.1.x-dev].
- guzzlehttp/guzzle[5.3.0, ..., 5.3.1] require guzzlehttp/ringphp ^1.1 -> satisfiable by guzzlehttp/ringphp[1.1.0, 1.1.1, 1.1.x-dev].
- guzzlehttp/guzzle[5.3.2, ..., 5.3.x-dev] require react/promise ^2.2 -> found react/promise[v2.2.0, ..., 2.x-dev] but the package is fixed to v3.2.0 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.
- guzzlehttp/ringphp[1.0.0, ..., 1.1.x-dev] require react/promise ~2.0 -> found react/promise[v2.0.0, ..., 2.x-dev] but the package is fixed to v3.2.0 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.
- php-http/guzzle5-adapter v0.1.0 requires php-http/discovery ^0.1 -> found php-http/discovery[v0.1.0, v0.1.1] but it conflicts with your root composer.json require (^1.19).
- php-http/guzzle5-adapter v0.1.1 requires php-http/httplug ^1.0.0-beta -> found php-http/httplug[v1.0.0-beta, v1.0.0-RC1, v1.0.0, v1.1.0] but it conflicts with your root composer.json require (^2.4).
- php-http/guzzle5-adapter[v0.2.0, ..., v0.6.0, v1.0.0, ..., v1.0.1] require php-http/httplug ^1.0 -> found php-http/httplug[v1.0.0-alpha, ..., v1.1.0] but it conflicts with your root composer.json require (^2.4).
- php-http/guzzle5-adapter[dev-master, 2.0.0, ..., 2.0.x-dev] require guzzlehttp/guzzle ^5.1 -> satisfiable by guzzlehttp/guzzle[5.1.0, ..., 5.3.x-dev].
On master we have removed it in 49939fb. But here, we still want to support it so let’s force the installation using `php-http/guzzle6-adapter`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picking backwards compatible changes from master.