Skip to content

Commit 0f19a43

Browse files
committed
Remove forceutf8 library from composer
1 parent 2e4a1b9 commit 0f19a43

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
},
2121
"require": {
2222
"php": ">=5.3.3",
23-
"neitanod/forceutf8": "^2.0",
2423
"ezyang/htmlpurifier": "^4.7"
2524
},
2625
"autoload": {

demo/index.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22

33
use Caxy\HtmlDiff\HtmlDiff;
4-
use ForceUTF8\Encoding;
54

65
ini_set('display_errors', 1);
76
error_reporting(E_ALL);
@@ -32,11 +31,8 @@ function addDebugOutput($value, $key = 'general')
3231

3332
$data = json_decode($input, true);
3433

35-
// $oldText = $data['oldText'];
36-
// $newText = $data['newText'];
37-
38-
$oldText = Encoding::toUTF8($data['oldText']);
39-
$newText = Encoding::toUTF8($data['newText']);
34+
$oldText = $data['oldText'];
35+
$newText = $data['newText'];
4036
$useTableDiffing = isset($data['tableDiffing']) ? $data['tableDiffing'] : true;
4137

4238
$diff = new HtmlDiff($oldText, $newText, 'UTF-8', array());
@@ -50,7 +46,6 @@ function addDebugOutput($value, $key = 'general')
5046
$diff->build();
5147

5248
echo json_encode(array('diff' => $diff->getDifference(), 'debug' => $debugOutput));
53-
// echo $diff->getDifference();
5449
} else {
5550
header('Content-Type: text/html');
5651
echo file_get_contents('demo.html');

lib/Caxy/HtmlDiff/Table/TableDiff.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ class TableDiff extends AbstractDiff
5656
*/
5757
protected $purifier;
5858

59+
/**
60+
* @var string
61+
*/
5962
protected $strategy = self::STRATEGY_MATCHING;
6063

6164
public function __construct($oldText, $newText, $encoding, $specialCaseTags, $groupDiffs)

0 commit comments

Comments
 (0)