Skip to content

Support PHP 8.1 - First batch#29432

Merged
PVince81 merged 17 commits intomasterfrom
fix/support-php-8.1
Nov 23, 2021
Merged

Support PHP 8.1 - First batch#29432
PVince81 merged 17 commits intomasterfrom
fix/support-php-8.1

Conversation

@come-nc
Copy link
Contributor

@come-nc come-nc commented Oct 25, 2021

Related to #29287

@come-nc come-nc added 2. developing Work in progress php Pull requests that update Php code labels Oct 25, 2021
@come-nc come-nc self-assigned this Oct 25, 2021
@come-nc come-nc force-pushed the fix/support-php-8.1 branch 4 times, most recently from 3b00e23 to 44a818d Compare October 26, 2021 10:12
@come-nc come-nc changed the title Support PHP 8.1 Support PHP 8.1 - First batch Oct 26, 2021
@come-nc come-nc force-pushed the fix/support-php-8.1 branch from 44a818d to 28ce215 Compare October 26, 2021 12:13
@come-nc come-nc marked this pull request as ready for review October 26, 2021 12:19
@come-nc come-nc requested review from a team, PVince81, nickvergessen and skjnldsv and removed request for a team October 26, 2021 12:20
@come-nc
Copy link
Contributor Author

come-nc commented Oct 26, 2021

This is a first batch that can be merged.
This does not fix support for 8.1 yet which is why I removed the commit allowing to run nextcloud on 8.1.
This does fix image tests on PHP 8.0 which are now enabled.
It also fixes psalm errors.
The main focus was on core here, next PR will be focused on apps.

CarlSchwan
CarlSchwan approved these changes Oct 26, 2021
View reviewed changes
Copy link
Member

@CarlSchwan CarlSchwan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice code cleaning :)

@skjnldsv skjnldsv added this to the Nextcloud 24 milestone Oct 26, 2021
@skjnldsv
Copy link
Member

skjnldsv commented Oct 26, 2021

Not for 23 though, too much changes I think

@come-nc come-nc added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 26, 2021
This was referenced Oct 28, 2021
Closed
Merged
@come-nc come-nc force-pushed the fix/support-php-8.1 branch from 28ce215 to c496954 Compare November 2, 2021 10:04
@come-nc
Fix ArrayAccess and JsonSerializable return types
113756d 
First round of modifications for PHP 8.1

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix Iterator return types
af7bf98 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix Guzzle function calls
66bdda5 
Since 1.7.0 and 2.0 these functions are turned into static methods.
See https://github.com/guzzle/psr7#upgrading-from-function-api

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix test class names
bc3acfc 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix DateTime constructor calls with null
3a1b374 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix type errors
008b79d 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
come-nc added 11 commits November 23, 2021 09:28
@come-nc
Fix FolderTest calls to Mountpoint constructor with wrong type
bb9c099 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix Encryption tests on PHP 8.1
0655315 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix warning about passing null to rtrim
9d170f1 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix warning about passing null to substr_count
ee7ef77 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix TempManager test errors about passing null to is_dir
25fa0b8 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Make mock config return default value to fix warnings
cd72045 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix tests and avoid PHP errors in them
8b271b8 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix errors in AvatarController when data() returns null
5a20e20 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix dav application tests and code for PHP 8.1
5cd5245 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix errors from files applications tests on PHP 8.1
10dfded 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fix default value for $type in OC\DB\QueryBuilder\ExpressionBuilder\E…
18a91f0 
…xpressionBuilder::literal

This fixes PHP errors about passing null to PDO::quote second parameter.
We may want to change IExpressionBuilder as well?

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/support-php-8.1 branch from c496954 to 18a91f0 Compare November 23, 2021 08:29
PVince81
PVince81 approved these changes Nov 23, 2021
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good 👍

@PVince81 PVince81 merged commit fd487c1 into master Nov 23, 2021
@PVince81 PVince81 deleted the fix/support-php-8.1 branch November 23, 2021 14:41
@come-nc come-nc mentioned this pull request Nov 23, 2021
Merged
@EricThi EricThi mentioned this pull request Jan 26, 2022
Closed
8 tasks
@nickvergessen nickvergessen mentioned this pull request Mar 3, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PVince81 PVince81 PVince81 approved these changes

@CarlSchwan CarlSchwan CarlSchwan approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

Assignees

@come-nc come-nc

Labels

3. to review Waiting for reviews php Pull requests that update Php code

Projects

None yet

Milestone

Nextcloud 24

Development

Successfully merging this pull request may close these issues.

4 participants

@come-nc @skjnldsv @PVince81 @CarlSchwan