Skip to content

[4.3] Fix issue Deprecated: trim(): Passing null on PHP 8.1 #38511

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

Merged
merged 9 commits into from
Sep 4, 2022
Merged

[4.3] Fix issue Deprecated: trim(): Passing null on PHP 8.1 #38511

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9e2d60
[4.2] Fix issue Deprecated: trim(): Passing null on PHP 8.1
sonvnn Aug 18, 2022
d40a098
[4.x] Fix Deprecated: htmlspecialchars(): Passing null on PHP 8.1
sonvnn Aug 18, 2022
23e244e
[4.2] Check if $path is null then throw an exception
sonvnn Aug 19, 2022
901a77a
Fix issue when path is null
sonvnn Aug 22, 2022
3ae8337
Merge branch '4.2-dev' into patch-1
laoneo Aug 22, 2022
7e61399
Merge branch '4.2-dev' into patch-1
laoneo Sep 2, 2022
daaf175
Merge branch '4.2-dev' into patch-1
laoneo Sep 3, 2022
03b0f3d
Merge branch '4.3-dev' into patch-1
laoneo Sep 4, 2022
c289a75
Update Path.php
laoneo Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions libraries/src/Filesystem/Path.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,17 @@ public static function clean($path, $ds = DIRECTORY_SEPARATOR)
);
}

if ($path === null) {
@trigger_error(
sprintf(
'Path can not be null, in 5.0 it will throw an exception',
__METHOD__
),
E_USER_DEPRECATED
);
$path = '';
}

$path = trim($path);

if (empty($path)) {
Expand Down