ConstraintTrait.php

@@ -12,9 +12,8 @@
 namespace Symfony\Bridge\PhpUnit;
 
 use PHPUnit\Framework\Constraint\Constraint;
-use ReflectionClass;
 
-$r = new ReflectionClass(Constraint::class);
+$r = new \ReflectionClass(Constraint::class);
 if ($r->getProperty('exporter')->isProtected()) {
     trait ConstraintTrait
     {

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2023 Fabien Potencier
+Copyright (c) 2014-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Tests/DeprecationErrorHandler/ConfigurationTest.php

@@ -179,7 +179,7 @@ public function testItCanTellWhetherToDisplayAStackTrace()
         $this->assertTrue($configuration->shouldDisplayStackTrace('interesting'));
     }
 
-    public function provideItCanBeDisabled(): array
+    public static function provideItCanBeDisabled(): array
     {
         return [
             ['disabled', false],
@@ -248,7 +248,7 @@ public function testToleratesForIndividualGroups(string $deprecationsHelper, arr
         }
     }
 
-    public function provideDataForToleratesForGroup() {
+    public static function provideDataForToleratesForGroup() {
 
         yield 'total threshold not reached' => ['max[total]=1', [
             'unsilenced' => 0,
@@ -482,10 +482,24 @@ public function testBaselineFileWriteError()
     {
         $filename = $this->createFile();
         chmod($filename, 0444);
-        $this->expectError();
-        $this->expectErrorMessageMatches('/[Ff]ailed to open stream: Permission denied/');
         $configuration = Configuration::fromUrlEncodedString('generateBaseline=true&baselineFile='.urlencode($filename));
-        $configuration->writeBaseline();
+
+        $this->expectException(\ErrorException::class);
+        $this->expectExceptionMessageMatches('/[Ff]ailed to open stream: Permission denied/');
+
+        set_error_handler(static function (int $errno, string $errstr, string $errfile = null, int $errline = null): bool {
+            if ($errno & (E_WARNING | E_WARNING)) {
+                throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
+            }
+
+            return false;
+        });
+
+        try {
+            $configuration->writeBaseline();
+        } finally {
+            restore_error_handler();
+        }
     }
 
     protected function setUp(): void

Tests/DeprecationErrorHandler/DeprecationTest.php

@@ -97,7 +97,7 @@ public function testItMutesOnlySpecificErrorMessagesWhenTheCallingCodeIsInPhpuni
         $this->assertSame($muted, $deprecation->isMuted());
     }
 
-    public function mutedProvider()
+    public static function mutedProvider()
     {
         yield 'not from phpunit, and not a whitelisted message' => [
             false,
@@ -147,7 +147,7 @@ public function testItTakesMutesDeprecationFromPhpUnitFiles()
         $this->assertTrue($deprecation->isMuted());
     }
 
-    public function providerGetTypeDetectsSelf()
+    public static function providerGetTypeDetectsSelf()
     {
         return [
             'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', __FILE__],
@@ -182,7 +182,7 @@ public function testGetTypeDetectsSelf(string $expectedType, string $message, st
         $this->assertSame($expectedType, $deprecation->getType());
     }
 
-    public function providerGetTypeUsesRightTrace()
+    public static function providerGetTypeUsesRightTrace()
     {
         $vendorDir = self::getVendorDir();
         $fakeTrace = [

Tests/ExpectDeprecationTraitTest.php

@@ -33,6 +33,7 @@ public function testOne()
      * Do not remove this test in the next major version.
      *
      * @group legacy
+     *
      * @runInSeparateProcess
      */
     public function testOneInIsolation()

Tests/FailTests/ExpectDeprecationTraitTestFail.php

@@ -39,6 +39,7 @@ public function testOne()
      * Do not remove this test in the next major version.
      *
      * @group legacy
+     *
      * @runInSeparateProcess
      */
     public function testOneInIsolation()