Skip to content

Commit 9dcbfa2

Browse files
JBlondJBlond
committed
Merge remote-tracking branch 'origin/development' into development
2 parents f755fce + e0f6842 commit 9dcbfa2

File tree

2 files changed

+58
-64
lines changed

2 files changed

+58
-64
lines changed

‎example/example.php

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8"/>
5-
<title>PHP LibDiff - Examples</title>
6-
<link rel="stylesheet" href="styles.css" type="text/css" charset="utf-8"/>
7-
</head>
8-
<body>
9-
<h1>PHP LibDiff - Examples</h1>
10-
<hr />
11-
<?php
12-
// include autoloader
13-
require dirname(__FILE__).'/../lib/Autoloader.php';
14-
new \jblond\Autoloader();
3+
<head>
4+
<meta charset="utf-8"/>
5+
<title>PHP LibDiff - Examples</title>
6+
<link rel="stylesheet" href="styles.css" type="text/css" charset="utf-8"/>
7+
</head>
8+
<body>
9+
<h1>PHP LibDiff - Examples</h1>
10+
<hr />
11+
<?php
12+
// include autoloader
13+
require dirname(__FILE__).'/../lib/Autoloader.php';
14+
new \jblond\Autoloader();
1515

16-
// Include two sample files for comparison
17-
$a = explode("\n", file_get_contents(dirname(__FILE__).'/a.txt'));
18-
$b = explode("\n", file_get_contents(dirname(__FILE__).'/b.txt'));
16+
// Include two sample files for comparison
17+
$a = explode("\n", file_get_contents(dirname(__FILE__).'/a.txt'));
18+
$b = explode("\n", file_get_contents(dirname(__FILE__).'/b.txt'));
1919

20-
// Options for generating the diff
21-
$options = array(
22-
//'ignoreWhitespace' => true,
23-
//'ignoreCase' => true,
24-
);
20+
// Options for generating the diff
21+
$options = array(
22+
//'ignoreWhitespace' => true,
23+
//'ignoreCase' => true,
24+
);
2525

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

29-
?>
30-
<h2>Side by Side Diff</h2>
31-
<?php
29+
?>
30+
<h2>Side by Side Diff</h2>
31+
<?php
3232

33-
// Generate a side by side diff
33+
// Generate a side by side diff
3434
$renderer = new \jblond\Diff\Renderer\Html\SideBySide(array(
3535
'title_a' => 'Custom title for OLD version',
3636
'title_b' => 'Custom title for NEW version',
3737
));
38-
echo $diff->Render($renderer);
38+
echo $diff->Render($renderer);
3939

40-
?>
41-
<h2>Inline Diff</h2>
42-
<?php
40+
?>
41+
<h2>Inline Diff</h2>
42+
<?php
4343

44-
// Generate an inline diff
45-
$renderer = new \jblond\Diff\Renderer\Html\Inline;
46-
echo $diff->render($renderer);
44+
// Generate an inline diff
45+
$renderer = new \jblond\Diff\Renderer\Html\Inline;
46+
echo $diff->render($renderer);
4747

48-
?>
49-
<h2>Unified Diff</h2>
50-
<pre><?php
48+
?>
49+
<h2>Unified Diff</h2>
50+
<pre><?php
5151

52-
// Generate a unified diff
53-
$renderer = new \jblond\Diff\Renderer\Text\Unified();
54-
echo htmlspecialchars($diff->render($renderer));
52+
// Generate a unified diff
53+
$renderer = new \jblond\Diff\Renderer\Text\Unified();
54+
echo htmlspecialchars($diff->render($renderer));
5555

56-
?>
57-
</pre>
58-
<h2>Context Diff</h2>
59-
<pre><?php
56+
?>
57+
</pre>
58+
<h2>Context Diff</h2>
59+
<pre><?php
6060

61-
// Generate a context diff
62-
$renderer = new \jblond\Diff\Renderer\Text\Context;
63-
echo htmlspecialchars($diff->render($renderer));
64-
?>
65-
</pre>
66-
</body>
61+
// Generate a context diff
62+
$renderer = new \jblond\Diff\Renderer\Text\Context;
63+
echo htmlspecialchars($diff->render($renderer));
64+
?>
65+
</pre>
66+
</body>
6767
</html>

‎lib/Autoloader.php

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,13 @@ class Autoloader
1313
*/
1414
public function __construct()
1515
{
16-
spl_autoload_register(array($this, '__autoload'));
17-
}
18-
19-
/**
20-
* @param string $class
21-
*/
22-
private function __autoload($class)
23-
{
24-
$class = str_replace('\\', '/', $class); // revert path for old PHP on Linux
25-
$dir = str_replace('\\', '/', __DIR__);
26-
if (file_exists($dir . '/' . $class . '.php')) {
27-
/** @noinspection PhpIncludeInspection */
28-
require_once $dir . '/' . $class . '.php';
29-
}
16+
spl_autoload_register(function ($class) {
17+
$class = str_replace('\\', '/', $class); // revert path for old PHP on Linux
18+
$dir = str_replace('\\', '/', __DIR__);
19+
if (file_exists($dir . '/' . $class . '.php')) {
20+
/** @noinspection PhpIncludeInspection */
21+
require_once $dir . '/' . $class . '.php';
22+
}
23+
});
3024
}
3125
}

0 commit comments

Comments
 (0)