Merge branch 'master' into php-dif-60

Author: JBlond

README.md

@@ -113,12 +113,14 @@ Included is a light and a dark theme.
 * PHP Multibyte String
 * [jblond/php-cli](https://github.com/jblond/php-cli) (suggested)
 
-## Issues and feature requests
+## Contribution, Issues and feature requests
 
 If you found a bug, or have an idea for new functionality, 
 feel free to report it on the issue tracker - just use search beforehand.
 [Issue tracker](https://github.com/JBlond/php-diff/issues)
 
+You can also fork this repository and open a PR.
+
 ## Merge files using jQuery
 
 Xiphe has build a jQuery plugin with that you can merge the compared files.

lib/jblond/Diff/Renderer/MainRenderer.php

@@ -190,7 +190,7 @@ protected function renderSequences(): array
      * @param int   $endOld   last line of the block in old to replace.
      * @param int   $startNew First line of the block in new to replace.
      */
-    private function markInlineChange(array &$oldText, array &$newText, $startOld, $endOld, $startNew)
+    private function markInlineChange(array &$oldText, array &$newText, int $startOld, int $endOld, int $startNew)
     {
         for ($iterator = 0; $iterator < ($endOld - $startOld); ++$iterator) {
             // Check each line in the block for differences.

lib/jblond/Diff/Renderer/Text/InlineCli.php

@@ -71,7 +71,7 @@ public function generateDiffHeader(): string
      *
      * @return string Start of the diff view.
      */
-    public function generateBlockHeader($changes): string
+    public function generateBlockHeader(array $changes): string
     {
         return '';
     }