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 5.x #10369

Merged
merged 91 commits into from
Nov 27, 2023
Merged

Merge 5.x #10369

merged 91 commits into from
Nov 27, 2023

Conversation

danog
Copy link
Collaborator

@danog danog commented Nov 13, 2023

No description provided.

dependabot bot and others added 21 commits October 23, 2023 07:36
@dependabot
Bump fkirc/skip-duplicate-actions from 5.3.0 to 5.3.1
dcec7ac 
Bumps [fkirc/skip-duplicate-actions](https://github.com/fkirc/skip-duplicate-actions) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/fkirc/skip-duplicate-actions/releases)
- [Commits](fkirc/skip-duplicate-actions@v5.3.0...v5.3.1)

---
updated-dependencies:
- dependency-name: fkirc/skip-duplicate-actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@kk-daniel
fix @param-out with named arguments
a375f44
@orklah
Merge pull request vimeo#10312 from trusting-thompson/named-param-out
ff5526d 
fix @param-out with named arguments
@orklah
Merge pull request vimeo#10313 from vimeo/dependabot/github_actions/f…
6e56990 
…kirc/skip-duplicate-actions-5.3.1

Bump fkirc/skip-duplicate-actions from 5.3.0 to 5.3.1
Narrow down get_browser returning array or object based on `$return…
6f32c72 
…_array` param
@orklah
Merge pull request vimeo#10314 from simonberger/narrow-get_browser-re…
2726ad4 
…turn-types

Narrow down `get_browser` returning array or object
@danog
Finalize all internal classes
ec23f99
@danog
Get rid of legacy 7.3 logic
07b45b8
@issidorov
Fix auto comletion by partial property or method
d6faff2
@issidorov
Fix auto-completion with declared static method by DocBlock
2f039f9
@kbond
allow symfony 7
31928c1
@orklah
Merge pull request vimeo#10335 from kbond/sf7
2e65d5f 
Allow Symfony 7
@orklah
Merge pull request vimeo#10320 from issidorov/completion-by-partial-p…
722fe6c 
…roperty-or-method

Fix auto completion by partial property or method
@orklah
Merge pull request vimeo#10319 from danog/rm_73
41acef5 
Get rid of legacy 7.3 logic
@orklah
Merge pull request vimeo#10318 from danog/finalize
7acc50e 
Finalize all internal classes
@ohader
Add documentation for @psalm-flow
e015b7f
@orklah
Merge pull request vimeo#10349 from ohader/docs/psalm-flow-5.x
5f07988 
Add documentation for @psalm-flow
@robchett
Add stubs for rdKafka
3578b42 
Fixes vimeo#3406
@greg0ire
Allow int keys when calling Redis methods
ba17015 
In 5bfc0f9, risky casting was invoked
as a way to show there is an issue here. However, it is not always
possible to use a string. For instance, there is no such thing as this
in PHP: ["1" => "whatever"]. If you try to create such an array, you
will obtain [1 => "whatever"] instead.

Ironically, this was copied in jetbrains/phpstorm, which is used in
PHPStan, which exhibited that false positive.

See JetBrains/phpstorm-stubs#1454
@orklah
Merge pull request vimeo#10355 from greg0ire/allow-int
0aa5050 
Allow int keys when calling Redis methods
@orklah
Merge pull request vimeo#10351 from robchett/rdkafka_stubs
b3ef6a0 
Add stubs for rdKafka
@danog danog added the release:internal The PR will be included in 'Internal changes' section of the release notes label Nov 13, 2023
@orklah
Copy link
Collaborator

orklah commented Nov 14, 2023

Thanks! There were a few failures in CI so I couldn't merge and I merged some PR in the meantime

@danog
Copy link
Collaborator Author

danog commented Nov 27, 2023

@orklah Should be good to merge, slightly tweaked the logic introduced by @issidorov in #10385 due to changes in the magic method logic that were made on master by #10361, now magic static methods should be returned as well when fetching instance methods (I suppose the order could be tweaked a bit, but it isn't inherently wrong because non-magic static methods are already returned by the current logic).

@danog
Copy link
Collaborator Author

danog commented Nov 27, 2023

Hmm it seems the circleci tests are actually failing due to #10361, ping @robchett

@danog
Copy link
Collaborator Author

danog commented Nov 27, 2023

@orklah can we merge this at least to fix the phar build on master

@danog
Copy link
Collaborator Author

danog commented Nov 27, 2023

Submitted php-standard-library/psalm-plugin#15 to fix the PSL issues upstream

@orklah
Copy link
Collaborator

orklah commented Nov 27, 2023

Thanks!

@orklah orklah merged commit 3295f17 into vimeo:master Nov 27, 2023
40 of 42 checks passed
@danog danog deleted the origin_master branch November 27, 2023 17:39
@robchett
Copy link
Contributor

@danog can you point me in the direction of the issue here? I'm not really sure what I'm looking for/at

@danog
Copy link
Collaborator Author

danog commented Nov 27, 2023

@robchett fixed the issue already in 2eed292

@robchett
Copy link
Contributor

Ah, thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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.

None yet