Rename SebastianBergmann\Diff to SebastianBergmann\Diff\Differ

Author: sebastianbergmann

README.md

@@ -4,32 +4,32 @@ Diff implementation for PHP, factored out of PHPUnit into a stand-alone componen
 
 ## Installation
 
-You can use the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) or [Composer](http://getcomposer.org/) to download and install this package as well as its dependencies.
-
-### PEAR Installer
-
-The following two commands (which you may have to run as `root`) are all that is required to install this package using the PEAR Installer:
-
-    pear config-set auto_discover 1
-    pear install pear.phpunit.de/Diff
+You can use [Composer](http://getcomposer.org/) or the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) to download and install this package as well as its dependencies.
 
 ### Composer
 
-To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/diff` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Diff 1.0:
+To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/diff` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Diff:
 
     {
         "require": {
-            "sebastian/diff": "1.0.*"
+            "sebastian/diff": "*"
         }
     }
 
+### PEAR Installer
+
+The following two commands (which you may have to run as `root`) are all that is required to install this package using the PEAR Installer:
+
+    pear config-set auto_discover 1
+    pear install pear.phpunit.de/Diff
+
 ### Usage
 
 ```php
-use SebastianBergmann\Diff;
+use SebastianBergmann\Diff\Differ;
 
-$diff = new Diff;
-print $diff->diff('foo', 'bar');
+$differ = new Differ;
+print $differ->diff('foo', 'bar');
 ```
 
 The code above yields the output below:

build/package.xml

@@ -33,7 +33,7 @@
    <dir name="SebastianBergmann">
     <dir name="Diff">
      <file baseinstalldir="/" name="autoload.php" role="php"/>
-     <file baseinstalldir="/" name="Diff.php" role="php"/>
+     <file baseinstalldir="/" name="Differ.php" role="php"/>
     </dir>
    </dir>
    <file baseinstalldir="/" name="LICENSE" role="doc"/>

src/Diff.php renamed to src/Differ.php

@@ -42,7 +42,7 @@
  * @link       http://www.github.com/sebastianbergmann/diff
  */
 
-namespace SebastianBergmann;
+namespace SebastianBergmann\Diff;
 
 /**
  * Diff implementation.
@@ -54,7 +54,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.github.com/sebastianbergmann/diff
  */
-class Diff
+class Differ
 {
     /**
      * @var string
@@ -254,7 +254,7 @@ public function diffToArray($from, $to)
      * @param  array $to
      * @return array
      */
-    protected function longestCommonSubsequence(array $from, array $to)
+    private function longestCommonSubsequence(array $from, array $to)
     {
         $common     = array();
         $matrix     = array();

src/autoload.php

@@ -7,7 +7,7 @@ function($class) {
         static $classes = null;
         if ($classes === null) {
             $classes = array(
-                'sebastianbergmann\\diff' => '/Diff.php'
+                'sebastianbergmann\\diff\\differ' => '/Differ.php'
             );
         }
         $cn = strtolower($class);

tests/DiffTest.php renamed to tests/DifferTest.php

@@ -41,9 +41,9 @@
  * @link       http://www.github.com/sebastianbergmann/diff
  */
 
-namespace SebastianBergmann;
+namespace SebastianBergmann\Diff;
 
-class DiffTest extends \PHPUnit_Framework_TestCase
+class DifferTest extends \PHPUnit_Framework_TestCase
 {
     const REMOVED = 2;
     const ADDED = 1;
@@ -53,200 +53,209 @@ class DiffTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->diff = new Diff;
+        $this->differ = new Differ;
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorMessage()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-a\n+b\n",
-          $this->diff->diff('a', 'b')
+          $this->differ->diff('a', 'b')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorMessage_toArray()
     {
         $expected = array();
         $expected[] = array('a', self::REMOVED);
         $expected[] = array('b', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('a', 'b'));
+        $this->assertEquals($expected, $this->differ->diffToArray('a', 'b'));
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorStartSame()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-ba\n+bc\n",
-          $this->diff->diff('ba', 'bc')
+          $this->differ->diff('ba', 'bc')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorStartSame_toArray()
     {
         $expected = array();
         $expected[] = array('ba', self::REMOVED);
         $expected[] = array('bc', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('ba', 'bc'));
+        $this->assertEquals($expected, $this->differ->diffToArray('ba', 'bc'));
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorEndSame()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-ab\n+cb\n",
-          $this->diff->diff('ab', 'cb')
+          $this->differ->diff('ab', 'cb')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorEndSame_toArray()
     {
         $expected = array();
         $expected[] = array('ab', self::REMOVED);
         $expected[] = array('cb', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('ab', 'cb'));
+        $this->assertEquals($expected, $this->differ->diffToArray('ab', 'cb'));
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorStartAndEndSame()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-abc\n+adc\n",
-          $this->diff->diff('abc', 'adc')
+          $this->differ->diff('abc', 'adc')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorStartAndEndSame_toArray()
     {
         $expected = array();
         $expected[] = array('abc', self::REMOVED);
         $expected[] = array('adc', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('abc', 'adc'));
+        $this->assertEquals(
+          $expected, $this->differ->diffToArray('abc', 'adc')
+        );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorStartSameComplete()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-ab\n+abc\n",
-          $this->diff->diff('ab', 'abc')
+          $this->differ->diff('ab', 'abc')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorStartSameComplete_toArray()
     {
         $expected = array();
         $expected[] = array('ab', self::REMOVED);
         $expected[] = array('abc', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('ab', 'abc'));
+        $this->assertEquals($expected, $this->differ->diffToArray('ab', 'abc'));
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorEndSameComplete()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-bc\n+abc\n",
-          $this->diff->diff('bc', 'abc')
+          $this->differ->diff('bc', 'abc')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorEndSameComplete_toArray()
     {
         $expected = array();
         $expected[] = array('bc', self::REMOVED);
         $expected[] = array('abc', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('bc', 'abc'));
+        $this->assertEquals($expected, $this->differ->diffToArray('bc', 'abc'));
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorOverlapingMatches()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-abc\n+abbc\n",
-          $this->diff->diff('abc', 'abbc')
+          $this->differ->diff('abc', 'abbc')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorOverlapingMatches_toArray()
     {
         $expected = array();
         $expected[] = array('abc', self::REMOVED);
         $expected[] = array('abbc', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('abc', 'abbc'));
+        $this->assertEquals(
+          $expected, $this->differ->diffToArray('abc', 'abbc')
+        );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorOverlapingMatches2()
     {
         $this->assertEquals(
           "--- Original\n+++ New\n@@ @@\n-abcdde\n+abcde\n",
-          $this->diff->diff('abcdde', 'abcde')
+          $this->differ->diff('abcdde', 'abcde')
         );
     }
 
     /**
-     * @covers SebastianBergmann\Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorOverlapingMatches2_toArray()
     {
         $expected = array();
         $expected[] = array('abcdde', self::REMOVED);
         $expected[] = array('abcde', self::ADDED);
 
-        $this->assertEquals($expected, $this->diff->diffToArray('abcdde', 'abcde'));
+        $this->assertEquals(
+          $expected, $this->differ->diffToArray('abcdde', 'abcde')
+        );
     }
 
+    /**
+     * @covers SebastianBergmann\Diff\Differ::diff
+     */
     public function testCustomHeader()
     {
-        $diff = new Diff('CUSTOM HEADER');
+        $differ = new Differ('CUSTOM HEADER');
 
         $this->assertEquals(
           "CUSTOM HEADER@@ @@\n-a\n+b\n",
-          $diff->diff('a', 'b')
+          $differ->diff('a', 'b')
         );
     }
 }