Revert "Revert "Refactor""

This reverts commit 86ba64b.

Author: sebastianbergmann

src/Differ.php

@@ -10,9 +10,9 @@
 
 namespace SebastianBergmann\Diff;
 
-use SebastianBergmann\Diff\LCS\LongestCommonSubsequence;
-use SebastianBergmann\Diff\LCS\TimeEfficientImplementation;
-use SebastianBergmann\Diff\LCS\MemoryEfficientImplementation;
+use SebastianBergmann\Diff\LongestCommonSubsequenceCalculator;
+use SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator;
+use SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator;
 
 /**
  * Diff implementation.
@@ -44,11 +44,11 @@ public function __construct($header = "--- Original\n+++ New\n", $showNonDiffLin
      *
      * @param array|string             $from
      * @param array|string             $to
-     * @param LongestCommonSubsequence $lcs
+     * @param LongestCommonSubsequenceCalculator $lcs
      *
      * @return string
      */
-    public function diff($from, $to, LongestCommonSubsequence $lcs = null)
+    public function diff($from, $to, LongestCommonSubsequenceCalculator $lcs = null)
     {
         $from  = $this->validateDiffInput($from);
         $to    = $this->validateDiffInput($to);
@@ -197,11 +197,11 @@ private function getDiffBufferElementNew(array $diff, $buffer, $diffIndex)
      *
      * @param array|string             $from
      * @param array|string             $to
-     * @param LongestCommonSubsequence $lcs
+     * @param LongestCommonSubsequenceCalculator $lcs
      *
      * @return array
      */
-    public function diffToArray($from, $to, LongestCommonSubsequence $lcs = null)
+    public function diffToArray($from, $to, LongestCommonSubsequenceCalculator $lcs = null)
     {
         if (\is_string($from)) {
             $fromMatches = $this->getNewLineMatches($from);
@@ -304,7 +304,7 @@ private function splitStringByLines($input)
      * @param array $from
      * @param array $to
      *
-     * @return LongestCommonSubsequence
+     * @return LongestCommonSubsequenceCalculator
      */
     private function selectLcsImplementation(array $from, array $to)
     {
@@ -315,10 +315,10 @@ private function selectLcsImplementation(array $from, array $to)
         $memoryLimit = 100 * 1024 * 1024;
 
         if ($this->calculateEstimatedFootprint($from, $to) > $memoryLimit) {
-            return new MemoryEfficientImplementation;
+            return new MemoryEfficientLongestCommonSubsequenceCalculator;
         }
 
-        return new TimeEfficientImplementation;
+        return new TimeEfficientLongestCommonSubsequenceCalculator;
     }
 
     /**

src/LCS/LongestCommonSubsequence.php renamed to src/LongestCommonSubsequenceCalculator.php

@@ -8,12 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\LCS;
+namespace SebastianBergmann\Diff;
 
-/**
- * Interface for implementations of longest common subsequence calculation.
- */
-interface LongestCommonSubsequence
+interface LongestCommonSubsequenceCalculator
 {
     /**
      * Calculates the longest common subsequence of two arrays.

src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php renamed to src/MemoryEfficientLongestCommonSubsequenceCalculator.php

@@ -8,12 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\LCS;
+namespace SebastianBergmann\Diff;
 
-/**
- * Memory-efficient implementation of longest common subsequence calculation.
- */
-class MemoryEfficientImplementation implements LongestCommonSubsequence
+class MemoryEfficientLongestCommonSubsequenceCalculator implements LongestCommonSubsequenceCalculator
 {
     /**
      * Calculates the longest common subsequence of two arrays.

src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php renamed to src/TimeEfficientLongestCommonSubsequenceCalculator.php

@@ -8,12 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\LCS;
+namespace SebastianBergmann\Diff;
 
-/**
- * Time-efficient implementation of longest common subsequence calculation.
- */
-class TimeEfficientImplementation implements LongestCommonSubsequence
+class TimeEfficientLongestCommonSubsequenceCalculator implements LongestCommonSubsequenceCalculator
 {
     /**
      * Calculates the longest common subsequence of two arrays.

tests/DifferTest.php

@@ -10,15 +10,15 @@
 
 namespace SebastianBergmann\Diff;
 
-use SebastianBergmann\Diff\LCS\MemoryEfficientImplementation;
-use SebastianBergmann\Diff\LCS\TimeEfficientImplementation;
+use SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator;
+use SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @covers SebastianBergmann\Diff\Differ
  *
- * @uses SebastianBergmann\Diff\LCS\MemoryEfficientImplementation
- * @uses SebastianBergmann\Diff\LCS\TimeEfficientImplementation
+ * @uses SebastianBergmann\Diff\MemoryEfficientImplementation
+ * @uses SebastianBergmann\Diff\TimeEfficientImplementation
  * @uses SebastianBergmann\Diff\Chunk
  * @uses SebastianBergmann\Diff\Diff
  * @uses SebastianBergmann\Diff\Line
@@ -48,7 +48,7 @@ protected function setUp()
      */
     public function testArrayRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsImplementation(array $expected, $from, $to)
     {
-        $this->assertEquals($expected, $this->differ->diffToArray($from, $to, new TimeEfficientImplementation));
+        $this->assertEquals($expected, $this->differ->diffToArray($from, $to, new TimeEfficientLongestCommonSubsequenceCalculator));
     }
 
     /**
@@ -59,7 +59,7 @@ public function testArrayRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsI
      */
     public function testTextRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsImplementation($expected, $from, $to)
     {
-        $this->assertEquals($expected, $this->differ->diff($from, $to, new TimeEfficientImplementation));
+        $this->assertEquals($expected, $this->differ->diff($from, $to, new TimeEfficientLongestCommonSubsequenceCalculator));
     }
 
     /**
@@ -70,7 +70,7 @@ public function testTextRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsIm
      */
     public function testArrayRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLcsImplementation(array $expected, $from, $to)
     {
-        $this->assertEquals($expected, $this->differ->diffToArray($from, $to, new MemoryEfficientImplementation));
+        $this->assertEquals($expected, $this->differ->diffToArray($from, $to, new MemoryEfficientLongestCommonSubsequenceCalculator));
     }
 
     /**
@@ -81,7 +81,7 @@ public function testArrayRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLc
      */
     public function testTextRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLcsImplementation($expected, $from, $to)
     {
-        $this->assertEquals($expected, $this->differ->diff($from, $to, new MemoryEfficientImplementation));
+        $this->assertEquals($expected, $this->differ->diff($from, $to, new MemoryEfficientLongestCommonSubsequenceCalculator));
     }
 
     public function testCustomHeaderCanBeUsed()

tests/LCS/LongestCommonSubsequenceTest.php renamed to tests/LongestCommonSubsequenceTest.php

@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\LCS;
+namespace SebastianBergmann\Diff;
 
 use PHPUnit\Framework\TestCase;
 
 abstract class LongestCommonSubsequenceTest extends TestCase
 {
     /**
-     * @var LongestCommonSubsequence
+     * @var LongestCommonSubsequenceCalculator
      */
     private $implementation;
 
@@ -38,7 +38,7 @@ protected function setUp()
     }
 
     /**
-     * @return LongestCommonSubsequence
+     * @return LongestCommonSubsequenceCalculator
      */
     abstract protected function createImplementation();
 

tests/LCS/MemoryEfficientImplementationTest.php renamed to tests/MemoryEfficientImplementationTest.php

@@ -8,15 +8,15 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\LCS;
+namespace SebastianBergmann\Diff;
 
 /**
- * @covers SebastianBergmann\Diff\LCS\MemoryEfficientImplementation
+ * @covers SebastianBergmann\Diff\MemoryEfficientImplementation
  */
 class MemoryEfficientImplementationTest extends LongestCommonSubsequenceTest
 {
     protected function createImplementation()
     {
-        return new MemoryEfficientImplementation;
+        return new MemoryEfficientLongestCommonSubsequenceCalculator;
     }
 }

tests/LCS/TimeEfficientImplementationTest.php renamed to tests/TimeEfficientImplementationTest.php

@@ -8,15 +8,15 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\LCS;
+namespace SebastianBergmann\Diff;
 
 /**
- * @covers SebastianBergmann\Diff\LCS\TimeEfficientImplementation
+ * @covers SebastianBergmann\Diff\TimeEfficientImplementation
  */
 class TimeEfficientImplementationTest extends LongestCommonSubsequenceTest
 {
     protected function createImplementation()
     {
-        return new TimeEfficientImplementation;
+        return new TimeEfficientLongestCommonSubsequenceCalculator;
     }
 }