This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3

Open
bariew wants to merge 3 commits into
base:master
Choose a base branch
from
Open

added mb_ str functions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85109e1
added mb_ str functions
bariew Jun 28, 2016
4ad6d44
changed to bariew
bariew Jun 28, 2016
b08b627
fix
bariew Jun 28, 2016
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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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/" }
}
}
10 changes: 5 additions & 5 deletions src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
8 changes: 4 additions & 4 deletions .../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php
View file
Open in desktop
Original file line numberDiff line numberDiff 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
10 changes: 5 additions & 5 deletions ...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php
View file
Open in desktop
Original file line numberDiff line numberDiff 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 {}
10 changes: 5 additions & 5 deletions ...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php
View file
Open in desktop
Original file line numberDiff line numberDiff 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
8 changes: 4 additions & 4 deletions ...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php
View file
Open in desktop
Original file line numberDiff line numberDiff 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
8 changes: 4 additions & 4 deletions ...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php
View file
Open in desktop
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3
 Open

bariew
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


added mb_ str functions
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
85109e1

added mb_ str functions


bariew Jun 28, 2016
4ad6d44

changed to bariew


bariew Jun 28, 2016
b08b627

fix


bariew Jun 28, 2016

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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/" }
 }
}

10 changes: 5 additions & 5 deletions
src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
.../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

10 changes: 5 additions & 5 deletions
...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 {}

10 changes: 5 additions & 5 deletions
...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3
 Open

bariew
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


added mb_ str functions
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
85109e1

added mb_ str functions


bariew Jun 28, 2016
4ad6d44

changed to bariew


bariew Jun 28, 2016
b08b627

fix


bariew Jun 28, 2016

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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/" }
 }
}

10 changes: 5 additions & 5 deletions
src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
.../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

10 changes: 5 additions & 5 deletions
...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 {}

10 changes: 5 additions & 5 deletions
...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3
 Open

bariew
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


added mb_ str functions
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
85109e1

added mb_ str functions


bariew Jun 28, 2016
4ad6d44

changed to bariew


bariew Jun 28, 2016
b08b627

fix


bariew Jun 28, 2016

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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/" }
 }
}

10 changes: 5 additions & 5 deletions
src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
.../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

10 changes: 5 additions & 5 deletions
...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 {}

10 changes: 5 additions & 5 deletions
...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3
 Open

bariew
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


added mb_ str functions
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
85109e1

added mb_ str functions


bariew Jun 28, 2016
4ad6d44

changed to bariew


bariew Jun 28, 2016
b08b627

fix


bariew Jun 28, 2016

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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/" }
 }
}

10 changes: 5 additions & 5 deletions
src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
.../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

10 changes: 5 additions & 5 deletions
...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 {}

10 changes: 5 additions & 5 deletions
...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3
 Open

bariew
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


added mb_ str functions
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
85109e1

added mb_ str functions


bariew Jun 28, 2016
4ad6d44

changed to bariew


bariew Jun 28, 2016
b08b627

fix


bariew Jun 28, 2016

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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/" }
 }
}

10 changes: 5 additions & 5 deletions
src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
.../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

10 changes: 5 additions & 5 deletions
...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 {}

10 changes: 5 additions & 5 deletions
...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3
 Open

bariew
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


added mb_ str functions
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
85109e1

added mb_ str functions


bariew Jun 28, 2016
4ad6d44

changed to bariew


bariew Jun 28, 2016
b08b627

fix


bariew Jun 28, 2016

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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/" }
 }
}

10 changes: 5 additions & 5 deletions
src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
.../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

10 changes: 5 additions & 5 deletions
...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 {}

10 changes: 5 additions & 5 deletions
...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Jan 6, 2022. It is now read-only.

added mb_ str functions#3
 Open

bariew
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


added mb_ str functions
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
85109e1

added mb_ str functions


bariew Jun 28, 2016
4ad6d44

changed to bariew


bariew Jun 28, 2016
b08b627

fix


bariew Jun 28, 2016

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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/" }
 }
}

10 changes: 5 additions & 5 deletions
src/cogpowered/FineDiff/Delimiters.php → src/bariew/FineDiff/Delimiters.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
.../Exceptions/GranularityCountException.php → .../Exceptions/GranularityCountException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

10 changes: 5 additions & 5 deletions
...ineDiff/Exceptions/OperationException.php → ...ineDiff/Exceptions/OperationException.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 {}

10 changes: 5 additions & 5 deletions
...owered/FineDiff/Granularity/Character.php → ...bariew/FineDiff/Granularity/Character.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...ered/FineDiff/Granularity/Granularity.php → ...riew/FineDiff/Granularity/Granularity.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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

8 changes: 4 additions & 4 deletions
...Diff/Granularity/GranularityInterface.php → ...Diff/Granularity/GranularityInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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