Skip to content

Commit 926bd61

Browse files
authored
Merge pull request #30 from JBlond/development
Merge Development into Master
2 parents 437cc3d + dc68ae0 commit 926bd61

File tree

5 files changed

+95
-101
lines changed

5 files changed

+95
-101
lines changed

lib/Autoloader.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* PHP version 7.2 or greater
1111
*
1212
* @package jblond
13-
* @author Chris Boulton <[email protected]>
14-
* @copyright (c) 2009 Chris Boulton
13+
* @author Mario Brandt <[email protected]>
14+
* @copyright (c) 2015 Mario Brandt
1515
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
1616
* @version 1.16
1717
* @link https://github.com/JBlond/php-diff

lib/jblond/Diff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public function render(object $renderer)
186186
* End of the range is defined by the second parameter.
187187
*
188188
* If the arguments for both parameters are omitted, the entire array will be returned.
189-
* If the argument for the second parameter is ommitted, the element defined as start will be returned.
189+
* If the argument for the second parameter is omitted, the element defined as start will be returned.
190190
*
191191
* @param array $array The source array.
192192
* @param int $start The first element of the range to get.

lib/jblond/Diff/Renderer/RendererAbstract.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ abstract class RendererAbstract
3030
/**
3131
* @var array Array of the default options that apply to this renderer.
3232
*/
33-
protected $defaultOptions = array(
33+
protected $defaultOptions = [
3434
'title1' => 'Version1',
3535
'title2' => 'Version2',
36-
);
36+
];
3737

3838
/**
3939
* @var array Array containing the user applied and merged default options for the renderer.
4040
*/
41-
protected $options = array();
41+
protected $options = [];
4242

4343
/**
4444
* The constructor. Instantiates the rendering engine and if options are passed,
4545
* sets the options for the renderer.
4646
*
4747
* @param array $options Optionally, an array of the options for the renderer.
4848
*/
49-
public function __construct(array $options = array())
49+
public function __construct(array $options = [])
5050
{
5151
$this->setOptions($options);
5252
}

0 commit comments

Comments
 (0)