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

Update master from 5.x #10803

Merged
merged 16 commits into from
Mar 9, 2024
Merged

Update master from 5.x #10803

merged 16 commits into from
Mar 9, 2024

Conversation

weirdan
Copy link
Collaborator

@weirdan weirdan commented Mar 9, 2024

  • Backport WeakMap iterator fix from master
  • fix PHP 8 tests running with wrong --php-version=/phpVersion= if not explicitly specified
  • set previous default setting for failing test temporarily
  • Allow the test fixed in Backport WeakMap iterator fix from master #10778
  • Use PHP_VERSION_ID instead of version_compare()
  • Namespace anonymous classes
  • Update CallMap for sqlsrv_connect and sqlsrv_errors to match reflection
  • CS fix
  • $resource parameter of mkdir() is nullable since PHP 7.3

weirdan and others added 15 commits March 3, 2024 13:45
@weirdan
Backport WeakMap iterator fix from master
edc123b 
Refs vimeo#10773
@weirdan
Merge pull request vimeo#10778 from weirdan/10773-fix-weakmap-iteration
9e905ec
@kkmuffme @weirdan
fix PHP 8 tests running with wrong --php-version=/phpVersion= if not …
963feb9 
…explicitly specified
@kkmuffme @weirdan
set previous default setting for failing test temporarily
0975c15 
Refs vimeo#10773
@weirdan
Allow the test fixed in vimeo#10778
64a3272
@weirdan
Use PHP_VERSION_ID instead of version_compare()
87e2af4 
As we do elsewhere
@weirdan
Merge pull request vimeo#10776 from kkmuffme/fix-php8-tests-use-wrong…
b061783 
…-analysis-version
@weirdan
Namespace anonymous classes
6b9b4b5 
Fixes vimeo#10755
@weirdan
Merge pull request vimeo#10779 from weirdan/10755-namespace-anon-classes
667a6a7
@theodorejb
Update CallMap for sqlsrv_connect and sqlsrv_errors to match reflection
3307124
@weirdan
Merge pull request vimeo#10781 from theodorejb/fix-sqlsrv-callmap
dca888c
@weirdan
CS fix
8e1aa46 
- trailing commas in calls with anon functions
- useless array docblock

Refs slevomat/coding-standard@8d0f603
Refs slevomat/coding-standard@6ea0278
@weirdan
Merge pull request vimeo#10801 from weirdan/fix-trailing-commas-after…
02b58a5 
…-anon-functions
@weirdan
$resource parameter of mkdir() is nullable since PHP 7.3
5c780c7 
Fixes vimeo#10796
@weirdan
Merge pull request vimeo#10802 from weirdan/10796-nullable-resource-f…
87f7101 
…or-mkdir
@weirdan weirdan added the release:internal The PR will be included in 'Internal changes' section of the release notes label Mar 9, 2024
@weirdan weirdan requested review from danog and orklah March 9, 2024 19:22
@weirdan weirdan marked this pull request as ready for review March 9, 2024 19:30
@weirdan weirdan merged commit ef3b018 into vimeo:master Mar 9, 2024
42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danog danog Awaiting requested review from danog

@orklah orklah Awaiting requested review from orklah

Assignees
No one assigned
Labels
release:internal The PR will be included in 'Internal changes' section of the release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@weirdan @kkmuffme @theodorejb