bariew/finediff

PHP implementation of a Fine granularity Diff engine

0.3.1 2014-05-19 10:25 UTC

Requires

• php: >=5.3.0

Requires (Dev)

• mockery/mockery: *
• phpunit/phpunit: *

MIT

• Raymond Hill
• Rob Crowe

• text
• diff
• string
• finediff
• opcode

README

Originally written by Raymond Hill (https://github.com/gorhill/PHP-FineDiff) FineDiff has been tweaked to bring it up to date with the modern world. That means documented, nicely formatted, tested code that can be easily extended.

Installation

Composer

The preferred way of using FineDiff is through Composer.

Add the following to your composer.json file:

{
    "require": {
        "bariew/finediff": "0.3.*"
    }
}

Upgrading

0.3.x introduces a backwards incompatible version, so if you have stored opcodes do not upgrade!

0.3.x fixes a double encoding issue that generates a longer opcode than is needed.

Usage

Render HTML

Render as HTML the difference between two strings:

$diff = new bariew\FineDiff\Diff;
echo $diff->render('string one', 'string two');

This would then output:

string <ins>tw</ins>o<del>ne</del>

You could change the granularity to bariew\FineDiff\Granularity\Word so the output is:

string <del>one</del><ins>two</ins>

You do this by passing it into the Diff constructor:

$granularity = new bariew\FineDiff\Granularity\Word;
$diff        = new bariew\FineDiff\Diff($granularity);

Grab opcode instructions

Opcode instructions are what tell FineDiff how to change one string into another.

$diff = new bariew\FineDiff\Diff;
echo $diff->getOpcodes('string one', 'string two');

This would then output:

c7d3i3:two

Render text using the opcodes:

$render = new bariew\FineDiff\Render\Text;
echo $render->process('string one', 'c7d3i3:two');

Would output:

string two

Same with HTML:

$render = new bariew\FineDiff\Render\Html;
echo $render->process('string one', 'c7d3i3:two');

License

Copyright (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441) Copyright (c) 2013 Rob Crowe (http://bariew.com)

Licensed under The MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.