[phpwiki-checkins] SF.net SVN: phpwiki:[9239] trunk/lib

[<var...@us...>]

Revision: 9239
          http://sourceforge.net/p/phpwiki/code/9239
Author:   vargenau
Date:     2014-10-09 18:39:11 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
Add class variables

Modified Paths:
--------------
    trunk/lib/diff.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2014-10-09 18:37:59 UTC (rev 9238)
+++ trunk/lib/diff.php	2014-10-09 18:39:11 UTC (rev 9239)
@@ -12,7 +12,7 @@
 
 class _HWLDF_WordAccumulator
 {
-    function _HWLDF_WordAccumulator()
+    function __construct()
     {
         $this->_lines = array();
         $this->_line = false;
@@ -129,6 +129,15 @@
  */
 class HtmlUnifiedDiffFormatter extends UnifiedDiffFormatter
 {
+    /**
+     * @var HtmlElement
+     */
+    public $_top;
+    /**
+     * @var HtmlElement
+     */
+    public $_block;
+
     function __construct($context_lines = 4)
     {
         parent::__construct($context_lines);
@@ -199,6 +208,13 @@
 
 /////////////////////////////////////////////////////////////////
 
+/**
+ * @param string $label
+ * @param WikiDB_PageRevision $rev
+ * @param WikiRequest $request
+ * @param bool $is_current
+ * @return $this|HtmlElement
+ */
 function PageInfoRow($label, $rev, &$request, $is_current = false)
 {
     global $WikiTheme;
@@ -230,6 +246,9 @@
     return $row;
 }
 
+/**
+ * @param WikiRequest $request
+ */
 function showDiff(&$request)
 {
     $pagename = $request->getArg('pagename');
@@ -243,7 +262,6 @@
     }
 
     // abort if page doesn't exist
-    $dbi = $request->getDbh();
     $page = $request->getPage();
     $current = $page->getCurrentRevision(false);
     if ($current->getVersion() < 1) {
@@ -280,12 +298,10 @@
                 $others = array('major', 'minor');
                 break;
             case 'minor':
-                $previous = 'minor';
                 $old = $page->getRevisionBefore($new);
                 $old_version = _("previous revision");
                 $others = array('major', 'author');
                 break;
-            case 'major':
             default:
                 $old = $new;
                 while ($old && $old->get('is_minor_edit'))

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2014-10-09 18:37:59 UTC (rev 9238)
+++ trunk/lib/diff3.php	2014-10-09 18:39:11 UTC (rev 9239)
@@ -44,7 +44,7 @@
 {
     public $type = 'copy';
 
-    function __construct($lines = false)
+    function __construct($lines = array())
     {
         $this->orig = $lines ? $lines : array();
         $this->final1 = &$this->orig;
@@ -64,6 +64,10 @@
 
 class _Diff3_BlockBuilder
 {
+    public $orig;
+    public $final1;
+    public $final2;
+
     function __construct()
     {
         $this->_init();

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2014-10-09 18:37:59 UTC (rev 9238)
+++ trunk/lib/difflib.php	2014-10-09 18:39:11 UTC (rev 9239)
@@ -115,6 +115,16 @@
  */
 class _DiffEngine
 {
+    public $xchanged;
+    public $ychanged;
+    public $xv;
+    public $yv;
+    public $xind;
+    public $yind;
+    public $lcs;
+    public $seq;
+    public $in_seq;
+
     function diff($from_lines, $to_lines)
     {
         $n_from = sizeof($from_lines);
@@ -612,6 +622,8 @@
      * Check a Diff for validity.
      *
      * This is here only for debugging purposes.
+     * @param string $from_lines
+     * @param string $to_lines
      */
     function _check($from_lines, $to_lines)
     {
@@ -863,7 +875,7 @@
  */
 class UnifiedDiffFormatter extends DiffFormatter
 {
-    function UnifiedDiffFormatter($context_lines = 4)
+    function __construct($context_lines = 4)
     {
         $this->leading_context_lines = $context_lines;
         $this->trailing_context_lines = $context_lines;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.