Skip to content

Fixed Renderer namespace #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# [2.0.2](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.2) (2016-07-18)

* Fixed Renderer namespace

# [2.0.1](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.1) (2016-07-18)

* Fixed Composer autoload namespace
Expand Down
2 changes: 1 addition & 1 deletion src/Diff.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
namespace Phalcon;

use Phalcon\Diff\SequenceMatcher;
use Phalcon\Diff\Render\RenderInterface;
use Phalcon\Diff\Renderer\RenderInterface;

/**
* Diff
Expand Down
4 changes: 2 additions & 2 deletions src/Diff/Renderer/AbstractRender.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
+------------------------------------------------------------------------+
*/

namespace Phalcon\Diff\Render;
namespace Phalcon\Diff\Renderer;

use Phalcon\Diff;

/**
* Abstract class for diff renderers.
*
* @package Phalcon\Diff\Render
* @package Phalcon\Diff\Renderer
*/
abstract class AbstractRender implements RenderInterface
{
Expand Down
6 changes: 3 additions & 3 deletions src/Diff/Renderer/Html/Array.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
+------------------------------------------------------------------------+
*/

namespace Phalcon\Diff\Render\Html;
namespace Phalcon\Diff\Renderer\Html;

use Phalcon\Diff\Render\AbstractRender;
use Phalcon\Diff\Renderer\AbstractRender;

/**
* Base renderer for rendering HTML based diffs for PHP DiffLib.
*
* @package Phalcon\Diff\Render\Text
* @package Phalcon\Diff\Renderer\Text
*/
class BaseArray extends AbstractRender
{
Expand Down
5 changes: 3 additions & 2 deletions src/Diff/Renderer/Html/Inline.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
+------------------------------------------------------------------------+
*/

namespace Phalcon\Diff\Render\Html;
namespace Phalcon\Diff\Renderer\Html;

/**
* Inline HTML diff generator for PHP DiffLib.
*
* @package Phalcon\Diff\Render\Html
* @package Phalcon\Diff\Renderer\Html
*/
class Inline extends BaseArray
{
Expand All @@ -35,6 +35,7 @@ public function render()
{
$changes = parent::render();
$html = '';

if (empty($changes)) {
return $html;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Diff/Renderer/Html/SideBySide.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
+------------------------------------------------------------------------+
*/

namespace Phalcon\Diff\Render\Html;
namespace Phalcon\Diff\Renderer\Html;

/**
* Side by Side HTML diff generator for PHP DiffLib.
*
* @package Phalcon\Diff\Render\Html
* @package Phalcon\Diff\Renderer\Html
*/
class SideBySide extends BaseArray
{
Expand All @@ -34,8 +34,8 @@ class SideBySide extends BaseArray
public function render()
{
$changes = parent::render();

$html = '';

if (empty($changes)) {
return $html;
}
Expand Down
4 changes: 3 additions & 1 deletion src/Diff/Renderer/RenderInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
+------------------------------------------------------------------------+
*/

namespace Phalcon\Diff\Render;
namespace Phalcon\Diff\Renderer;

/**
* Render Interface
*
* @package Phalcon\Diff\Renderer
*/
interface RenderInterface
{
Expand Down
6 changes: 3 additions & 3 deletions src/Diff/Renderer/Text/Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
+------------------------------------------------------------------------+
*/

namespace Phalcon\Diff\Render\Text;
namespace Phalcon\Diff\Renderer\Text;

use Phalcon\Diff\Render\AbstractRender;
use Phalcon\Diff\Renderer\AbstractRender;

/**
* Context diff generator for PHP DiffLib.
*
* @package Phalcon\Diff\Render\Text
* @package Phalcon\Diff\Renderer\Text
*/
class Context extends AbstractRender
{
Expand Down
6 changes: 3 additions & 3 deletions src/Diff/Renderer/Text/Unified.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
+------------------------------------------------------------------------+
*/

namespace Phalcon\Diff\Render\Text;
namespace Phalcon\Diff\Renderer\Text;

use Phalcon\Diff\Render\AbstractRender;
use Phalcon\Diff\Renderer\AbstractRender;

/**
* Unified diff generator for PHP DiffLib.
*
* @package Phalcon\Diff\Render\Text
* @package Phalcon\Diff\Renderer\Text
*/
class Unified extends AbstractRender
{
Expand Down