Merge branch '5.4' into 6.4

derrabus · derrabus · commit d042b5153a96 · 2024-03-15T13:52:45.000+01:00
* 5.4:
  [Filesystem] Fix str_contains deprecation
  [Security] Correctly initialize the voter property
  [FrameworkBundle] Fix typo
  Update `changed-translation-files` step with native git diff command
  [Lock] Check the correct SQLSTATE error code for MySQL
  [ErrorHandler] Fix `ErrorHandlerTest::tearDown()` visibility
  [Lock] compatiblity with redis cluster 7
  fix: typo
diff --git a/Tests/ErrorHandlerTest.php b/Tests/ErrorHandlerTest.php
@@ -31,7 +31,7 @@
  */
 class ErrorHandlerTest extends TestCase
 {
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $r = new \ReflectionProperty(ErrorHandler::class, 'exitCode');
         $r->setAccessible(true);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`*/`
`32`	`32`	`class ErrorHandlerTest extends TestCase`
`33`	`33`	`{`
`34`		`- public function tearDown(): void`
	`34`	`+ protected function tearDown(): void`
`35`	`35`	`{`
`36`	`36`	`$r = new \ReflectionProperty(ErrorHandler::class, 'exitCode');`
`37`	`37`	`$r->setAccessible(true);`