Merge pull request #1320 from kukulich/mutants

Ocramius · web-flow · commit 0fe5e21faedf · 2023-02-04T14:10:23.000+01:00
100 % mutation score
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Better Reflection
 =================
 
-[![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2FRoave%2FBetterReflection%2F6.0.x)](https://dashboard.stryker-mutator.io/reports/github.com/Roave/BetterReflection/6.0.x)
+[![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2FRoave%2FBetterReflection%2F6.6.x)](https://dashboard.stryker-mutator.io/reports/github.com/Roave/BetterReflection/6.6.x)
 [![Type Coverage](https://shepherd.dev/github/Roave/BetterReflection/coverage.svg)](https://shepherd.dev/github/Roave/BetterReflection)
 [![Latest Stable Version](https://poser.pugx.org/roave/better-reflection/v/stable)](https://packagist.org/packages/roave/better-reflection)
 [![License](https://poser.pugx.org/roave/better-reflection/license)](https://packagist.org/packages/roave/better-reflection)
diff --git a/composer.lock b/composer.lock
diff --git a/infection.json.dist b/infection.json.dist
@@ -13,6 +13,6 @@
     "mutators": {
         "@default": true
     },
-    "minMsi": 99,
+    "minMsi": 100,
     "minCoveredMsi": 100
 }
diff --git a/src/SourceLocator/Type/AutoloadSourceLocator/FileReadTrapStreamWrapper.php b/src/SourceLocator/Type/AutoloadSourceLocator/FileReadTrapStreamWrapper.php
@@ -72,7 +72,7 @@ public static function withStreamWrapperOverride(
             $result = $executeMeWithinStreamWrapperOverride();
         } finally {
             foreach ($streamWrapperProtocols as $protocol) {
-                stream_wrapper_restore($protocol);
+                @stream_wrapper_restore($protocol);
             }
 
             self::$registeredStreamWrapperProtocols = null;
@@ -101,6 +101,7 @@ public function stream_open($path, $mode, $options, &$opened_path): bool
     {
         self::$autoloadLocatedFile = $path;
 
+        // @infection-ignore-all FalseValue
         return false;
     }
 
@@ -130,7 +131,7 @@ public function url_stat($path, $flags): array|bool
             stream_wrapper_restore($protocol);
         }
 
-        if ($flags & STREAM_URL_STAT_QUIET) {
+        if (($flags & STREAM_URL_STAT_QUIET) === STREAM_URL_STAT_QUIET) {
             $result = @stat($path);
         } else {
             $result = stat($path);
diff --git a/src/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerJson.php b/src/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerJson.php
@@ -25,6 +25,7 @@
 use function is_array;
 use function is_dir;
 use function is_file;
+use function is_string;
 use function json_decode;
 use function realpath;
 
@@ -61,8 +62,11 @@ public function __invoke(string $installationPath, Locator $astLocator): SourceL
             throw MissingComposerJson::inProjectPath($installationPath);
         }
 
+        $composerJsonContent = file_get_contents($composerJsonPath);
+        assert(is_string($composerJsonContent));
+
         /** @psalm-var array{autoload: ComposerAutoload}|null $composer */
-        $composer = json_decode((string) file_get_contents($composerJsonPath), true);
+        $composer = json_decode($composerJsonContent, true);
 
         if (! is_array($composer)) {
             throw FailedToParseJson::inFile($composerJsonPath);
diff --git a/src/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerJsonAndInstalledJson.php b/src/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerJsonAndInstalledJson.php
@@ -27,6 +27,7 @@
 use function is_array;
 use function is_dir;
 use function is_file;
+use function is_string;
 use function json_decode;
 use function realpath;
 use function rtrim;
@@ -52,8 +53,11 @@ public function __invoke(string $installationPath, Locator $astLocator): SourceL
             throw MissingComposerJson::inProjectPath($installationPath);
         }
 
+        $composerJsonContent = file_get_contents($composerJsonPath);
+        assert(is_string($composerJsonContent));
+
         /** @psalm-var Composer|null $composer */
-        $composer  = json_decode((string) file_get_contents($composerJsonPath), true);
+        $composer  = json_decode($composerJsonContent, true);
         $vendorDir = $composer['config']['vendor-dir'] ?? 'vendor';
         $vendorDir = rtrim($vendorDir, '/');
 
@@ -63,8 +67,11 @@ public function __invoke(string $installationPath, Locator $astLocator): SourceL
             throw MissingInstalledJson::inProjectPath($realInstallationPath . '/' . $vendorDir);
         }
 
+        $jsonContent = file_get_contents($installedJsonPath);
+        assert(is_string($jsonContent));
+
         /** @psalm-var array{packages: list<mixed[]>}|list<mixed[]>|null $installedJson */
-        $installedJson = json_decode((string) file_get_contents($installedJsonPath), true);
+        $installedJson = json_decode($jsonContent, true);
 
         if (! is_array($composer)) {
             throw FailedToParseJson::inFile($composerJsonPath);
diff --git a/src/SourceLocator/Type/Composer/Factory/MakeLocatorForInstalledJson.php b/src/SourceLocator/Type/Composer/Factory/MakeLocatorForInstalledJson.php
@@ -27,6 +27,7 @@
 use function is_array;
 use function is_dir;
 use function is_file;
+use function is_string;
 use function json_decode;
 use function realpath;
 use function rtrim;
@@ -52,8 +53,11 @@ public function __invoke(string $installationPath, Locator $astLocator): SourceL
             throw MissingComposerJson::inProjectPath($installationPath);
         }
 
+        $composerJsonContent = file_get_contents($composerJsonPath);
+        assert(is_string($composerJsonContent));
+
         /** @psalm-var Composer|null $composer */
-        $composer  = json_decode((string) file_get_contents($composerJsonPath), true);
+        $composer  = json_decode($composerJsonContent, true);
         $vendorDir = $composer['config']['vendor-dir'] ?? 'vendor';
         $vendorDir = rtrim($vendorDir, '/');
 
@@ -63,8 +67,11 @@ public function __invoke(string $installationPath, Locator $astLocator): SourceL
             throw MissingInstalledJson::inProjectPath($realInstallationPath . '/' . $vendorDir);
         }
 
+        $jsonContent = file_get_contents($installedJsonPath);
+        assert(is_string($jsonContent));
+
         /** @var array{packages: list<mixed[]>}|list<mixed[]>|null $installedJson */
-        $installedJson = json_decode((string) file_get_contents($installedJsonPath), true);
+        $installedJson = json_decode($jsonContent, true);
 
         if (! is_array($installedJson)) {
             throw FailedToParseJson::inFile($installedJsonPath);
diff --git a/src/SourceLocator/Type/FileIteratorSourceLocator.php b/src/SourceLocator/Type/FileIteratorSourceLocator.php
@@ -53,6 +53,7 @@ public function __construct(Iterator $fileInfoIterator, private Locator $astLoca
     /** @throws InvalidFileLocation */
     private function getAggregatedSourceLocator(): AggregateSourceLocator
     {
+        // @infection-ignore-all Coalesce: There's no difference, it's just optimization
         return $this->aggregateSourceLocator
             ?? $this->aggregateSourceLocator = new AggregateSourceLocator(array_values(array_filter(array_map(
                 function (SplFileInfo $item): SingleFileSourceLocator|null {
diff --git a/src/Util/FileHelper.php b/src/Util/FileHelper.php
@@ -6,6 +6,7 @@
 
 use function assert;
 use function preg_match;
+use function sprintf;
 use function str_replace;
 
 use const DIRECTORY_SEPARATOR;
@@ -43,13 +44,14 @@ public static function normalizeSystemPath(string $originalPath): string
             [, $scheme, $path] = $matches;
         }
 
+        // @infection-ignore-all Identical Needed only on Windows
         if (DIRECTORY_SEPARATOR === '\\') {
             // @infection-ignore-all UnwrapStrReplace Needed only on Windows
             $path = str_replace('/', DIRECTORY_SEPARATOR, $path);
         }
 
         assert($path !== '');
 
-        return ($scheme !== null ? $scheme . '://' : '') . $path;
+        return ($scheme !== null ? sprintf('%s://', $scheme) : '') . $path;
     }
 }
diff --git a/test/unit/Fixture/InitializedProperties.php b/test/unit/Fixture/InitializedProperties.php
@@ -24,6 +24,6 @@ public function __construct()
 
     public function __get($property)
     {
-        throw new Error();
+        throw new Error('Removed property');
     }
 }
diff --git a/test/unit/Reflection/ReflectionPropertyTest.php b/test/unit/Reflection/ReflectionPropertyTest.php
@@ -778,6 +778,7 @@ public function testIsInitializedThrowsError(): void
         $classReflection = $this->reflector->reflectClass(InitializedProperties::class);
 
         self::expectException(Error::class);
+        self::expectExceptionMessage('Removed property');
         $classReflection->getProperty('toBeRemoved')->isInitialized($object);
     }
 
diff --git a/test/unit/SourceLocator/Type/AutoloadSourceLocator/FileReadTrapStreamWrapperTest.php b/test/unit/SourceLocator/Type/AutoloadSourceLocator/FileReadTrapStreamWrapperTest.php
@@ -13,9 +13,13 @@
 
 use function file_get_contents;
 use function is_file;
+use function restore_error_handler;
+use function set_error_handler;
 use function sprintf;
 use function uniqid;
 
+use const E_WARNING;
+
 /**
  * @covers \Roave\BetterReflection\SourceLocator\Type\AutoloadSourceLocator\FileReadTrapStreamWrapper
  *
@@ -177,28 +181,38 @@ static function () use ($thrown): string {
 
     public function testWillRaiseWarningWhenTryingToCheckFileExistenceForNonExistingFileWithoutSilencingModifier(): void
     {
+        set_error_handler(static function (int $errno, string $errstr): bool {
+            throw new Exception($errstr, $errno);
+        }, E_WARNING);
+
         $nonExistingFile = __DIR__ . uniqid('non-existing-file', true);
 
-        self::assertSame(
-            'another value produced by the function',
-            FileReadTrapStreamWrapper::withStreamWrapperOverride(
-                static function () use ($nonExistingFile): string {
-                    if (is_file($nonExistingFile)) {
-                        throw new UnexpectedValueException('is_file() should report `false` for a non-existing file');
-                    }
+        self::expectExceptionMessageMatches('~stat\(\): stat failed for~');
 
-                    if (@file_get_contents($nonExistingFile) !== false) {
-                        throw new UnexpectedValueException('file_get_contents() should report `false` for a non-existing file');
-                    }
+        try {
+            self::assertSame(
+                'another value produced by the function',
+                FileReadTrapStreamWrapper::withStreamWrapperOverride(
+                    static function () use ($nonExistingFile): string {
+                        if (is_file($nonExistingFile)) {
+                            throw new UnexpectedValueException('is_file() should report `false` for a non-existing file');
+                        }
 
-                    return 'another value produced by the function';
-                },
-                ['file'],
-            ),
-        );
+                        if (file_get_contents($nonExistingFile) !== false) {
+                            throw new UnexpectedValueException('file_get_contents() should report `false` for a non-existing file');
+                        }
 
-        self::assertNull(FileReadTrapStreamWrapper::$autoloadLocatedFile);
-        self::assertNotEmpty(file_get_contents(__FILE__), 'Stream wrapper was removed, file reads work again');
+                        return 'another value produced by the function';
+                    },
+                    ['file'],
+                ),
+            );
+        } finally {
+            self::assertNull(FileReadTrapStreamWrapper::$autoloadLocatedFile);
+            self::assertNotEmpty(file_get_contents(__FILE__), 'Stream wrapper was removed, file reads work again');
+
+            restore_error_handler();
+        }
     }
 
     public function testUrlStatThrowsExceptionWhenCalledDirectly(): void
diff --git a/test/unit/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerInstalledJsonTest.php b/test/unit/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerInstalledJsonTest.php
@@ -268,6 +268,7 @@ public function testWillFailToProduceLocatorForProjectWithoutComposerJson(): voi
     public function testWillFailToProduceLocatorForProjectWithoutInstalledJson(): void
     {
         $this->expectException(MissingInstalledJson::class);
+        $this->expectExceptionMessageMatches('~^Could not locate a "composer/installed.json" file in "[^"]+[\\\\/]Assets[\\\\/]ComposerLocators[\\\\/]project-without-installed.json/vendor"$~');
 
         (new MakeLocatorForInstalledJson())
             ->__invoke(
diff --git a/test/unit/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerJsonAndInstalledJsonTest.php b/test/unit/SourceLocator/Type/Composer/Factory/MakeLocatorForComposerJsonAndInstalledJsonTest.php
@@ -320,6 +320,7 @@ public function testWillFailToProduceLocatorForProjectWithoutComposerJson(): voi
     public function testWillFailToProduceLocatorForProjectWithoutInstalledJson(): void
     {
         $this->expectException(MissingInstalledJson::class);
+        $this->expectExceptionMessageMatches('~^Could not locate a "composer/installed.json" file in "[^"]+[\\\\/]Assets[\\\\/]ComposerLocators[\\\\/]project-without-installed.json/vendor"$~');
 
         (new MakeLocatorForComposerJsonAndInstalledJson())
             ->__invoke(
diff --git a/test/unit/SourceLocator/Type/FileIteratorSourceLocatorTest.php b/test/unit/SourceLocator/Type/FileIteratorSourceLocatorTest.php
@@ -34,7 +34,7 @@ public function setUp(): void
             new RecursiveIteratorIterator(new RecursiveDirectoryIterator(
                 __DIR__ . '/../../Assets/DirectoryScannerAssets',
                 RecursiveDirectoryIterator::SKIP_DOTS,
-            )),
+            ), RecursiveIteratorIterator::SELF_FIRST),
             BetterReflectionSingleton::instance()->astLocator(),
         );
     }
diff --git a/test/unit/Util/FileHelperTest.php b/test/unit/Util/FileHelperTest.php
@@ -7,10 +7,6 @@
 use PHPUnit\Framework\TestCase;
 use Roave\BetterReflection\Util\FileHelper;
 
-use function strtr;
-
-use const DIRECTORY_SEPARATOR;
-
 /** @covers \Roave\BetterReflection\Util\FileHelper */
 class FileHelperTest extends TestCase
 {
@@ -20,19 +16,29 @@ public function testNormalizeWindowsPath(): void
         self::assertSame('directory/foo/boo/file.php', FileHelper::normalizeWindowsPath('directory/foo/boo/file.php'));
     }
 
-    public function testSystemWindowsPath(): void
+    /** @return list<array{0: string, 1: string}> */
+    public function dataNormalizeSystemPath(): array
     {
-        $path = 'directory\\foo/boo\\foo/file.php';
-
-        self::assertSame(strtr($path, '\\/', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR), FileHelper::normalizeSystemPath($path));
+        return [
+            ['directory\\foo/boo\\foo/file.php', 'directory/foo/boo/foo/file.php'],
+            ['phar://C:/Users/ondrej/phpstan.phar/src/TrinaryLogic.php', 'phar://C:/Users/ondrej/phpstan.phar/src/TrinaryLogic.php'],
+            ['C:/Users/ondrej/phpstan.phar/src/TrinaryLogic.php', 'C:/Users/ondrej/phpstan.phar/src/TrinaryLogic.php'],
+            ['/directory/strange-path-c://file.php', '/directory/strange-path-c://file.php'],
+        ];
     }
 
-    public function testSystemWindowsPathWithProtocol(): void
+    /**
+     * @dataProvider dataNormalizeSystemPath
+     * @requires OS Linux
+     */
+    public function testSystemWindowsPath(string $path, string $expectedPath): void
     {
-        if (DIRECTORY_SEPARATOR !== '\\') {
-            $this->markTestSkipped('Test runs only on Windows');
-        }
+        self::assertSame($expectedPath, FileHelper::normalizeSystemPath($path));
+    }
 
+    /** @requires OSFAMILY Windows */
+    public function testSystemWindowsPathOnWindows(): void
+    {
         $path = 'phar://C:/Users/ondrej/phpstan.phar/src/TrinaryLogic.php';
         self::assertSame(
             'phar://C:\Users\ondrej\phpstan.phar\src\TrinaryLogic.php',
diff --git a/tools/roave-backward-compatibility-check/composer.lock b/tools/roave-backward-compatibility-check/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`"mutators": {`
`14`	`14`	`"@default": true`
`15`	`15`	`},`
`16`		`- "minMsi": 99,`
	`16`	`+ "minMsi": 100,`
`17`	`17`	`"minCoveredMsi": 100`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public static function withStreamWrapperOverride(`
`72`	`72`	`$result = $executeMeWithinStreamWrapperOverride();`
`73`	`73`	`} finally {`
`74`	`74`	`foreach ($streamWrapperProtocols as $protocol) {`
`75`		`- stream_wrapper_restore($protocol);`
	`75`	`+ @stream_wrapper_restore($protocol);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`self::$registeredStreamWrapperProtocols = null;`
`@@ -101,6 +101,7 @@ public function stream_open($path, $mode, $options, &$opened_path): bool`
`101`	`101`	`{`
`102`	`102`	`self::$autoloadLocatedFile = $path;`
`103`	`103`
	`104`	`+ // @infection-ignore-all FalseValue`
`104`	`105`	`return false;`
`105`	`106`	`}`
`106`	`107`
`@@ -130,7 +131,7 @@ public function url_stat($path, $flags): array\|bool`
`130`	`131`	`stream_wrapper_restore($protocol);`
`131`	`132`	`}`
`132`	`133`
`133`		`- if ($flags & STREAM_URL_STAT_QUIET) {`
	`134`	`+ if (($flags & STREAM_URL_STAT_QUIET) === STREAM_URL_STAT_QUIET) {`
`134`	`135`	`$result = @stat($path);`
`135`	`136`	`} else {`
`136`	`137`	`$result = stat($path);`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public function __construct(Iterator $fileInfoIterator, private Locator $astLoca`
`53`	`53`	`/** @throws InvalidFileLocation */`
`54`	`54`	`private function getAggregatedSourceLocator(): AggregateSourceLocator`
`55`	`55`	`{`
	`56`	`+ // @infection-ignore-all Coalesce: There's no difference, it's just optimization`
`56`	`57`	`return $this->aggregateSourceLocator`
`57`	`58`	`?? $this->aggregateSourceLocator = new AggregateSourceLocator(array_values(array_filter(array_map(`
`58`	`59`	`function (SplFileInfo $item): SingleFileSourceLocator\|null {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`use function assert;`
`8`	`8`	`use function preg_match;`
	`9`	`+use function sprintf;`
`9`	`10`	`use function str_replace;`
`10`	`11`
`11`	`12`	`use const DIRECTORY_SEPARATOR;`
`@@ -43,13 +44,14 @@ public static function normalizeSystemPath(string $originalPath): string`
`43`	`44`	`[, $scheme, $path] = $matches;`
`44`	`45`	`}`
`45`	`46`
	`47`	`+ // @infection-ignore-all Identical Needed only on Windows`
`46`	`48`	`if (DIRECTORY_SEPARATOR === '\\') {`
`47`	`49`	`// @infection-ignore-all UnwrapStrReplace Needed only on Windows`
`48`	`50`	`$path = str_replace('/', DIRECTORY_SEPARATOR, $path);`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`assert($path !== '');`
`52`	`54`
`53`		`- return ($scheme !== null ? $scheme . '://' : '') . $path;`
	`55`	`+ return ($scheme !== null ? sprintf('%s://', $scheme) : '') . $path;`
`54`	`56`	`}`
`55`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ public function __construct()`
`24`	`24`
`25`	`25`	`public function __get($property)`
`26`	`26`	`{`
`27`		`- throw new Error();`
	`27`	`+ throw new Error('Removed property');`
`28`	`28`	`}`
`29`	`29`	`}`