php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 21:41:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #20282: Fix compatibility with PHP 8.4: deprecated constant E_STRICT

Browse Source
This commit is contained in:
Viktor Khokhryakov
2024-12-06 13:31:20 +04:00
committed by GitHub
parent 80f2545cf1
commit 5df412df2c
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -13,6 +13,7 @@ Yii Framework 2 Change Log
- Enh #20268: Minor optimisation in `\yii\helpers\BaseArrayHelper::map` (chriscpty) - Enh #20268: Minor optimisation in `\yii\helpers\BaseArrayHelper::map` (chriscpty)
- Enh #20273: Remove unnecessary `paragonie/random_compat` dependency (timwolla) - Enh #20273: Remove unnecessary `paragonie/random_compat` dependency (timwolla)
- Chg #20276: Removed autogenerated migration phpdoc (userator) - Chg #20276: Removed autogenerated migration phpdoc (userator)
- Bug #20282: Fix compatibility with PHP 8.4: deprecated constant E_STRICT (Izumi-kun)
- Bug #20284: Revert punycode to 1.4.x which supports pre ES6 format (mtangoo) - Bug #20284: Revert punycode to 1.4.x which supports pre ES6 format (mtangoo)
- New #20279: Add to the `\yii\web\Request` CSRF validation by custom HTTP header (olegbaturin) - New #20279: Add to the `\yii\web\Request` CSRF validation by custom HTTP header (olegbaturin)
- Enh #20279: Add to the `\yii\web\Request` `csrfHeader` property to configure a custom HTTP header for CSRF validation (olegbaturin) - Enh #20279: Add to the `\yii\web\Request` `csrfHeader` property to configure a custom HTTP header for CSRF validation (olegbaturin)

5
framework/base/ErrorException.php
View File

@ -124,15 +124,14 @@ class ErrorException extends \ErrorException
E_NOTICE => 'PHP Notice', E_NOTICE => 'PHP Notice',
E_PARSE => 'PHP Parse Error', E_PARSE => 'PHP Parse Error',
E_RECOVERABLE_ERROR => 'PHP Recoverable Error', E_RECOVERABLE_ERROR => 'PHP Recoverable Error',
E_STRICT => 'PHP Strict Warning',
E_USER_DEPRECATED => 'PHP User Deprecated Warning', E_USER_DEPRECATED => 'PHP User Deprecated Warning',
E_USER_ERROR => 'PHP User Error', E_USER_ERROR => 'PHP User Error',
E_USER_NOTICE => 'PHP User Notice', E_USER_NOTICE => 'PHP User Notice',
E_USER_WARNING => 'PHP User Warning', E_USER_WARNING => 'PHP User Warning',
E_WARNING => 'PHP Warning', E_WARNING => 'PHP Warning',
self::E_HHVM_FATAL_ERROR => 'HHVM Fatal Error', self::E_HHVM_FATAL_ERROR => 'HHVM Fatal Error',
]; ] + (PHP_VERSION_ID < 80400 ? [E_STRICT => 'PHP Strict Warning'] : []);
return isset($names[$this->getCode()]) ? $names[$this->getCode()] : 'Error'; return $names[$this->getCode()] ?? 'Error';
} }
} }

9
tests/framework/base/ErrorExceptionTest.php
View File

@ -41,4 +41,13 @@ class ErrorExceptionTest extends TestCase
$this->assertEquals(__FUNCTION__, $e->getTrace()[0]['function']); $this->assertEquals(__FUNCTION__, $e->getTrace()[0]['function']);
} }
} }
public function testStrictError()
{
if (!defined('E_STRICT')) {
$this->markTestSkipped('E_STRICT has been removed.');
}
$e = new ErrorException('', @E_STRICT);
$this->assertEquals(PHP_VERSION_ID < 80400 ? 'PHP Strict Warning' : 'Error', $e->getName());
}
} }