Skip to content

Commit 505d5ed

Browse files
authored
Merge pull request #4 from phalcongelist/2.0.x
Fixed Renderer namespace
2 parents 870b36b + 27748cc commit 505d5ed

File tree

9 files changed

+25
-18
lines changed

9 files changed

+25
-18
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# [2.0.2](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.2) (2016-07-18)
2+
3+
* Fixed Renderer namespace
4+
15
# [2.0.1](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.1) (2016-07-18)
26

37
* Fixed Composer autoload namespace

src/Diff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace Phalcon;
2020

2121
use Phalcon\Diff\SequenceMatcher;
22-
use Phalcon\Diff\Render\RenderInterface;
22+
use Phalcon\Diff\Renderer\RenderInterface;
2323

2424
/**
2525
* Diff

src/Diff/Renderer/AbstractRender.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
+------------------------------------------------------------------------+
1717
*/
1818

19-
namespace Phalcon\Diff\Render;
19+
namespace Phalcon\Diff\Renderer;
2020

2121
use Phalcon\Diff;
2222

2323
/**
2424
* Abstract class for diff renderers.
2525
*
26-
* @package Phalcon\Diff\Render
26+
* @package Phalcon\Diff\Renderer
2727
*/
2828
abstract class AbstractRender implements RenderInterface
2929
{

src/Diff/Renderer/Html/Array.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
+------------------------------------------------------------------------+
1717
*/
1818

19-
namespace Phalcon\Diff\Render\Html;
19+
namespace Phalcon\Diff\Renderer\Html;
2020

21-
use Phalcon\Diff\Render\AbstractRender;
21+
use Phalcon\Diff\Renderer\AbstractRender;
2222

2323
/**
2424
* Base renderer for rendering HTML based diffs for PHP DiffLib.
2525
*
26-
* @package Phalcon\Diff\Render\Text
26+
* @package Phalcon\Diff\Renderer\Text
2727
*/
2828
class BaseArray extends AbstractRender
2929
{

src/Diff/Renderer/Html/Inline.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
+------------------------------------------------------------------------+
1717
*/
1818

19-
namespace Phalcon\Diff\Render\Html;
19+
namespace Phalcon\Diff\Renderer\Html;
2020

2121
/**
2222
* Inline HTML diff generator for PHP DiffLib.
2323
*
24-
* @package Phalcon\Diff\Render\Html
24+
* @package Phalcon\Diff\Renderer\Html
2525
*/
2626
class Inline extends BaseArray
2727
{
@@ -35,6 +35,7 @@ public function render()
3535
{
3636
$changes = parent::render();
3737
$html = '';
38+
3839
if (empty($changes)) {
3940
return $html;
4041
}

src/Diff/Renderer/Html/SideBySide.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
+------------------------------------------------------------------------+
1717
*/
1818

19-
namespace Phalcon\Diff\Render\Html;
19+
namespace Phalcon\Diff\Renderer\Html;
2020

2121
/**
2222
* Side by Side HTML diff generator for PHP DiffLib.
2323
*
24-
* @package Phalcon\Diff\Render\Html
24+
* @package Phalcon\Diff\Renderer\Html
2525
*/
2626
class SideBySide extends BaseArray
2727
{
@@ -34,8 +34,8 @@ class SideBySide extends BaseArray
3434
public function render()
3535
{
3636
$changes = parent::render();
37-
3837
$html = '';
38+
3939
if (empty($changes)) {
4040
return $html;
4141
}

src/Diff/Renderer/RenderInterface.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
+------------------------------------------------------------------------+
1717
*/
1818

19-
namespace Phalcon\Diff\Render;
19+
namespace Phalcon\Diff\Renderer;
2020

2121
/**
2222
* Render Interface
23+
*
24+
* @package Phalcon\Diff\Renderer
2325
*/
2426
interface RenderInterface
2527
{

src/Diff/Renderer/Text/Context.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
+------------------------------------------------------------------------+
1717
*/
1818

19-
namespace Phalcon\Diff\Render\Text;
19+
namespace Phalcon\Diff\Renderer\Text;
2020

21-
use Phalcon\Diff\Render\AbstractRender;
21+
use Phalcon\Diff\Renderer\AbstractRender;
2222

2323
/**
2424
* Context diff generator for PHP DiffLib.
2525
*
26-
* @package Phalcon\Diff\Render\Text
26+
* @package Phalcon\Diff\Renderer\Text
2727
*/
2828
class Context extends AbstractRender
2929
{

src/Diff/Renderer/Text/Unified.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
+------------------------------------------------------------------------+
1717
*/
1818

19-
namespace Phalcon\Diff\Render\Text;
19+
namespace Phalcon\Diff\Renderer\Text;
2020

21-
use Phalcon\Diff\Render\AbstractRender;
21+
use Phalcon\Diff\Renderer\AbstractRender;
2222

2323
/**
2424
* Unified diff generator for PHP DiffLib.
2525
*
26-
* @package Phalcon\Diff\Render\Text
26+
* @package Phalcon\Diff\Renderer\Text
2727
*/
2828
class Unified extends AbstractRender
2929
{

0 commit comments

Comments
 (0)