forked from phpspec/php-diff
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
moved Webonyx custom code from local SVN to here so that we can merge…
… with original branch
- Loading branch information
hungkoala
authored and
hungkoala
committed
Jan 23, 2015
1 parent
30e103d
commit 0a9b6b3
Showing
8 changed files
with
99 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,31 +5,31 @@ | |
| * PHP version 5 | ||
| * | ||
| * Copyright (c) 2009 Chris Boulton <[email protected]> | ||
| * | ||
| * | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * - Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * - Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * - Neither the name of the Chris Boulton nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this software | ||
| * - Neither the name of the Chris Boulton nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this software | ||
| * without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| * | ||
| * @package DiffLib | ||
|
|
@@ -40,104 +40,74 @@ | |
| * @link http://github.com/chrisboulton/php-diff | ||
| */ | ||
|
|
||
| require_once dirname(__FILE__).'/Array.php'; | ||
| require_once dirname(__FILE__) . '/Array.php'; | ||
|
|
||
| class Diff_Renderer_Html_Inline extends Diff_Renderer_Html_Array | ||
| { | ||
| /** | ||
| * Render a and return diff with changes between the two sequences | ||
| * displayed inline (under each other) | ||
| * | ||
| * @return string The generated inline diff. | ||
| */ | ||
| public function render() | ||
| { | ||
| $changes = parent::render(); | ||
| $html = ''; | ||
| if(empty($changes)) { | ||
| return $html; | ||
| } | ||
|
|
||
| $html .= '<table class="Differences DifferencesInline">'; | ||
| $html .= '<thead>'; | ||
| $html .= '<tr>'; | ||
| $html .= '<th>Old</th>'; | ||
| $html .= '<th>New</th>'; | ||
| $html .= '<th>Differences</th>'; | ||
| $html .= '</tr>'; | ||
| $html .= '</thead>'; | ||
| foreach($changes as $i => $blocks) { | ||
| // If this is a separate block, we're condensing code so output ..., | ||
| // indicating a significant portion of the code has been collapsed as | ||
| // it is the same | ||
| if($i > 0) { | ||
| $html .= '<tbody class="Skipped">'; | ||
| $html .= '<th>…</th>'; | ||
| $html .= '<th>…</th>'; | ||
| $html .= '<td> </td>'; | ||
| $html .= '</tbody>'; | ||
| } | ||
| /** | ||
| * Render a and return diff with changes between the two sequences | ||
| * displayed inline (under each other) | ||
| * | ||
| * @return string The generated inline diff. | ||
| */ | ||
| public function render() | ||
| { | ||
| $changes = parent::render(); | ||
| $html = ''; | ||
| if (empty($changes)) { | ||
| return $html; | ||
| } | ||
|
|
||
| foreach ($changes as $i => $blocks) { | ||
| // If this is a separate block, we're condensing code so output ..., | ||
| // indicating a significant portion of the code has been collapsed as | ||
| // it is the same | ||
| if ($i > 0) { | ||
| $html .= '<div class="diff diff-empty"></div>'; | ||
| } | ||
|
|
||
| foreach ($blocks as $change) { | ||
|
|
||
| foreach($blocks as $change) { | ||
| $html .= '<tbody class="Change'.ucfirst($change['tag']).'">'; | ||
| // Equal changes should be shown on both sides of the diff | ||
| if($change['tag'] == 'equal') { | ||
| foreach($change['base']['lines'] as $no => $line) { | ||
| $fromLine = $change['base']['offset'] + $no + 1; | ||
| $toLine = $change['changed']['offset'] + $no + 1; | ||
| $html .= '<tr>'; | ||
| $html .= '<th>'.$fromLine.'</th>'; | ||
| $html .= '<th>'.$toLine.'</th>'; | ||
| $html .= '<td class="Left">'.$line.'</td>'; | ||
| $html .= '</tr>'; | ||
| } | ||
| } | ||
| // Added lines only on the right side | ||
| else if($change['tag'] == 'insert') { | ||
| foreach($change['changed']['lines'] as $no => $line) { | ||
| $toLine = $change['changed']['offset'] + $no + 1; | ||
| $html .= '<tr>'; | ||
| $html .= '<th> </th>'; | ||
| $html .= '<th>'.$toLine.'</th>'; | ||
| $html .= '<td class="Right"><ins>'.$line.'</ins> </td>'; | ||
| $html .= '</tr>'; | ||
| } | ||
| } | ||
| // Show deleted lines only on the left side | ||
| else if($change['tag'] == 'delete') { | ||
| foreach($change['base']['lines'] as $no => $line) { | ||
| $fromLine = $change['base']['offset'] + $no + 1; | ||
| $html .= '<tr>'; | ||
| $html .= '<th>'.$fromLine.'</th>'; | ||
| $html .= '<th> </th>'; | ||
| $html .= '<td class="Left"><del>'.$line.'</del> </td>'; | ||
| $html .= '</tr>'; | ||
| } | ||
| } | ||
| // Show modified lines on both sides | ||
| else if($change['tag'] == 'replace') { | ||
| foreach($change['base']['lines'] as $no => $line) { | ||
| $fromLine = $change['base']['offset'] + $no + 1; | ||
| $html .= '<tr>'; | ||
| $html .= '<th>'.$fromLine.'</th>'; | ||
| $html .= '<th> </th>'; | ||
| $html .= '<td class="Left"><span>'.$line.'</span></td>'; | ||
| $html .= '</tr>'; | ||
| } | ||
| // Equal changes should be shown on both sides of the diff | ||
| if ($change['tag'] == 'equal') { | ||
| foreach ($change['base']['lines'] as $no => $line) { | ||
| $html .= '<div class="diff diff-equal">' | ||
| . $line | ||
| . '</div>'; | ||
| } | ||
| } // Added lines only on the right side | ||
| else if ($change['tag'] == 'insert') { | ||
| foreach ($change['changed']['lines'] as $no => $line) { | ||
| $html .= '<div class="diff diff-added" style="background-color: #DDFADE;">' | ||
| . '<ins style="background: #9e9; text-decoration: none !important;">' | ||
| . $line | ||
| . '</ins> </div>'; | ||
| } | ||
| } // Show deleted lines only on the left side | ||
| else if ($change['tag'] == 'delete') { | ||
| foreach ($change['base']['lines'] as $no => $line) { | ||
| $html .= '<div class="diff diff-removed" style="background-color: #FFE7E7;">' | ||
| . '<del style="background: #e99; text-decoration: line-through;">' | ||
| . $line | ||
| . '</del> </div>'; | ||
| } | ||
| } // Show modified lines on both sides | ||
| else if ($change['tag'] == 'replace') { | ||
| foreach ($change['base']['lines'] as $no => $line) { | ||
| $html .= '<div class="diff diff-removed" style="background-color: #FFE7E7;"><span>' | ||
| . $line | ||
| . '</span></div>'; | ||
| } | ||
|
|
||
| foreach($change['changed']['lines'] as $no => $line) { | ||
| $toLine = $change['changed']['offset'] + $no + 1; | ||
| $html .= '<tr>'; | ||
| $html .= '<th>'.$toLine.'</th>'; | ||
| $html .= '<th> </th>'; | ||
| $html .= '<td class="Right"><span>'.$line.'</span></td>'; | ||
| $html .= '</tr>'; | ||
| } | ||
| } | ||
| $html .= '</tbody>'; | ||
| } | ||
| } | ||
| $html .= '</table>'; | ||
| return $html; | ||
| } | ||
| foreach ($change['changed']['lines'] as $no => $line) { | ||
| $html .= '<div class="diff diff-added" style="background-color: #DDFADE;"><span>' | ||
| . $line | ||
| . '</span></div>'; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return $html; | ||
| } | ||
| } | ||
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters