Skip to content

Commit 07d5cbe

Browse files
Fix CS/WS issues
1 parent 863df96 commit 07d5cbe

8 files changed

+9
-62
lines changed

src/Chunk.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
namespace SebastianBergmann\Diff;
1212

1313
/**
14-
* @package Diff
15-
* @author Sebastian Bergmann <[email protected]>
16-
* @author Kore Nordmann <[email protected]>
17-
* @copyright Sebastian Bergmann <[email protected]>
18-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
19-
* @link http://www.github.com/sebastianbergmann/diff
2014
*/
2115
class Chunk
2216
{

src/Diff.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
namespace SebastianBergmann\Diff;
1212

1313
/**
14-
* @package Diff
15-
* @author Sebastian Bergmann <[email protected]>
16-
* @author Kore Nordmann <[email protected]>
17-
* @copyright Sebastian Bergmann <[email protected]>
18-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
19-
* @link http://www.github.com/sebastianbergmann/diff
2014
*/
2115
class Diff
2216
{

src/Differ.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
/**
1818
* Diff implementation.
19-
*
20-
* @package Diff
21-
* @author Sebastian Bergmann <[email protected]>
22-
* @author Kore Nordmann <[email protected]>
23-
* @copyright Sebastian Bergmann <[email protected]>
24-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
25-
* @link http://www.github.com/sebastianbergmann/diff
2619
*/
2720
class Differ
2821
{
@@ -221,8 +214,8 @@ public function diffToArray($from, $to, LongestCommonSubsequence $lcs = null)
221214
}
222215

223216
/**
224-
* @param array $from
225-
* @param array $to
217+
* @param array $from
218+
* @param array $to
226219
* @return LongestCommonSubsequence
227220
*/
228221
private function selectLcsImplementation(array $from, array $to)
@@ -245,7 +238,7 @@ private function selectLcsImplementation(array $from, array $to)
245238
*
246239
* @param array $from
247240
* @param array $to
248-
* @return integer
241+
* @return int
249242
*/
250243
private function calculateEstimatedFootprint(array $from, array $to)
251244
{

src/LCS/LongestCommonSubsequence.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212

1313
/**
1414
* Interface for implementations of longest common subsequence calculation.
15-
*
16-
* @package Diff
17-
* @author Sebastian Bergmann <[email protected]>
18-
* @author Kore Nordmann <[email protected]>
19-
* @copyright Sebastian Bergmann <[email protected]>
20-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
21-
* @link http://www.github.com/sebastianbergmann/diff
2215
*/
2316
interface LongestCommonSubsequence
2417
{

src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212

1313
/**
1414
* Memory-efficient implementation of longest common subsequence calculation.
15-
*
16-
* @package Diff
17-
* @author Sebastian Bergmann <[email protected]>
18-
* @author Denes Lados <[email protected]>
19-
* @copyright Sebastian Bergmann <[email protected]>
20-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
21-
* @link http://www.github.com/sebastianbergmann/diff
2215
*/
2316
class MemoryEfficientImplementation implements LongestCommonSubsequence
2417
{
@@ -71,8 +64,8 @@ public function calculate(array $from, array $to)
7164
}
7265

7366
/**
74-
* @param array $from
75-
* @param array $to
67+
* @param array $from
68+
* @param array $to
7669
* @return array
7770
*/
7871
private function length(array $from, array $to)

src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212

1313
/**
1414
* Time-efficient implementation of longest common subsequence calculation.
15-
*
16-
* @package Diff
17-
* @author Sebastian Bergmann <[email protected]>
18-
* @author Kore Nordmann <[email protected]>
19-
* @copyright Sebastian Bergmann <[email protected]>
20-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
21-
* @link http://www.github.com/sebastianbergmann/diff
2215
*/
2316
class TimeEfficientImplementation implements LongestCommonSubsequence
2417
{
@@ -47,7 +40,7 @@ public function calculate(array $from, array $to)
4740

4841
for ($i = 1; $i <= $fromLength; ++$i) {
4942
for ($j = 1; $j <= $toLength; ++$j) {
50-
$o = ($j * $width) + $i;
43+
$o = ($j * $width) + $i;
5144
$matrix[$o] = max(
5245
$matrix[$o - 1],
5346
$matrix[$o - $width],

src/Line.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,11 @@
1111
namespace SebastianBergmann\Diff;
1212

1313
/**
14-
* @package Diff
15-
* @author Sebastian Bergmann <[email protected]>
16-
* @author Kore Nordmann <[email protected]>
17-
* @copyright Sebastian Bergmann <[email protected]>
18-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
19-
* @link http://www.github.com/sebastianbergmann/diff
2014
*/
2115
class Line
2216
{
23-
const ADDED = 1;
24-
const REMOVED = 2;
17+
const ADDED = 1;
18+
const REMOVED = 2;
2519
const UNCHANGED = 3;
2620

2721
/**

src/Parser.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212

1313
/**
1414
* Unified diff parser.
15-
*
16-
* @package Diff
17-
* @author Sebastian Bergmann <[email protected]>
18-
* @author Kore Nordmann <[email protected]>
19-
* @copyright Sebastian Bergmann <[email protected]>
20-
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
21-
* @link http://www.github.com/sebastianbergmann/diff
2215
*/
2316
class Parser
2417
{
@@ -78,7 +71,7 @@ private function parseFileDiff(Diff $diff, array $lines)
7871
isset($match['endrange']) ? max(1, $match['endrange']) : 1
7972
);
8073

81-
$chunks[] = $chunk;
74+
$chunks[] = $chunk;
8275
$diffLines = array();
8376
continue;
8477
}

0 commit comments

Comments
 (0)