Replace abandoned webmozart/path-util with symfony/filesystem (#1693

) * Replace abandoned `webmozart/path-util` with `symfony/filesystem` * Increase min version of `symfony/filesystem` * composer update * fix ci * drop older versions of symfony/filesystem
infection · May 31, 2022 · 62f52df · 62f52df
1 parent 38004b5
commit 62f52df
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 81 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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