Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed May 8, 2020
1 parent 3e523c5 commit 7122409
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 50 deletions.
3 changes: 0 additions & 3 deletions src/Differ.php
Expand Up @@ -12,9 +12,6 @@
use SebastianBergmann\Diff\Output\DiffOutputBuilderInterface;
use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;

/**
* Diff implementation.
*/
final class Differ
{
public const OLD = 0;
Expand Down
4 changes: 2 additions & 2 deletions tests/ChunkTest.php
Expand Up @@ -12,9 +12,9 @@
use PHPUnit\Framework\TestCase;

/**
* @covers SebastianBergmann\Diff\Chunk
* @covers \SebastianBergmann\Diff\Chunk
*
* @uses SebastianBergmann\Diff\Line
* @uses \SebastianBergmann\Diff\Line
*/
final class ChunkTest extends TestCase
{
Expand Down
4 changes: 2 additions & 2 deletions tests/DiffTest.php
Expand Up @@ -12,9 +12,9 @@
use PHPUnit\Framework\TestCase;

/**
* @covers SebastianBergmann\Diff\Diff
* @covers \SebastianBergmann\Diff\Diff
*
* @uses SebastianBergmann\Diff\Chunk
* @uses \SebastianBergmann\Diff\Chunk
*/
final class DiffTest extends TestCase
{
Expand Down
10 changes: 5 additions & 5 deletions tests/DifferTest.php
Expand Up @@ -12,12 +12,12 @@
use PHPUnit\Framework\TestCase;

/**
* @covers SebastianBergmann\Diff\Differ
* @covers SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
* @covers \SebastianBergmann\Diff\Differ
* @covers \SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
*
* @uses SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator
* @uses SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder
* @uses \SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder
*/
final class DifferTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Exception/ConfigurationExceptionTest.php
Expand Up @@ -12,7 +12,7 @@
use PHPUnit\Framework\TestCase;

/**
* @covers SebastianBergmann\Diff\ConfigurationException
* @covers \SebastianBergmann\Diff\ConfigurationException
*/
final class ConfigurationExceptionTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Exception/InvalidArgumentExceptionTest.php
Expand Up @@ -12,7 +12,7 @@
use PHPUnit\Framework\TestCase;

/**
* @covers SebastianBergmann\Diff\InvalidArgumentException
* @covers \SebastianBergmann\Diff\InvalidArgumentException
*/
final class InvalidArgumentExceptionTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/LineTest.php
Expand Up @@ -12,7 +12,7 @@
use PHPUnit\Framework\TestCase;

/**
* @covers SebastianBergmann\Diff\Line
* @covers \SebastianBergmann\Diff\Line
*/
final class LineTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/MemoryEfficientImplementationTest.php
Expand Up @@ -10,7 +10,7 @@
namespace SebastianBergmann\Diff;

/**
* @covers SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator
* @covers \SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator
*/
final class MemoryEfficientImplementationTest extends LongestCommonSubsequenceTest
{
Expand Down
8 changes: 4 additions & 4 deletions tests/Output/AbstractChunkOutputBuilderTest.php
Expand Up @@ -13,11 +13,11 @@
use SebastianBergmann\Diff\Differ;

/**
* @covers SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder
* @covers \SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder
*
* @uses SebastianBergmann\Diff\Differ
* @uses SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
* @uses SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\Differ
* @uses \SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
* @uses \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
*/
final class AbstractChunkOutputBuilderTest extends TestCase
{
Expand Down
6 changes: 3 additions & 3 deletions tests/Output/DiffOnlyOutputBuilderTest.php
Expand Up @@ -13,10 +13,10 @@
use SebastianBergmann\Diff\Differ;

/**
* @covers SebastianBergmann\Diff\Output\DiffOnlyOutputBuilder
* @covers \SebastianBergmann\Diff\Output\DiffOnlyOutputBuilder
*
* @uses SebastianBergmann\Diff\Differ
* @uses SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\Differ
* @uses \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
*/
final class DiffOnlyOutputBuilderTest extends TestCase
{
Expand Down
Expand Up @@ -16,11 +16,11 @@
use Symfony\Component\Process\Process;

/**
* @covers SebastianBergmann\Diff\Output\StrictUnifiedDiffOutputBuilder
* @covers \SebastianBergmann\Diff\Output\StrictUnifiedDiffOutputBuilder
*
* @uses SebastianBergmann\Diff\Differ
* @uses SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\Differ
* @uses \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator
*
* @requires OS Linux
*/
Expand Down
Expand Up @@ -14,10 +14,10 @@
use Symfony\Component\Process\Process;

/**
* @covers SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
* @covers \SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
*
* @uses SebastianBergmann\Diff\Differ
* @uses SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\Differ
* @uses \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
*
* @requires OS Linux
*/
Expand Down
8 changes: 4 additions & 4 deletions tests/Output/StrictUnifiedDiffOutputBuilderTest.php
Expand Up @@ -15,11 +15,11 @@
use SebastianBergmann\Diff\Utils\UnifiedDiffAssertTrait;

/**
* @covers SebastianBergmann\Diff\Output\StrictUnifiedDiffOutputBuilder
* @covers \SebastianBergmann\Diff\Output\StrictUnifiedDiffOutputBuilder
*
* @uses SebastianBergmann\Diff\Differ
* @uses SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses SebastianBergmann\Diff\ConfigurationException
* @uses \SebastianBergmann\Diff\Differ
* @uses \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\ConfigurationException
*/
final class StrictUnifiedDiffOutputBuilderTest extends TestCase
{
Expand Down
16 changes: 7 additions & 9 deletions tests/Output/UnifiedDiffOutputBuilderTest.php
Expand Up @@ -13,11 +13,11 @@
use SebastianBergmann\Diff\Differ;

/**
* @covers SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
* @covers \SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder
*
* @uses SebastianBergmann\Diff\Differ
* @uses SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder
* @uses SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @uses \SebastianBergmann\Diff\Differ
* @uses \SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder
* @uses \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
*/
final class UnifiedDiffOutputBuilderTest extends TestCase
{
Expand Down Expand Up @@ -65,13 +65,9 @@ public function headerProvider(): array
}

/**
* @param string $expected
* @param string $from
* @param string $to
*
* @dataProvider provideDiffWithLineNumbers
*/
public function testDiffWithLineNumbers($expected, $from, $to): void
public function testDiffWithLineNumbers(string $expected, string $from, string $to): void
{
$differ = new Differ(new UnifiedDiffOutputBuilder("--- Original\n+++ New\n", true));
$this->assertSame($expected, $differ->diff($from, $to));
Expand All @@ -88,7 +84,9 @@ public function provideDiffWithLineNumbers(): array
public function testEmptyDiffProducesEmptyOutput(string $from, string $to): void
{
$differ = new Differ(new UnifiedDiffOutputBuilder('', false));

$output = $differ->diff($from, $to);

$this->assertEmpty($output);
}

Expand Down
10 changes: 5 additions & 5 deletions tests/ParserTest.php
Expand Up @@ -13,11 +13,11 @@
use SebastianBergmann\Diff\Utils\FileUtils;

/**
* @covers SebastianBergmann\Diff\Parser
* @covers \SebastianBergmann\Diff\Parser
*
* @uses SebastianBergmann\Diff\Chunk
* @uses SebastianBergmann\Diff\Diff
* @uses SebastianBergmann\Diff\Line
* @uses \SebastianBergmann\Diff\Chunk
* @uses \SebastianBergmann\Diff\Diff
* @uses \SebastianBergmann\Diff\Line
*/
final class ParserTest extends TestCase
{
Expand Down Expand Up @@ -145,7 +145,7 @@ public function testParseDiffForMulitpleFiles(): void
}

/**
* @param Diff[] $expected
* @psalm-param list<Diff> $expected
*
* @dataProvider diffProvider
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/TimeEfficientImplementationTest.php
Expand Up @@ -10,7 +10,7 @@
namespace SebastianBergmann\Diff;

/**
* @covers SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
* @covers \SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator
*/
final class TimeEfficientImplementationTest extends LongestCommonSubsequenceTest
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Utils/UnifiedDiffAssertTraitTest.php
Expand Up @@ -12,7 +12,7 @@
use PHPUnit\Framework\TestCase;

/**
* @covers SebastianBergmann\Diff\Utils\UnifiedDiffAssertTrait
* @covers \SebastianBergmann\Diff\Utils\UnifiedDiffAssertTrait
*/
final class UnifiedDiffAssertTraitTest extends TestCase
{
Expand Down

0 comments on commit 7122409

Please sign in to comment.