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

PHP84: ignore deprecated E_STRICT #4289

Merged
merged 5 commits into from
Oct 23, 2024
Merged

PHP84: ignore deprecated E_STRICT #4289

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb1c0ce
fix for php84 deprecated E_STRICT
sreichel Oct 18, 2024
c503803
baseline
sreichel Oct 18, 2024
a7cf73b
Update app/code/core/Mage/Core/functions.php
sreichel Oct 22, 2024
9ae0746
Merge branch 'main' into php8.4-e-strict
sreichel Oct 22, 2024
890869d
baseline
sreichel Oct 22, 2024
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
5 changes: 5 additions & 0 deletions .phpstan.dist.baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4230,6 +4230,11 @@ parameters:
count: 1
path: app/code/core/Mage/Core/functions.php

-
message: "#^Right side of && is always true\\.$#"
count: 1
path: app/code/core/Mage/Core/functions.php

-
message: "#^Variable \\$arguments might not be defined\\.$#"
count: 1
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Core/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function mageCoreErrorHandler($errno, $errstr, $errfile, $errline)
// PEAR specific message handling
if (stripos($errfile . $errstr, 'pear') !== false) {
// ignore strict and deprecated notices
if (($errno == E_STRICT) || ($errno == E_DEPRECATED)) {
if ((PHP_VERSION_ID < 80400 && $errno == E_STRICT) || ($errno == E_DEPRECATED)) {
return true;
}
// ignore attempts to read system files when open_basedir is set
Expand Down Expand Up @@ -165,7 +165,7 @@ function mageCoreErrorHandler($errno, $errstr, $errfile, $errline)
case E_USER_NOTICE:
$errorMessage .= 'User Notice';
break;
case E_STRICT:
case PHP_VERSION_ID < 80400 && E_STRICT:
sreichel marked this conversation as resolved.
Show resolved Hide resolved
sreichel marked this conversation as resolved.
Show resolved Hide resolved
$errorMessage .= 'Strict Notice';
break;
case E_RECOVERABLE_ERROR:
Expand Down
Loading