Skip to content

Commit 1d15164

Browse files
committed
add name spacing
1 parent e64716d commit 1d15164

File tree

9 files changed

+22
-6
lines changed

9 files changed

+22
-6
lines changed

example/example.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
);
2525

2626
// Initialize the diff class
27-
$diff = new Diff($a, $b, $options);
27+
$diff = new \jblond\Diff($a, $b, $options);
2828

2929
?>
3030
<h2>Side by Side Diff</h2>
3131
<?php
3232

3333
// Generate a side by side diff
3434
require_once dirname(__FILE__).'/../lib/Diff/Renderer/Html/SideBySide.php';
35-
$renderer = new Diff_Renderer_Html_SideBySide(array(
35+
$renderer = new \jblond\Diff_Renderer_Html_SideBySide(array(
3636
'title_a' => 'Custom title for OLD version',
3737
'title_b' => 'Custom title for NEW version',
3838
));
@@ -44,7 +44,7 @@
4444

4545
// Generate an inline diff
4646
require_once dirname(__FILE__).'/../lib/Diff/Renderer/Html/Inline.php';
47-
$renderer = new Diff_Renderer_Html_Inline;
47+
$renderer = new \jblond\Diff_Renderer_Html_Inline;
4848
echo $diff->render($renderer);
4949

5050
?>
@@ -53,7 +53,7 @@
5353

5454
// Generate a unified diff
5555
require_once dirname(__FILE__).'/../lib/Diff/Renderer/Text/Unified.php';
56-
$renderer = new Diff_Renderer_Text_Unified;
56+
$renderer = new \jblond\Diff_Renderer_Text_Unified;
5757
echo htmlspecialchars($diff->render($renderer));
5858

5959
?>
@@ -63,7 +63,7 @@
6363

6464
// Generate a context diff
6565
require_once dirname(__FILE__).'/../lib/Diff/Renderer/Text/Context.php';
66-
$renderer = new Diff_Renderer_Text_Context;
66+
$renderer = new \jblond\Diff_Renderer_Text_Context;
6767
echo htmlspecialchars($diff->render($renderer));
6868
?>
6969
</pre>

lib/Diff.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Diff
46
*
@@ -97,7 +99,7 @@ public function __construct($a, $b, $options=array())
9799
/**
98100
* Render a diff using the supplied rendering class and return it.
99101
*
100-
* @param \Diff_Renderer_Abstract|object $renderer An instance of the rendering object to use for generating the diff.
102+
* @param \jblond\Diff_Renderer_Abstract|object $renderer An instance of the rendering object to use for generating the diff.
101103
*
102104
* @return mixed The generated diff. Exact return value depends on the rendered.
103105
*/

lib/Diff/Renderer/Abstract.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Abstract class for diff renderers in PHP DiffLib.
46
*

lib/Diff/Renderer/Html/Array.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Base renderer for rendering HTML based diffs for PHP DiffLib.
46
*

lib/Diff/Renderer/Html/Inline.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Inline HTML diff generator for PHP DiffLib.
46
*

lib/Diff/Renderer/Html/SideBySide.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Side by Side HTML diff generator for PHP DiffLib.
46
*

lib/Diff/Renderer/Text/Context.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Context diff generator for PHP DiffLib.
46
*

lib/Diff/Renderer/Text/Unified.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Unified diff generator for PHP DiffLib.
46
*

lib/Diff/SequenceMatcher.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
namespace jblond;
3+
24
/**
35
* Sequence matcher for Diff
46
*

0 commit comments

Comments
 (0)