Switch NS

SpacePossum · SpacePossum · commit 864c4ab5eadf · 2017-08-23T13:21:26.000+02:00
diff --git a/composer.json b/composer.json
@@ -26,6 +26,6 @@
         ]
     },
     "autoload-dev": {
-        "psr-4": { "SebastianBergmann\\Diff\\Tests\\": "tests/" }
+        "psr-4": { "PhpCsFixer\\Diff\\Tests\\": "tests/" }
     }
 }
diff --git a/src/Chunk.php b/src/Chunk.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 final class Chunk
 {
diff --git a/src/Diff.php b/src/Diff.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 final class Diff
 {
diff --git a/src/Differ.php b/src/Differ.php
@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
-use SebastianBergmann\Diff\Output\DiffOutputBuilderInterface;
-use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
+use PhpCsFixer\Diff\Output\DiffOutputBuilderInterface;
+use PhpCsFixer\Diff\Output\UnifiedDiffOutputBuilder;
 
 /**
  * Diff implementation.
diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 interface Exception
 {
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 class InvalidArgumentException extends \InvalidArgumentException implements Exception
 {
diff --git a/src/Line.php b/src/Line.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 final class Line
 {
diff --git a/src/LongestCommonSubsequenceCalculator.php b/src/LongestCommonSubsequenceCalculator.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 interface LongestCommonSubsequenceCalculator
 {
diff --git a/src/MemoryEfficientLongestCommonSubsequenceCalculator.php b/src/MemoryEfficientLongestCommonSubsequenceCalculator.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 final class MemoryEfficientLongestCommonSubsequenceCalculator implements LongestCommonSubsequenceCalculator
 {
diff --git a/src/Output/AbstractChunkOutputBuilder.php b/src/Output/AbstractChunkOutputBuilder.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\Output;
+namespace PhpCsFixer\Diff\Output;
 
 abstract class AbstractChunkOutputBuilder implements DiffOutputBuilderInterface
 {
diff --git a/src/Output/DiffOnlyOutputBuilder.php b/src/Output/DiffOnlyOutputBuilder.php
@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\Diff\Output;
+namespace PhpCsFixer\Diff\Output;
 
 /**
  * Builds a diff string representation in a loose unified diff format
diff --git a/src/Output/DiffOutputBuilderInterface.php b/src/Output/DiffOutputBuilderInterface.php
@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\Diff\Output;
+namespace PhpCsFixer\Diff\Output;
 
 /**
  * Defines how an output builder should take a generated
diff --git a/src/Output/UnifiedDiffOutputBuilder.php b/src/Output/UnifiedDiffOutputBuilder.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\Output;
+namespace PhpCsFixer\Diff\Output;
 
 /**
  * Builds a diff string representation in unified diff format in chunks.
diff --git a/src/Parser.php b/src/Parser.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 /**
  * Unified diff parser.
diff --git a/src/TimeEfficientLongestCommonSubsequenceCalculator.php b/src/TimeEfficientLongestCommonSubsequenceCalculator.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 final class TimeEfficientLongestCommonSubsequenceCalculator implements LongestCommonSubsequenceCalculator
 {
diff --git a/tests/ChunkTest.php b/tests/ChunkTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/CommonChunksTestOutputBuilder.php b/tests/CommonChunksTestOutputBuilder.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff\Tests;
+namespace PhpCsFixer\Diff\Tests;
 
-use SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder;
+use PhpCsFixer\Diff\Output\AbstractChunkOutputBuilder;
 
 /**
  * @author SpacePossum
diff --git a/tests/DiffTest.php b/tests/DiffTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/DifferTest.php b/tests/DifferTest.php
@@ -8,13 +8,12 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 use PHPUnit\Framework\TestCase;
-use SebastianBergmann\Diff\Output\AbstractChunkOutputBuilder;
-use SebastianBergmann\Diff\Output\DiffOnlyOutputBuilder;
-use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
-use SebastianBergmann\Diff\Tests\CommonChunksTestOutputBuilder;
+use PhpCsFixer\Diff\Output\DiffOnlyOutputBuilder;
+use PhpCsFixer\Diff\Output\UnifiedDiffOutputBuilder;
+use PhpCsFixer\Diff\Tests\CommonChunksTestOutputBuilder;
 
 /**
  * @covers SebastianBergmann\Diff\Differ
@@ -145,19 +144,6 @@ public function testTypesOtherThanArrayAndStringCanBePassed()
         );
     }
 
-    /**
-     * @param string $diff
-     * @param Diff[] $expected
-     * @dataProvider diffProvider
-     */
-    public function testParser($diff, array $expected)
-    {
-        $parser = new Parser;
-        $result = $parser->parse($diff);
-
-        $this->assertEquals($expected, $result);
-    }
-
     public function arrayProvider()
     {
         return [
@@ -410,20 +396,6 @@ public function textProvider()
         ];
     }
 
-    public function diffProvider()
-    {
-        $serialized_arr = <<<EOL
-a:1:{i:0;O:27:"SebastianBergmann\Diff\Diff":3:{s:33:" SebastianBergmann\Diff\Diff from";s:7:"old.txt";s:31:" SebastianBergmann\Diff\Diff to";s:7:"new.txt";s:35:" SebastianBergmann\Diff\Diff chunks";a:3:{i:0;O:28:"SebastianBergmann\Diff\Chunk":5:{s:35:" SebastianBergmann\Diff\Chunk start";i:1;s:40:" SebastianBergmann\Diff\Chunk startRange";i:3;s:33:" SebastianBergmann\Diff\Chunk end";i:1;s:38:" SebastianBergmann\Diff\Chunk endRange";i:4;s:35:" SebastianBergmann\Diff\Chunk lines";a:4:{i:0;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:1;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222111";}i:1;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"1111111";}i:2;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"1111111";}i:3;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"1111111";}}}i:1;O:28:"SebastianBergmann\Diff\Chunk":5:{s:35:" SebastianBergmann\Diff\Chunk start";i:5;s:40:" SebastianBergmann\Diff\Chunk startRange";i:10;s:33:" SebastianBergmann\Diff\Chunk end";i:6;s:38:" SebastianBergmann\Diff\Chunk endRange";i:8;s:35:" SebastianBergmann\Diff\Chunk lines";a:11:{i:0;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"1111111";}i:1;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"1111111";}i:2;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"1111111";}i:3;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:8:"+1121211";}i:4;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"1111111";}i:5;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:8:"-1111111";}i:6;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:8:"-1111111";}i:7;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:8:"-2222222";}i:8;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}i:9;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}i:10;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}}}i:2;O:28:"SebastianBergmann\Diff\Chunk":5:{s:35:" SebastianBergmann\Diff\Chunk start";i:17;s:40:" SebastianBergmann\Diff\Chunk startRange";i:5;s:33:" SebastianBergmann\Diff\Chunk end";i:16;s:38:" SebastianBergmann\Diff\Chunk endRange";i:6;s:35:" SebastianBergmann\Diff\Chunk lines";a:6:{i:0;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}i:1;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}i:2;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}i:3;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:8:"+2122212";}i:4;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}i:5;O:27:"SebastianBergmann\Diff\Line":2:{s:33:" SebastianBergmann\Diff\Line type";i:3;s:36:" SebastianBergmann\Diff\Line content";s:7:"2222222";}}}}}}
-EOL;
-
-        return [
-            [
-                "--- old.txt	2014-11-04 08:51:02.661868729 +0300\n+++ new.txt	2014-11-04 08:51:02.665868730 +0300\n@@ -1,3 +1,4 @@\n+2222111\n 1111111\n 1111111\n 1111111\n@@ -5,10 +6,8 @@\n 1111111\n 1111111\n 1111111\n +1121211\n 1111111\n -1111111\n -1111111\n -2222222\n 2222222\n 2222222\n 2222222\n@@ -17,5 +16,6 @@\n 2222222\n 2222222\n 2222222\n +2122212\n 2222222\n 2222222\n",
-                \unserialize($serialized_arr)
-            ]
-        ];
-    }
-
     /**
      * @param string $expected
      * @param string $from
diff --git a/tests/DifferTestTest.php b/tests/DifferTestTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/LineTest.php b/tests/LineTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/LongestCommonSubsequenceTest.php b/tests/LongestCommonSubsequenceTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/MemoryEfficientImplementationTest.php b/tests/MemoryEfficientImplementationTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 /**
  * @covers SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/TimeEfficientImplementationTest.php b/tests/TimeEfficientImplementationTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 /**
  * @covers SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@`
`26`	`26`	`]`
`27`	`27`	`},`
`28`	`28`	`"autoload-dev": {`
`29`		`- "psr-4": { "SebastianBergmann\\Diff\\Tests\\": "tests/" }`
	`29`	`+ "psr-4": { "PhpCsFixer\\Diff\\Tests\\": "tests/" }`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* file that was distributed with this source code.`
`9`	`9`	`*/`
`10`	`10`
`11`		`-namespace SebastianBergmann\Diff;`
	`11`	`+namespace PhpCsFixer\Diff;`
`12`	`12`
`13`	`13`	`final class Chunk`
`14`	`14`	`{`