Completed
Push — 1.10.x ( f409b5...1f80a0 )
by Julito
112:29 queued 56:28
created
main/inc/lib/pear/Text/Diff/Renderer/context.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,10 +35,10 @@
 block discarded – undo
35 35
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
36 36
     {
37 37
         if ($xlen != 1) {
38
-            $xbeg .= ',' . $xlen;
38
+            $xbeg .= ','.$xlen;
39 39
         }
40 40
         if ($ylen != 1) {
41
-            $ybeg .= ',' . $ylen;
41
+            $ybeg .= ','.$ylen;
42 42
         }
43 43
         $this->_second_block = "--- $ybeg ----\n";
44 44
         return "***************\n*** $xbeg ****";
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Renderer/unified.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
35 35
     {
36 36
         if ($xlen != 1) {
37
-            $xbeg .= ',' . $xlen;
37
+            $xbeg .= ','.$xlen;
38 38
         }
39 39
         if ($ylen != 1) {
40
-            $ybeg .= ',' . $ylen;
40
+            $ybeg .= ','.$ylen;
41 41
         }
42 42
         return "@@ -$xbeg +$ybeg @@";
43 43
     }
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
     function _changed($orig, $final)
61 61
     {
62
-        return $this->_deleted($orig) . $this->_added($final);
62
+        return $this->_deleted($orig).$this->_added($final);
63 63
     }
64 64
 
65 65
 }
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Mapped.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
      *                                  of elements as $to_lines.
30 30
      */
31 31
     function Text_Diff_Mapped($from_lines, $to_lines,
32
-                              $mapped_from_lines, $mapped_to_lines)
32
+                                $mapped_from_lines, $mapped_to_lines)
33 33
     {
34 34
         assert(count($from_lines) == count($mapped_from_lines));
35 35
         assert(count($to_lines) == count($mapped_to_lines));
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Engine/xdiff.php 1 patch
Switch Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -46,17 +46,17 @@
 block discarded – undo
46 46
                 continue;
47 47
             }
48 48
             switch ($line[0]) {
49
-            case ' ':
50
-                $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
51
-                break;
49
+                case ' ':
50
+                    $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
51
+                    break;
52 52
 
53
-            case '+':
54
-                $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
55
-                break;
53
+                case '+':
54
+                    $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
55
+                    break;
56 56
 
57
-            case '-':
58
-                $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
59
-                break;
57
+                case '-':
58
+                    $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
59
+                    break;
60 60
             }
61 61
         }
62 62
 
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Engine/shell.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,9 +124,9 @@
 block discarded – undo
124 124
             array_push($edits,
125 125
                 new Text_Diff_Op_copy(
126 126
                     $this->_getLines($from_lines, $from_line_no,
127
-                                     $from_line_no + count($from_lines) - 1),
127
+                                        $from_line_no + count($from_lines) - 1),
128 128
                     $this->_getLines($to_lines, $to_line_no,
129
-                                     $to_line_no + count($to_lines) - 1)));
129
+                                        $to_line_no + count($to_lines) - 1)));
130 130
         }
131 131
 
132 132
         return $edits;
Please login to merge, or discard this patch.
Switch Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -93,29 +93,29 @@
 block discarded – undo
93 93
             }
94 94
 
95 95
             switch ($match[3]) {
96
-            case 'd':
97
-                // deleted lines
98
-                array_push($edits,
99
-                    new Text_Diff_Op_delete(
100
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
101
-                $to_line_no++;
102
-                break;
103
-
104
-            case 'c':
105
-                // changed lines
106
-                array_push($edits,
107
-                    new Text_Diff_Op_change(
108
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
109
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
110
-                break;
111
-
112
-            case 'a':
113
-                // added lines
114
-                array_push($edits,
115
-                    new Text_Diff_Op_add(
116
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
117
-                $from_line_no++;
118
-                break;
96
+                case 'd':
97
+                    // deleted lines
98
+                    array_push($edits,
99
+                        new Text_Diff_Op_delete(
100
+                            $this->_getLines($from_lines, $from_line_no, $match[2])));
101
+                    $to_line_no++;
102
+                    break;
103
+
104
+                case 'c':
105
+                    // changed lines
106
+                    array_push($edits,
107
+                        new Text_Diff_Op_change(
108
+                            $this->_getLines($from_lines, $from_line_no, $match[2]),
109
+                            $this->_getLines($to_lines, $to_line_no, $match[5])));
110
+                    break;
111
+
112
+                case 'a':
113
+                    // added lines
114
+                    array_push($edits,
115
+                        new Text_Diff_Op_add(
116
+                            $this->_getLines($to_lines, $to_line_no, $match[5])));
117
+                    $from_line_no++;
118
+                    break;
119 119
             }
120 120
         }
121 121
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
         $fp = fopen($to_file, 'w');
50 50
         fwrite($fp, implode("\n", $to_lines));
51 51
         fclose($fp);
52
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
52
+        $diff = shell_exec($this->_diffCommand.' '.$from_file.' '.$to_file);
53 53
         unlink($from_file);
54 54
         unlink($to_file);
55 55
 
Please login to merge, or discard this patch.
main/inc/lib/pear/PEAR5.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
 class PEAR5
7 7
 {
8 8
     /**
9
-    * If you have a class that's mostly/entirely static, and you need static
10
-    * properties, you can use this method to simulate them. Eg. in your method(s)
11
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
12
-    * You MUST use a reference, or they will not persist!
13
-    *
14
-    * @access public
15
-    * @param  string $class  The calling classname, to prevent clashes
16
-    * @param  string $var    The variable to retrieve.
17
-    * @return mixed   A reference to the variable. If not set it will be
18
-    *                 auto initialised to NULL.
19
-    */
9
+     * If you have a class that's mostly/entirely static, and you need static
10
+     * properties, you can use this method to simulate them. Eg. in your method(s)
11
+     * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
12
+     * You MUST use a reference, or they will not persist!
13
+     *
14
+     * @access public
15
+     * @param  string $class  The calling classname, to prevent clashes
16
+     * @param  string $var    The variable to retrieve.
17
+     * @return mixed   A reference to the variable. If not set it will be
18
+     *                 auto initialised to NULL.
19
+     */
20 20
     static function &getStaticProperty($class, $var)
21 21
     {
22 22
         static $properties;
Please login to merge, or discard this patch.
main/inc/lib/pear/PEAR.php 3 patches
Spacing   +13 added lines, -14 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 /**#@+
27 27
  * ERROR constants
28 28
  */
29
-define('PEAR_ERROR_RETURN',     1);
30
-define('PEAR_ERROR_PRINT',      2);
31
-define('PEAR_ERROR_TRIGGER',    4);
32
-define('PEAR_ERROR_DIE',        8);
33
-define('PEAR_ERROR_CALLBACK',  16);
29
+define('PEAR_ERROR_RETURN', 1);
30
+define('PEAR_ERROR_PRINT', 2);
31
+define('PEAR_ERROR_TRIGGER', 4);
32
+define('PEAR_ERROR_DIE', 8);
33
+define('PEAR_ERROR_CALLBACK', 16);
34 34
 /**
35 35
  * WARNING: obsolete
36 36
  * @deprecated
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
 
43 43
 if (substr(PHP_OS, 0, 3) == 'WIN') {
44 44
     define('OS_WINDOWS', true);
45
-    define('OS_UNIX',    false);
46
-    define('PEAR_OS',    'Windows');
45
+    define('OS_UNIX', false);
46
+    define('PEAR_OS', 'Windows');
47 47
 } else {
48 48
     define('OS_WINDOWS', false);
49
-    define('OS_UNIX',    true);
50
-    define('PEAR_OS',    'Unix'); // blatant assumption
49
+    define('OS_UNIX', true);
50
+    define('PEAR_OS', 'Unix'); // blatant assumption
51 51
 }
52 52
 
53 53
 $GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
@@ -451,9 +451,9 @@  discard block
 block discarded – undo
451 451
             // $error_code is a non-empty array here;
452 452
             // we walk through it trying to unset all
453 453
             // values
454
-            foreach($error_code as $key => $error) {
454
+            foreach ($error_code as $key => $error) {
455 455
                 if ($this->_checkDelExpect($error)) {
456
-                    $deleted =  true;
456
+                    $deleted = true;
457 457
                 } else {
458 458
                     $deleted = false;
459 459
                 }
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
      */
987 987
     function getMessage()
988 988
     {
989
-        return ($this->error_message_prefix . $this->message);
989
+        return ($this->error_message_prefix.$this->message);
990 990
     }
991 991
 
992 992
 
@@ -1103,8 +1103,7 @@  discard block
 block discarded – undo
1103 1103
         if ($this->mode & PEAR_ERROR_CALLBACK) {
1104 1104
             if (is_array($this->callback)) {
1105 1105
                 $callback = (is_object($this->callback[0]) ?
1106
-                    strtolower(get_class($this->callback[0])) :
1107
-                    $this->callback[0]) . '::' .
1106
+                    strtolower(get_class($this->callback[0])) : $this->callback[0]).'::'.
1108 1107
                     $this->callback[1];
1109 1108
             } else {
1110 1109
                 $callback = $this->callback;
Please login to merge, or discard this patch.
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -205,17 +205,17 @@  discard block
 block discarded – undo
205 205
     // {{{ getStaticProperty()
206 206
 
207 207
     /**
208
-    * If you have a class that's mostly/entirely static, and you need static
209
-    * properties, you can use this method to simulate them. Eg. in your method(s)
210
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
211
-    * You MUST use a reference, or they will not persist!
212
-    *
213
-    * @access public
214
-    * @param  string $class  The calling classname, to prevent clashes
215
-    * @param  string $var    The variable to retrieve.
216
-    * @return mixed   A reference to the variable. If not set it will be
217
-    *                 auto initialised to NULL.
218
-    */
208
+     * If you have a class that's mostly/entirely static, and you need static
209
+     * properties, you can use this method to simulate them. Eg. in your method(s)
210
+     * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
211
+     * You MUST use a reference, or they will not persist!
212
+     *
213
+     * @access public
214
+     * @param  string $class  The calling classname, to prevent clashes
215
+     * @param  string $var    The variable to retrieve.
216
+     * @return mixed   A reference to the variable. If not set it will be
217
+     *                 auto initialised to NULL.
218
+     */
219 219
     function &getStaticProperty($class, $var)
220 220
     {
221 221
         static $properties;
@@ -234,14 +234,14 @@  discard block
 block discarded – undo
234 234
     // {{{ registerShutdownFunc()
235 235
 
236 236
     /**
237
-    * Use this function to register a shutdown method for static
238
-    * classes.
239
-    *
240
-    * @access public
241
-    * @param  mixed $func  The function name (or array of class/method) to call
242
-    * @param  mixed $args  The arguments to pass to the function
243
-    * @return void
244
-    */
237
+     * Use this function to register a shutdown method for static
238
+     * classes.
239
+     *
240
+     * @access public
241
+     * @param  mixed $func  The function name (or array of class/method) to call
242
+     * @param  mixed $args  The arguments to pass to the function
243
+     * @return void
244
+     */
245 245
     function registerShutdownFunc($func, $args = array())
246 246
     {
247 247
         // if we are called statically, there is a potential
@@ -513,12 +513,12 @@  discard block
 block discarded – undo
513 513
      * @since PHP 4.0.5
514 514
      */
515 515
     function &raiseError($message = null,
516
-                         $code = null,
517
-                         $mode = null,
518
-                         $options = null,
519
-                         $userinfo = null,
520
-                         $error_class = null,
521
-                         $skipmsg = false)
516
+                            $code = null,
517
+                            $mode = null,
518
+                            $options = null,
519
+                            $userinfo = null,
520
+                            $error_class = null,
521
+                            $skipmsg = false)
522 522
     {
523 523
         // The error is yet a PEAR error object
524 524
         if (is_object($message)) {
@@ -584,8 +584,8 @@  discard block
 block discarded – undo
584 584
      *
585 585
      */
586 586
     function &throwError($message = null,
587
-                         $code = null,
588
-                         $userinfo = null)
587
+                            $code = null,
588
+                            $userinfo = null)
589 589
     {
590 590
         if (isset($this) && is_a($this, 'PEAR')) {
591 591
             $a = &$this->raiseError($message, $code, null, null, $userinfo);
@@ -707,12 +707,12 @@  discard block
 block discarded – undo
707 707
     // {{{ popErrorHandling()
708 708
 
709 709
     /**
710
-    * Pop the last error handler used
711
-    *
712
-    * @return bool Always true
713
-    *
714
-    * @see PEAR::pushErrorHandling
715
-    */
710
+     * Pop the last error handler used
711
+     *
712
+     * @return bool Always true
713
+     *
714
+     * @see PEAR::pushErrorHandling
715
+     */
716 716
     function popErrorHandling()
717 717
     {
718 718
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
@@ -731,12 +731,12 @@  discard block
 block discarded – undo
731 731
     // {{{ loadExtension()
732 732
 
733 733
     /**
734
-    * OS independant PHP extension load. Remember to take care
735
-    * on the correct extension name for case sensitive OSes.
736
-    *
737
-    * @param string $ext The extension name
738
-    * @return bool Success or not on the dl() call
739
-    */
734
+     * OS independant PHP extension load. Remember to take care
735
+     * on the correct extension name for case sensitive OSes.
736
+     *
737
+     * @param string $ext The extension name
738
+     * @return bool Success or not on the dl() call
739
+     */
740 740
     function loadExtension($ext)
741 741
     {
742 742
         if (!extension_loaded($ext)) {
@@ -999,10 +999,10 @@  discard block
 block discarded – undo
999 999
      * @return int error code
1000 1000
      * @access public
1001 1001
      */
1002
-     function getCode()
1003
-     {
1002
+        function getCode()
1003
+        {
1004 1004
         return $this->code;
1005
-     }
1005
+        }
1006 1006
 
1007 1007
     // }}}
1008 1008
     // {{{ getType()
@@ -1110,10 +1110,10 @@  discard block
 block discarded – undo
1110 1110
                 $callback = $this->callback;
1111 1111
             }
1112 1112
             return sprintf('[%s: message="%s" code=%d mode=callback '.
1113
-                           'callback=%s prefix="%s" info="%s"]',
1114
-                           strtolower(get_class($this)), $this->message, $this->code,
1115
-                           $callback, $this->error_message_prefix,
1116
-                           $this->userinfo);
1113
+                            'callback=%s prefix="%s" info="%s"]',
1114
+                            strtolower(get_class($this)), $this->message, $this->code,
1115
+                            $callback, $this->error_message_prefix,
1116
+                            $this->userinfo);
1117 1117
         }
1118 1118
         if ($this->mode & PEAR_ERROR_PRINT) {
1119 1119
             $modes[] = 'print';
@@ -1128,11 +1128,11 @@  discard block
 block discarded – undo
1128 1128
             $modes[] = 'return';
1129 1129
         }
1130 1130
         return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
1131
-                       'prefix="%s" info="%s"]',
1132
-                       strtolower(get_class($this)), $this->message, $this->code,
1133
-                       implode("|", $modes), $levels[$this->level],
1134
-                       $this->error_message_prefix,
1135
-                       $this->userinfo);
1131
+                        'prefix="%s" info="%s"]',
1132
+                        strtolower(get_class($this)), $this->message, $this->code,
1133
+                        implode("|", $modes), $levels[$this->level],
1134
+                        $this->error_message_prefix,
1135
+                        $this->userinfo);
1136 1136
     }
1137 1137
 
1138 1138
     // }}}
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
      *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
491 491
      *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
492 492
      *
493
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
493
+     * @param integer|null $options If $mode is PEAR_ERROR_TRIGGER, this parameter
494 494
      *                  specifies the PHP-internal error level (one of
495 495
      *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
496 496
      *                  If $mode is PEAR_ERROR_CALLBACK, this
@@ -581,6 +581,7 @@  discard block
 block discarded – undo
581 581
      * message, code and userinfo are enough.
582 582
      *
583 583
      * @param string $message
584
+     * @param integer $code
584 585
      *
585 586
      */
586 587
     function &throwError($message = null,
Please login to merge, or discard this patch.
main/inc/lib/pear/Pager/Jumping.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -250,7 +250,7 @@
 block discarded – undo
250 250
                 $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
251 251
             }
252 252
             $links .= $this->_spacesBefore
253
-                   . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
253
+                    . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
254 254
         }
255 255
         return $links;
256 256
     }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         }
92 92
 
93 93
         if (($index % $this->_perPage) > 0) {
94
-            $pageID = ceil((float)$index / (float)$this->_perPage);
94
+            $pageID = ceil((float) $index / (float) $this->_perPage);
95 95
         } else {
96 96
             $pageID = $index / $this->_perPage;
97 97
         }
@@ -117,14 +117,14 @@  discard block
 block discarded – undo
117 117
      */
118 118
     function getPageRangeByPageId($pageid = null)
119 119
     {
120
-        $pageid = isset($pageid) ? (int)$pageid : $this->_currentPage;
120
+        $pageid = isset($pageid) ? (int) $pageid : $this->_currentPage;
121 121
         if (isset($this->_pageData[$pageid]) || is_null($this->_itemData)) {
122 122
             // I'm sure I'm missing something here, but this formula works
123 123
             // so I'm using it until I find something simpler.
124
-            $start = ((($pageid + (($this->_delta - ($pageid % $this->_delta))) % $this->_delta) / $this->_delta) - 1) * $this->_delta +1;
124
+            $start = ((($pageid + (($this->_delta - ($pageid % $this->_delta))) % $this->_delta) / $this->_delta) - 1) * $this->_delta + 1;
125 125
             return array(
126 126
                 max($start, 1),
127
-                min($start+$this->_delta-1, $this->_totalPages)
127
+                min($start + $this->_delta - 1, $this->_totalPages)
128 128
             );
129 129
         } else {
130 130
             return array(0, 0);
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
      *
154 154
      * @return array Back/pages/next links
155 155
      */
156
-    function getLinks($pageID=null, $next_html='')
156
+    function getLinks($pageID = null, $next_html = '')
157 157
     {
158 158
         //BC hack
159 159
         if (!empty($next_html)) {
@@ -240,14 +240,14 @@  discard block
 block discarded – undo
240 240
         $links = '';
241 241
         $limits = $this->getPageRangeByPageId($this->_currentPage);
242 242
 
243
-        for ($i=$limits[0]; $i<=min($limits[1], $this->_totalPages); $i++) {
243
+        for ($i = $limits[0]; $i <= min($limits[1], $this->_totalPages); $i++) {
244 244
             if ($i != $this->_currentPage) {
245 245
                 $this->range[$i] = false;
246 246
                 $this->_linkData[$this->_urlVar] = $i;
247 247
                 $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i);
248 248
             } else {
249 249
                 $this->range[$i] = true;
250
-                $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
250
+                $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost;
251 251
             }
252 252
             $links .= $this->_spacesBefore
253 253
                    . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
      *
108 108
      * @param integer $pageid PageID to get offsets for
109 109
      *
110
-     * @return array  First and last offsets
110
+     * @return integer[]  First and last offsets
111 111
      * @access public
112 112
      */
113 113
     function getPageRangeByPageId($pageid = null)
Please login to merge, or discard this patch.
main/inc/lib/pear/Pager/Pager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -169,8 +169,8 @@
 block discarded – undo
169 169
     static function &factory($options = array())
170 170
     {
171 171
         $mode = (isset($options['mode']) ? ucfirst($options['mode']) : 'Jumping');
172
-        $classname = 'Pager_' . $mode;
173
-        $classfile = 'Pager' . DIRECTORY_SEPARATOR . $mode . '.php';
172
+        $classname = 'Pager_'.$mode;
173
+        $classfile = 'Pager'.DIRECTORY_SEPARATOR.$mode.'.php';
174 174
 
175 175
         // Attempt to include a custom version of the named class, but don't treat
176 176
         // a failure as fatal.  The caller may have already included their own
Please login to merge, or discard this patch.