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

[tests-only] Update composer.json #2539

Merged
merged 2 commits into from
Mar 30, 2022
Merged

[tests-only] Update composer.json #2539

merged 2 commits into from
Mar 30, 2022

Conversation

micbar
Copy link
Member

@micbar micbar commented Feb 14, 2022

Description

Fixes a naming collision. The go modules try to use the vendor folder from the test php deps.

Solution: Change the name

@update-docs
Copy link

update-docs bot commented Feb 14, 2022

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@micbar micbar changed the title Update composer.json [tests-only] Update composer.json Feb 14, 2022
phil-davis
phil-davis previously approved these changes Feb 14, 2022
@phil-davis
Copy link
Contributor

Note: going down from PHP 7.4 to min 7.2 is OK. But in practice, I think that the test code has has PHP 7.3 and/or 7.4 parameter and return type declarations etc added to it. So the test code might not actually run with PHP 7.2.

@micbar
Copy link
Member Author

micbar commented Feb 14, 2022

I don't want to go down, i just took the composer.json from the edge branch and modified it.

@micbar
Copy link
Member Author

micbar commented Feb 14, 2022

fixed

@phil-davis
Copy link
Contributor

I don't want to go down, i just took the composer.json from the edge branch and modified it.

I am surprised. master gets merged into edge every few weeks, so composer.json should get updated in edge. If that is not happening, then I might make a PR to the edge branch to apply the PHP 7.4 change.

@micbar
Copy link
Member Author

micbar commented Feb 28, 2022

@ishank011 @labkode this should be merged to master to prevent collisions with the vendor folders from php deps and golang deps.

@wkloucek
Copy link
Contributor

@ishank011 @labkode can we please have this merged?

@ishank011 ishank011 merged commit 64e4344 into master Mar 30, 2022
@ishank011 ishank011 deleted the name-vendor branch March 30, 2022 07:21
Daniel-WWU-IT pushed a commit to Daniel-WWU-IT/reva that referenced this pull request Apr 12, 2022
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.

4 participants