Remove deprecated functionality

sebastianbergmann · Dec 23, 2023 · 8fdb7ff · 8fdb7ff
1 parent bf33b01
commit 8fdb7ff
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 73 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -55,13 +55,6 @@
  </UndefinedConstant>
  </file>
  <file src="src/Filter.php">
- <ArgumentTypeCoercion>
- <code>$directory</code>
- <code>$directory</code>
- </ArgumentTypeCoercion>
- <DeprecatedMethod>
- <code>excludeFile</code>
- </DeprecatedMethod>
  <InvalidDocblockParamName>
  <code>$files</code>
  </InvalidDocblockParamName>

diff --git a/ChangeLog-11.0.md b/ChangeLog-11.0.md
@@ -6,6 +6,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 ### Removed
 
+* The `SebastianBergmann\CodeCoverage\Filter::includeDirectory()`, `SebastianBergmann\CodeCoverage\Filter::excludeDirectory()`, and `SebastianBergmann\CodeCoverage\Filter::excludeFile()` methods have been removed
 * This component now requires PHP-Parser 5
 * This component is no longer supported on PHP 8.1
 

diff --git a/src/Filter.php b/src/Filter.php
@@ -14,7 +14,6 @@
 use function realpath;
 use function str_contains;
 use function str_starts_with;
-use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
 
 final class Filter
 {
@@ -28,16 +27,6 @@ final class Filter
  */
  private array $isFileCache = [];
 
- /**
- * @deprecated
- */
- public function includeDirectory(string $directory, string $suffix = '.php', string $prefix = ''): void
- {
- foreach ((new FileIteratorFacade)->getFilesAsArray($directory, $suffix, $prefix) as $file) {
- $this->includeFile($file);
- }
- }
-
  /**
  * @psalm-param list<string> $files
  */
@@ -59,30 +48,6 @@ public function includeFile(string $filename): void
  $this->files[$filename] = true;
  }
 
- /**
- * @deprecated
- */
- public function excludeDirectory(string $directory, string $suffix = '.php', string $prefix = ''): void
- {
- foreach ((new FileIteratorFacade)->getFilesAsArray($directory, $suffix, $prefix) as $file) {
- $this->excludeFile($file);
- }
- }
-
- /**
- * @deprecated
- */
- public function excludeFile(string $filename): void
- {
- $filename = realpath($filename);
-
- if (!$filename || !isset($this->files[$filename])) {
- return;
- }
-
- unset($this->files[$filename]);
- }
-
  public function isFile(string $filename): bool
  {
  if (isset($this->isFileCache[$filename])) {

diff --git a/tests/tests/FilterTest.php b/tests/tests/FilterTest.php
@@ -57,37 +57,6 @@ public function testMultipleFilesCanBeAdded(): void
  $this->assertSame($files, $this->filter->files());
  }
 
- public function testDirectoryCanBeAdded(): void
- {
- $this->filter->includeDirectory(__DIR__ . '/../_files/filter');
-
- $this->assertSame(
- [
- realpath(__DIR__ . '/../_files/filter/a.php'),
- realpath(__DIR__ . '/../_files/filter/b.php'),
- ],
- $this->filter->files()
- );
- }
-
- public function testSingleFileCanBeRemoved(): void
- {
- $this->filter->includeFile(realpath(__DIR__ . '/../_files/filter/a.php'));
- $this->filter->excludeFile(realpath(__DIR__ . '/../_files/filter/a.php'));
-
- $this->assertTrue($this->filter->isEmpty());
- $this->assertSame([], $this->filter->files());
- }
-
- public function testDirectoryCanBeRemoved(): void
- {
- $this->filter->includeDirectory(__DIR__ . '/../_files/filter');
- $this->filter->excludeDirectory(__DIR__ . '/../_files/filter');
-
- $this->assertTrue($this->filter->isEmpty());
- $this->assertSame([], $this->filter->files());
- }
-
  public function testDeterminesWhetherStringContainsNameOfRealFileThatExists(): void
  {
  $this->assertFalse($this->filter->isFile('vfs://root/a/path'));