fix: Remove obsolete resource typing #44658
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
come-nc
force-pushed
the
fix/migrate-away-from-resource-type
branch
from
5ba403a
to
cd68ed3
Compare
In PHP>=8.1, LDAP and FTP resources are always typed objects Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Directly copied stubs for php ext folder from PHP-8.1 branch Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
come-nc
force-pushed
the
fix/migrate-away-from-resource-type
branch
from
f082338
to
8177fc8
Compare
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
come-nc
added
3. to review
come-nc
requested review from
blizzz,
a team,
icewind1991,
yemkareems,
sorbaugh,
nickvergessen and
kesselb
and removed request for
a team
blizzz
reviewed
Apr 16, 2024
| } while (($state === self::LRESULT_PROCESSED_SKIP | ||
| || $this->ldap->isResource($entry)) | ||
| && ($dnReadLimit === 0 || $dnReadCount < $dnReadLimit)); | ||
| } while ($dnReadLimit === 0 || $dnReadCount < $dnReadLimit); |
There was a problem hiding this comment.
You are not taking $state into account anymore. Is that intended?
There was a problem hiding this comment.
The call to $this->ldap->isResource($entry) cannot return false, by typing, so the $state was not taken into account before either. If this is/was a bug, we can change the condition.
What do you think?
There was a problem hiding this comment.
Right. I was a bit puzzled also because the local $state var was not removed (NaaS). All good.
blizzz
approved these changes
Apr 16, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
In PHP>=8.1, LDAP and FTP resources are always typed objects
TODO
Checklist