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

Switch to cweagans/composer-patches #2307

Merged

Conversation

herndlm
Copy link
Contributor

@herndlm herndlm commented Mar 27, 2023

Alternative to #2304

upsides:

  • supports PHP 5.3+ in v1 which receives still bug and security fixes

downsides:

  • v2 (going to be released soon) will need PHP 8+
  • does not support version-conditional patches, e.g. the paratest patch for PHP 7.2 will always fail and be skipped

docs are at https://github.com/cweagans/composer-patches/blob/1.x/README.md

@herndlm herndlm force-pushed the switch-to-cweagans-composer-patches branch from 7bcf2d9 to 7c28ae2 Compare April 5, 2023 08:54
@herndlm
Copy link
Contributor Author

herndlm commented Apr 5, 2023

I still don't like the patch failures because of non-matching PHP version, but apart from that it is as good as it gets I suppose.

@herndlm herndlm marked this pull request as ready for review April 5, 2023 08:56
@ondrejmirtes
Copy link
Member

If there's something in patches that isn't supported (like @version ^4.0?), please remove those lines.

@phpstan-bot
Copy link
Collaborator

This pull request has been marked as ready for review.

@herndlm
Copy link
Contributor Author

herndlm commented Apr 5, 2023

done, just to make sure that I communicate this properly. Because of the missing PHP version info support in patches, it results in the following with every composer install (except on PHP 7.2 of course :)):

Gathering patches for dependencies. This might take a minute.
  - Installing brianium/paratest (v6.6.2): Extracting archive
  - Applying patches for brianium/paratest
    patches/paratest.patch (0)
   Could not apply patch! Skipping. The error was: Cannot apply patch patches/paratest.patch

apart from that all seems to be fine though.

@ondrejmirtes ondrejmirtes merged commit 5007e8d into phpstan:1.10.x Apr 5, 2023
@ondrejmirtes
Copy link
Member

Thank you!

@herndlm herndlm deleted the switch-to-cweagans-composer-patches branch April 5, 2023 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants