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.

Sign up for GitHub

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

Jump to bottom

Merge 3.1.x up into master #4476

Merged
merged 25 commits into from
Jan 21, 2021
Merged

Merge 3.1.x up into master #4476

merged 25 commits into from
Jan 21, 2021

Conversation

greg0ire
Copy link
Member

@greg0ire greg0ire commented Jan 8, 2021

No description provided.

kishore-hariram and others added 22 commits November 28, 2020 10:47
@kishore-hariram @morozov
No need of comma
c098382
@morozov
Merge pull request doctrine#3682 from kikilass/master
ecadac4 
No need of comma
@morozov
Remove unmaintained branches from the project metadata
a7b5f09
@morozov
Merge pull request doctrine#4453 from morozov/remove-unmaintained-bra…
98233ab 
…nches

Remove unmaintained branches from the project metadata
@trusek @morozov
MSSQL adds a redundant ORDER BY clause when with subquery with ORDER BY
7aac084
@morozov
Merge pull request doctrine#4438 from trusek/2.12.x
5a7befb 
doctrine#4437 MSSQL adds a redundant ORDER BY clause when with subquery with …
@greeflas @morozov
Fix and improve docs
a0b82ff
@morozov
Merge pull request doctrine#4260 from greeflas/fix_docs
373c24d 
Fix and improve docs
@beberlei
Add note about lost connections to UPGRADE guide.
2119044
@greg0ire
Merge pull request doctrine#4457 from beberlei/LostConnectionHint
7f6acbb 
Add note about lost connections to UPGRADE guide.
@nicwortel
Use the ramsey/composer-install action to install dependencies
4fb1862 
Follow-up of doctrine/.github#16.
@greg0ire
Merge pull request doctrine#4463 from nicwortel/ramsey-composer-install
4211e3c 
Use the ramsey/composer-install action to install dependencies
@morozov
Update PHPUnit to 9.5
f5984e1
@morozov
Merge pull request doctrine#4466 from morozov/phpunit-9.5
5ffd105 
Update PHPUnit to 9.5
@nicwortel
Remove composer.lock from version control
b40e327 
See https://github.com/orgs/doctrine/projects/7#card-50248076.
@nicwortel
Require the exact versions of development tools
02fbb3d 
This prevents randomly failing builds in case one of the dependencies releases
an unintentional BC break.
See https://github.com/doctrine/dbal/pull/4464/files#r542180416 for more
information.
@greg0ire
Merge pull request doctrine#4464 from nicwortel/remove-composer-lock
ce3421e 
Remove composer.lock from version control
@greg0ire
Merge remote-tracking branch 'origin/2.12.x' into 3.0.x
78d4590
@greg0ire
Document possibly null property as such
d01c726
@greg0ire
Remove redundant casts
2f16c00
@greg0ire
Upgrade Psalm to 4.3.2
8acf030
@greg0ire
Ignore false positive
db6f73c 
$matchesCount cannot be false because false > 0 is false
@greg0ire
Copy link
Member Author

I need to merge 3.0 in 3.1 first

@greg0ire
Copy link
Member Author

@morozov do you understand what's up with AppVeyor? I don't…

I think the part that fails is appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')

because later we get the following:

Package name is required. Please pass at least one package name to install.
Command "cinst --params ""/InstallDir:C:\tools\php"" --ignore-checksums -y php --version" failed with exit code 1. Retrying 3 of 3

It does not make a lot of sense though, because php looks like a package name to be, but I think the part between parenthesis is supposed to output something and does not.

@morozov
Copy link
Member

morozov commented Jan 20, 2021 •
edited
Loading

@greg0ire last time I dealt with that, I spun up a Windows VM, installed Chocolatey there, and debugged those commands locally. At that time, there was a bug in choco search that made it not return anything although it was supposed to return a list. I believe it may be a problem as well.

See #3756.

@greg0ire
Copy link
Member Author

Thanks for digging that up! I added steps that run the choco search parts by themselves in more detail, hopefully it will help see if this is a similar issue.

@greg0ire
Copy link
Member Author

greg0ire commented Jan 20, 2021 •
edited
Loading

Ok so choco search php --exact --all-versions -r outputs php|8.0.1, but choco search php --exact --all-versions -r | select-string -pattern $env:php outputs nothing at all…
I don't know what that $env: part is about.

EDIT: ah I understand, $env:php resolves to 7.4, which is not found in the list. So… the issue would be that the list is too small? It looks exactly as if we are hitting chocolatey/choco#1843 again.

Oh but it looks the bugfix is only released in the beta version of chocolatey (https://github.com/chocolatey/chocolatey.org/issues/999#issuecomment-756373870)

@greg0ire greg0ire force-pushed the master branch 2 times, most recently from f4a9086 to 97bd5ee Compare January 20, 2021 20:32
@greg0ire greg0ire requested a review from morozov January 20, 2021 20:54
@greg0ire
Copy link
Member Author

Fixed by upgrading to the beta version.

@greg0ire greg0ire changed the title Merge 3.0.x up into master Merge 3.1.x up into master Jan 20, 2021
@morozov
Copy link
Member

morozov commented Jan 20, 2021

Please get rid of 9a41eae.

@greg0ire
Copy link
Member Author

ping @morozov

@greg0ire greg0ire merged commit 32e5b01 into doctrine:master Jan 21, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@morozov morozov morozov approved these changes

Assignees
No one assigned
Labels
Merge Up
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@greg0ire @morozov @kishore-hariram @trusek @greeflas @beberlei @nicwortel