Skip to content
This repository has been archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FineDiff

Originally written by Raymond Hill ([https://github.com/gorhill/PHP-FineDiff](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.

[![Build Status](https://travis-ci.org/cogpowered/FineDiff.png?branch=master)](https://travis-ci.org/cogpowered/FineDiff)
[![Build Status](https://travis-ci.org/bariew/FineDiff.png?branch=master)](https://travis-ci.org/bariew/FineDiff)

Installation
------------
Expand All @@ -17,7 +17,7 @@ Add the following to your composer.json file:
```json
{
"require": {
"cogpowered/finediff": "0.3.*"
"bariew/finediff": "0.3.*"
}
}
```
Expand All @@ -38,7 +38,7 @@ Usage
Render as HTML the difference between two strings:

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

Expand All @@ -48,7 +48,7 @@ This would then output:
string <ins>tw</ins>o<del>ne</del>
```

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

```html
string <del>one</del><ins>two</ins>
Expand All @@ -57,16 +57,16 @@ string <del>one</del><ins>two</ins>
You do this by passing it into the Diff constructor:

```php
$granularity = new cogpowered\FineDiff\Granularity\Word;
$diff = new cogpowered\FineDiff\Diff($granularity);
$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.

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

Expand All @@ -78,7 +78,7 @@ c7d3i3:two

Render text using the opcodes:
```php
$render = new cogpowered\FineDiff\Render\Text;
$render = new bariew\FineDiff\Render\Text;
echo $render->process('string one', 'c7d3i3:two');
```

Expand All @@ -89,15 +89,15 @@ string two

Same with HTML:
```php
$render = new cogpowered\FineDiff\Render\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://cogpowered.com)
Copyright (c) 2013 Rob Crowe (http://bariew.com)

Licensed under The MIT License

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cogpowered/finediff",
"name": "bariew/finediff",
"description": "PHP implementation of a Fine granularity Diff engine",
"homepage": "https://github.com/cogpowered/FineDiff",
"homepage": "https://github.com/bariew/FineDiff",
"license": "MIT",
"keywords": ["finediff", "diff", "text", "string", "opcode"],
"authors": [
Expand All @@ -10,7 +10,7 @@
},
{
"name": "Rob Crowe",
"email": "rob@cogpowered.com"
"email": "rob@bariew.com"
}
],
"type": "library",
Expand All @@ -22,6 +22,6 @@
"phpunit/phpunit": "*"
},
"autoload": {
"psr-0": { "cogpowered\\FineDiff": "src/" }
"psr-0": { "bariew\\FineDiff": "src/" }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
* one string into another.
*
* Originally created by Raymond Hill (https://github.com/gorhill/PHP-FineDiff), brought up
* to date by Cog Powered (https://github.com/cogpowered/FineDiff).
* to date by Cog Powered (https://github.com/bariew/FineDiff).
*
* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
* @copyright Copyright 2013 (c) Robert Crowe (http://cogpowered.com)
* @link https://github.com/cogpowered/FineDiff
* @copyright Copyright 2013 (c) Robert Crowe (http://bariew.com)
* @link https://github.com/bariew/FineDiff
* @version 0.0.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

namespace cogpowered\FineDiff;
namespace bariew\FineDiff;

/**
* Used by classes implementing cogpowered\FineDiff\Granularity\GranularityInterface.
* Used by classes implementing bariew\FineDiff\Granularity\GranularityInterface.
*
* Class is used more like an Enum type; the class can not be instantiated.
*/
Expand Down
50 changes: 25 additions & 25 deletions src/cogpowered/FineDiff/Diff.php → src/bariew/FineDiff/Diff.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,53 @@
* one string into another.
*
* Originally created by Raymond Hill (https://github.com/gorhill/PHP-FineDiff), brought up
* to date by Cog Powered (https://github.com/cogpowered/FineDiff).
* to date by Cog Powered (https://github.com/bariew/FineDiff).
*
* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
* @copyright Copyright 2013 (c) Robert Crowe (http://cogpowered.com)
* @link https://github.com/cogpowered/FineDiff
* @copyright Copyright 2013 (c) Robert Crowe (http://bariew.com)
* @link https://github.com/bariew/FineDiff
* @version 0.0.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

namespace cogpowered\FineDiff;
namespace bariew\FineDiff;

use cogpowered\FineDiff\Granularity\GranularityInterface;
use cogpowered\FineDiff\Render\RendererInterface;
use cogpowered\FineDiff\Parser\ParserInterface;
use cogpowered\FineDiff\Granularity\Character;
use cogpowered\FineDiff\Render\Html;
use cogpowered\FineDiff\Parser\Parser;
use bariew\FineDiff\Granularity\GranularityInterface;
use bariew\FineDiff\Render\RendererInterface;
use bariew\FineDiff\Parser\ParserInterface;
use bariew\FineDiff\Granularity\Character;
use bariew\FineDiff\Render\Html;
use bariew\FineDiff\Parser\Parser;

/**
* Diff class.
*/
class Diff
{
/**
* @var cogpowered\FineDiff\Granularity\GranularityInterface
* @var bariew\FineDiff\Granularity\GranularityInterface
*/
protected $granularity;

/**
* @var cogpowered\FineDiff\Render\RendererInterface
* @var bariew\FineDiff\Render\RendererInterface
*/
protected $renderer;

/**
* @var cogpowered\FineDiff\Parser\ParserInterface
* @var bariew\FineDiff\Parser\ParserInterface
*/
protected $parser;

/**
* Instantiate a new instance of Diff.
*
* @param cogpowered\FineDiff\Granularity\GranularityInterface $granularity Level of diff.
* @param cogpowered\FineDiff\Render\RenderInterface $renderer Diff renderer.
* @param cogpowered\FineDiff\Parser\ParserInterface $parser Parser used to generate opcodes.
* @param bariew\FineDiff\Granularity\GranularityInterface $granularity Level of diff.
* @param bariew\FineDiff\Render\RenderInterface $renderer Diff renderer.
* @param bariew\FineDiff\Parser\ParserInterface $parser Parser used to generate opcodes.
*
* @throws cogpowered\FineDiff\Exceptions\GranularityCountException
* @throws cogpowered\FineDiff\Exceptions\OperationException
* @throws bariew\FineDiff\Exceptions\GranularityCountException
* @throws bariew\FineDiff\Exceptions\OperationException
*/
public function __construct(GranularityInterface $granularity = null, RendererInterface $renderer = null, ParserInterface $parser = null)
{
Expand All @@ -72,7 +72,7 @@ public function __construct(GranularityInterface $granularity = null, RendererIn
/**
* Returns the granularity object used by the parser.
*
* @return @cogpowered\FineDiff\Granularity\GranularityInterface
* @return @bariew\FineDiff\Granularity\GranularityInterface
*/
public function getGranularity()
{
Expand All @@ -82,7 +82,7 @@ public function getGranularity()
/**
* Set the granularity level of the parser.
*
* @param cogpowered\FineDiff\Granularity\GranularityInterface $granularity
* @param bariew\FineDiff\Granularity\GranularityInterface $granularity
* @return void
*/
public function setGranularity(GranularityInterface $granularity)
Expand All @@ -93,7 +93,7 @@ public function setGranularity(GranularityInterface $granularity)
/**
* Get the render.
*
* @return cogpowered\FineDiff\Render\RendererInterface
* @return bariew\FineDiff\Render\RendererInterface
*/
public function getRenderer()
{
Expand All @@ -103,7 +103,7 @@ public function getRenderer()
/**
* Set the renderer.
*
* @param cogpowered\FineDiff\Render\RendererInterface $renderer
* @param bariew\FineDiff\Render\RendererInterface $renderer
* @return void
*/
public function setRenderer(RendererInterface $renderer)
Expand All @@ -114,7 +114,7 @@ public function setRenderer(RendererInterface $renderer)
/**
* Get the parser responsible for generating the diff/opcodes.
*
* @return cogpowered\FineDiff\Parser\ParserInterface
* @return bariew\FineDiff\Parser\ParserInterface
*/
public function getParser()
{
Expand All @@ -124,7 +124,7 @@ public function getParser()
/**
* Set the parser.
*
* @param cogpowered\FineDiff\Parser\ParserInterface $parser
* @param bariew\FineDiff\Parser\ParserInterface $parser
* @return void
*/
public function setParser(ParserInterface $parser)
Expand All @@ -138,7 +138,7 @@ public function setParser(ParserInterface $parser)
* Returns the opcode diff which can be used for example, to
* to generate a HTML report of the differences.
*
* @return cogpowered\FineDiff\Parser\Opcodes
* @return bariew\FineDiff\Parser\Opcodes
*/
public function getOpcodes($from_text, $to_text)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
* one string into another.
*
* Originally created by Raymond Hill (github.com/gorhill/PHP-FineDiff), brought up
* to date by Cog Powered (github.com/cogpowered/FineDiff).
* to date by Cog Powered (github.com/bariew/FineDiff).
*
* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
* @copyright Copyright 2013 (c) Robert Crowe (http://cogpowered.com)
* @link https://github.com/cogpowered/FineDiff
* @copyright Copyright 2013 (c) Robert Crowe (http://bariew.com)
* @link https://github.com/bariew/FineDiff
* @version 0.0.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

namespace cogpowered\FineDiff\Exceptions;
namespace bariew\FineDiff\Exceptions;

/**
* A granularity must have at least one thing to match against. Thrown when this isn't the case.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
* one string into another.
*
* Originally created by Raymond Hill (https://github.com/gorhill/PHP-FineDiff), brought up
* to date by Cog Powered (https://github.com/cogpowered/FineDiff).
* to date by Cog Powered (https://github.com/bariew/FineDiff).
*
* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
* @copyright Copyright 2013 (c) Robert Crowe (http://cogpowered.com)
* @link https://github.com/cogpowered/FineDiff
* @copyright Copyright 2013 (c) Robert Crowe (http://bariew.com)
* @link https://github.com/bariew/FineDiff
* @version 0.0.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

namespace cogpowered\FineDiff\Exceptions;
namespace bariew\FineDiff\Exceptions;

/**
* Thrown when trying to set an opcode that doesn't implement cogpowered\FineDiff\Parser\Operations\OperationInterface.
* Thrown when trying to set an opcode that doesn't implement bariew\FineDiff\Parser\Operations\OperationInterface.
*/
class OperationException extends \Exception {}
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
* one string into another.
*
* Originally created by Raymond Hill (https://github.com/gorhill/PHP-FineDiff), brought up
* to date by Cog Powered (https://github.com/cogpowered/FineDiff).
* to date by Cog Powered (https://github.com/bariew/FineDiff).
*
* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
* @copyright Copyright 2013 (c) Robert Crowe (http://cogpowered.com)
* @link https://github.com/cogpowered/FineDiff
* @copyright Copyright 2013 (c) Robert Crowe (http://bariew.com)
* @link https://github.com/bariew/FineDiff
* @version 0.0.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

namespace cogpowered\FineDiff\Granularity;
namespace bariew\FineDiff\Granularity;

use cogpowered\FineDiff\Delimiters;
use bariew\FineDiff\Delimiters;

/**
* Character level granularity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
* one string into another.
*
* Originally created by Raymond Hill (https://github.com/gorhill/PHP-FineDiff), brought up
* to date by Cog Powered (https://github.com/cogpowered/FineDiff).
* to date by Cog Powered (https://github.com/bariew/FineDiff).
*
* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
* @copyright Copyright 2013 (c) Robert Crowe (http://cogpowered.com)
* @link https://github.com/cogpowered/FineDiff
* @copyright Copyright 2013 (c) Robert Crowe (http://bariew.com)
* @link https://github.com/bariew/FineDiff
* @version 0.0.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

namespace cogpowered\FineDiff\Granularity;
namespace bariew\FineDiff\Granularity;

/**
* Granularities should extend this class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
* one string into another.
*
* Originally created by Raymond Hill (https://github.com/gorhill/PHP-FineDiff), brought up
* to date by Cog Powered (https://github.com/cogpowered/FineDiff).
* to date by Cog Powered (https://github.com/bariew/FineDiff).
*
* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
* @copyright Copyright 2013 (c) Robert Crowe (http://cogpowered.com)
* @link https://github.com/cogpowered/FineDiff
* @copyright Copyright 2013 (c) Robert Crowe (http://bariew.com)
* @link https://github.com/bariew/FineDiff
* @version 0.0.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

namespace cogpowered\FineDiff\Granularity;
namespace bariew\FineDiff\Granularity;

interface GranularityInterface
{
Expand Down
Loading