diff --git a/composer.json b/composer.json index 1bbb51cea..c53280c9c 100644 --- a/composer.json +++ b/composer.json @@ -59,12 +59,11 @@ "sebastian/diff": "^3.0.2 || ^4.0", "seld/jsonlint": "^1.7", "symfony/console": "^3.4.29 || ^4.1.19 || ^5.0 || ^6.0", - "symfony/filesystem": "^3.4.29 || ^4.1.19 || ^5.0 || ^6.0", + "symfony/filesystem": "^5.4 || ^6.0", "symfony/finder": "^3.4.29 || ^4.1.19 || ^5.0 || ^6.0", "symfony/process": "^3.4.29 || ^4.1.19 || ^5.0 || ^6.0", "thecodingmachine/safe": "^2.1.2", - "webmozart/assert": "^1.3", - "webmozart/path-util": "^2.3" + "webmozart/assert": "^1.3" }, "conflict": { "phpunit/php-code-coverage": ">9 <9.1.4", diff --git a/composer.lock b/composer.lock index 4be0a2f28..a3c1641a7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dc16ebf2c310c64c435e4a1954152544", + "content-hash": "9b1a1f21c990a3663fbdee434c48afd5", "packages": [ { "name": "composer/pcre", @@ -1032,21 +1032,22 @@ }, { "name": "symfony/filesystem", - "version": "v5.3.4", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32" + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32", - "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba", + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", "symfony/polyfill-php80": "^1.16" }, "type": "library", @@ -1075,7 +1076,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.3.4" + "source": "https://github.com/symfony/filesystem/tree/v5.4.9" }, "funding": [ { @@ -1091,7 +1092,7 @@ "type": "tidelift" } ], - "time": "2021-07-21T12:40:44+00:00" + "time": "2022-05-20T13:55:35+00:00" }, { "name": "symfony/finder", @@ -2055,57 +2056,6 @@ "source": "https://github.com/webmozarts/assert/tree/1.9.1" }, "time": "2020-07-08T17:02:28+00:00" - }, - { - "name": "webmozart/path-util", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/webmozart/path-util.git", - "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725", - "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "webmozart/assert": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\PathUtil\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", - "support": { - "issues": "https://github.com/webmozart/path-util/issues", - "source": "https://github.com/webmozart/path-util/tree/2.3.0" - }, - "abandoned": "symfony/filesystem", - "time": "2015-12-17T08:42:14+00:00" } ], "packages-dev": [ @@ -4718,5 +4668,5 @@ "platform-overrides": { "php": "8.0.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/src/Configuration/ConfigurationFactory.php b/src/Configuration/ConfigurationFactory.php index c5ce31b28..71cdf62c8 100644 --- a/src/Configuration/ConfigurationFactory.php +++ b/src/Configuration/ConfigurationFactory.php @@ -56,9 +56,9 @@ use OndraM\CiDetector\CiDetectorInterface; use OndraM\CiDetector\Exception\CiNotDetectedException; use function Safe\sprintf; +use Symfony\Component\Filesystem\Path; use function sys_get_temp_dir; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/Container.php b/src/Container.php index 541a9a0cd..2e520de13 100644 --- a/src/Container.php +++ b/src/Container.php @@ -151,8 +151,8 @@ use Symfony\Component\Console\Output\NullOutput; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\Filesystem\Path; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/FileSystem/Locator/RootsFileLocator.php b/src/FileSystem/Locator/RootsFileLocator.php index ed42ef44a..ef46220df 100644 --- a/src/FileSystem/Locator/RootsFileLocator.php +++ b/src/FileSystem/Locator/RootsFileLocator.php @@ -41,8 +41,8 @@ use function is_file; use function Safe\realpath; use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\Filesystem\Path; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/FileSystem/Locator/RootsFileOrDirectoryLocator.php b/src/FileSystem/Locator/RootsFileOrDirectoryLocator.php index 33f8cd7fb..ce8ffa1cd 100644 --- a/src/FileSystem/Locator/RootsFileOrDirectoryLocator.php +++ b/src/FileSystem/Locator/RootsFileOrDirectoryLocator.php @@ -40,8 +40,8 @@ use const DIRECTORY_SEPARATOR; use function Safe\realpath; use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\Filesystem\Path; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/FileSystem/TmpDirProvider.php b/src/FileSystem/TmpDirProvider.php index a6789f0f9..eceba2e0e 100644 --- a/src/FileSystem/TmpDirProvider.php +++ b/src/FileSystem/TmpDirProvider.php @@ -38,8 +38,8 @@ use const DIRECTORY_SEPARATOR; use function Safe\sprintf; use function str_replace; +use Symfony\Component\Filesystem\Path; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/Logger/GitHubAnnotationsLogger.php b/src/Logger/GitHubAnnotationsLogger.php index bdf1a169d..d5050b0e4 100644 --- a/src/Logger/GitHubAnnotationsLogger.php +++ b/src/Logger/GitHubAnnotationsLogger.php @@ -38,8 +38,8 @@ use Infection\Metrics\ResultsCollector; use function Safe\shell_exec; use function str_replace; +use Symfony\Component\Filesystem\Path; use function trim; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/Logger/Html/StrykerHtmlReportBuilder.php b/src/Logger/Html/StrykerHtmlReportBuilder.php index 76671c10a..968c82432 100644 --- a/src/Logger/Html/StrykerHtmlReportBuilder.php +++ b/src/Logger/Html/StrykerHtmlReportBuilder.php @@ -69,8 +69,8 @@ use function Safe\substr; use function str_starts_with; use function strlen; +use Symfony\Component\Filesystem\Path; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; /** * @internal @@ -162,7 +162,7 @@ private function getFiles(): ArrayObject Assert::minCount($resultsByPath, 1, 'There must be at least one result to build HTML report.'); - $basePath = Path::getLongestCommonBasePath(array_keys($resultsByPath)); + $basePath = Path::getLongestCommonBasePath(...array_keys($resultsByPath)); Assert::string($basePath, '$basePath must be a string'); diff --git a/src/TestFramework/Coverage/JUnit/JUnitReportLocator.php b/src/TestFramework/Coverage/JUnit/JUnitReportLocator.php index c2394001f..a6f3f8d55 100644 --- a/src/TestFramework/Coverage/JUnit/JUnitReportLocator.php +++ b/src/TestFramework/Coverage/JUnit/JUnitReportLocator.php @@ -43,9 +43,9 @@ use Infection\FileSystem\Locator\FileNotFound; use function iterator_to_array; use function Safe\sprintf; +use Symfony\Component\Filesystem\Path; use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\SplFileInfo; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/TestFramework/Coverage/XmlReport/IndexXmlCoverageLocator.php b/src/TestFramework/Coverage/XmlReport/IndexXmlCoverageLocator.php index a111305d2..18e366dad 100644 --- a/src/TestFramework/Coverage/XmlReport/IndexXmlCoverageLocator.php +++ b/src/TestFramework/Coverage/XmlReport/IndexXmlCoverageLocator.php @@ -43,9 +43,9 @@ use Infection\FileSystem\Locator\FileNotFound; use function iterator_to_array; use function Safe\sprintf; +use Symfony\Component\Filesystem\Path; use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\SplFileInfo; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/src/TestFramework/Coverage/XmlReport/SourceFileInfoProvider.php b/src/TestFramework/Coverage/XmlReport/SourceFileInfoProvider.php index 71f0e4b7a..aaf82105e 100644 --- a/src/TestFramework/Coverage/XmlReport/SourceFileInfoProvider.php +++ b/src/TestFramework/Coverage/XmlReport/SourceFileInfoProvider.php @@ -45,10 +45,10 @@ use function Safe\realpath; use function Safe\sprintf; use function str_replace; +use Symfony\Component\Filesystem\Path; use Symfony\Component\Finder\SplFileInfo; use function trim; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; /** * @internal diff --git a/tests/phpunit/AutoReview/ContainerTest.php b/tests/phpunit/AutoReview/ContainerTest.php index fbf1569fb..ae73d1f3a 100644 --- a/tests/phpunit/AutoReview/ContainerTest.php +++ b/tests/phpunit/AutoReview/ContainerTest.php @@ -43,7 +43,7 @@ use function Safe\file_get_contents; use function Safe\sprintf; use function strpos; -use Webmozart\PathUtil\Path; +use Symfony\Component\Filesystem\Path; final class ContainerTest extends TestCase { diff --git a/tests/phpunit/FileSystem/SourceFileCollectorTest.php b/tests/phpunit/FileSystem/SourceFileCollectorTest.php index 8fb9d7057..5ccd1d421 100644 --- a/tests/phpunit/FileSystem/SourceFileCollectorTest.php +++ b/tests/phpunit/FileSystem/SourceFileCollectorTest.php @@ -44,7 +44,7 @@ use PHPUnit\Framework\TestCase; use function Pipeline\take; use function range; -use Webmozart\PathUtil\Path; +use Symfony\Component\Filesystem\Path; final class SourceFileCollectorTest extends TestCase { diff --git a/tests/phpunit/Mutator/MutatorFixturesProvider.php b/tests/phpunit/Mutator/MutatorFixturesProvider.php index 3f929b9f3..cf5836d12 100644 --- a/tests/phpunit/Mutator/MutatorFixturesProvider.php +++ b/tests/phpunit/Mutator/MutatorFixturesProvider.php @@ -44,8 +44,8 @@ use function Safe\file_get_contents; use function Safe\sprintf; use function Safe\substr; +use Symfony\Component\Filesystem\Path; use Webmozart\Assert\Assert; -use Webmozart\PathUtil\Path; final class MutatorFixturesProvider { diff --git a/tests/phpunit/Mutator/ProfileListProvider.php b/tests/phpunit/Mutator/ProfileListProvider.php index 9dbc81850..16c2d8109 100644 --- a/tests/phpunit/Mutator/ProfileListProvider.php +++ b/tests/phpunit/Mutator/ProfileListProvider.php @@ -52,9 +52,9 @@ use function Safe\substr; use const SORT_STRING; use function str_replace; +use Symfony\Component\Filesystem\Path; use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\SplFileInfo; -use Webmozart\PathUtil\Path; final class ProfileListProvider { diff --git a/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php b/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php index 75bf53d7c..159de1507 100644 --- a/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php +++ b/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php @@ -46,7 +46,7 @@ use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use function Safe\sprintf; -use Webmozart\PathUtil\Path; +use Symfony\Component\Filesystem\Path; /** * All these tests should be ran in separate processes, as otherwise they may rely diff --git a/tests/phpunit/TestFramework/Coverage/XmlReport/IndexXmlCoverageParserTest.php b/tests/phpunit/TestFramework/Coverage/XmlReport/IndexXmlCoverageParserTest.php index 1b396e783..66a66d24c 100644 --- a/tests/phpunit/TestFramework/Coverage/XmlReport/IndexXmlCoverageParserTest.php +++ b/tests/phpunit/TestFramework/Coverage/XmlReport/IndexXmlCoverageParserTest.php @@ -49,8 +49,8 @@ use function Safe\realpath; use function Safe\sprintf; use function str_replace; +use Symfony\Component\Filesystem\Path; use Traversable; -use Webmozart\PathUtil\Path; /** * @group integration diff --git a/tests/phpunit/TestFramework/Coverage/XmlReport/SourceFileInfoProviderTest.php b/tests/phpunit/TestFramework/Coverage/XmlReport/SourceFileInfoProviderTest.php index 6de3acd7a..6c0a2024c 100644 --- a/tests/phpunit/TestFramework/Coverage/XmlReport/SourceFileInfoProviderTest.php +++ b/tests/phpunit/TestFramework/Coverage/XmlReport/SourceFileInfoProviderTest.php @@ -40,7 +40,7 @@ use Infection\Tests\Fixtures\TestFramework\PhpUnit\Coverage\XmlCoverageFixtures; use PHPUnit\Framework\TestCase; use function Safe\sprintf; -use Webmozart\PathUtil\Path; +use Symfony\Component\Filesystem\Path; /** * @group integration diff --git a/tests/phpunit/TestFramework/PhpUnit/Config/XmlConfigurationManipulatorTest.php b/tests/phpunit/TestFramework/PhpUnit/Config/XmlConfigurationManipulatorTest.php index ec50970c1..6fde2c584 100644 --- a/tests/phpunit/TestFramework/PhpUnit/Config/XmlConfigurationManipulatorTest.php +++ b/tests/phpunit/TestFramework/PhpUnit/Config/XmlConfigurationManipulatorTest.php @@ -51,7 +51,7 @@ use function set_error_handler; use function str_replace; use Symfony\Component\Filesystem\Filesystem; -use Webmozart\PathUtil\Path; +use Symfony\Component\Filesystem\Path; /** * @group integration