Completed
Push — 1.10.x ( 8f997c...918380 )
by Yannick
259:37 queued 220:06
created
main/inc/lib/pear/Text/CAPTCHA/Driver/Numeral.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -88,12 +88,12 @@  discard block
 block discarded – undo
88 88
     public function initDriver($options = array())
89 89
     {
90 90
         if (isset($options['minValue'])) {
91
-            $this->_minValue = (int)$options['minValue'];
91
+            $this->_minValue = (int) $options['minValue'];
92 92
         } else {
93 93
             $this->_minValue = 1;
94 94
         }
95 95
         if (isset($options['maxValue'])) {
96
-            $this->_maxValue = (int)$options['maxValue'];
96
+            $this->_maxValue = (int) $options['maxValue'];
97 97
         } else {
98 98
             $this->_maxValue = 50;
99 99
         }
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
103 103
             $this->_operator = '';
104 104
         }
105 105
         if (isset($options['firstValue'])) {
106
-            $this->_firstNumber = (int)$options['firstValue'];
106
+            $this->_firstNumber = (int) $options['firstValue'];
107 107
         } else {
108 108
             $this->_firstNumber = 0;
109 109
         }
110 110
         if (isset($options['secondValue'])) {
111
-            $this->_secondNumber = (int)$options['secondValue'];
111
+            $this->_secondNumber = (int) $options['secondValue'];
112 112
         } else {
113 113
             $this->_secondNumber = 0;
114 114
         }
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     private function _setOperation()
156 156
     {
157 157
         $this->setCaptcha(
158
-            $this->_firstNumber . ' ' . $this->_operator . ' ' . $this->_secondNumber
158
+            $this->_firstNumber.' '.$this->_operator.' '.$this->_secondNumber
159 159
         );
160 160
     }
161 161
 
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Password.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
         $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = $v_count + $c_count;
460 460
 
461 461
         for ($i = 0; $i < $length; $i++) {
462
-            $retVal .= $c[mt_rand(0, $c_count-1)] . $v[mt_rand(0, $v_count-1)];
462
+            $retVal .= $c[mt_rand(0, $c_count - 1)].$v[mt_rand(0, $v_count - 1)];
463 463
         }
464 464
 
465 465
         return substr($retVal, 0, $length);
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
         /**
485 485
          * List of character which could be use in the password
486 486
          */
487
-         switch($chars) {
487
+         switch ($chars) {
488 488
 
489 489
          case 'alphanumeric':
490 490
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
         }
52 52
 
53 53
         //require_once 'Text/Diff/Engine/' . $engine . '.php';
54
-        $class = 'Text_Diff_Engine_' . $engine;
54
+        $class = 'Text_Diff_Engine_'.$engine;
55 55
         $diff_engine = new $class();
56 56
 
57 57
         $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/ThreeWay.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,11 +58,11 @@  discard block
 block discarded – undo
58 58
             if ($edit->isConflict()) {
59 59
                 /* FIXME: this should probably be moved somewhere else. */
60 60
                 $lines = array_merge($lines,
61
-                                     array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')),
61
+                                     array('<<<<<<<'.($label1 ? ' '.$label1 : '')),
62 62
                                      $edit->final1,
63 63
                                      array("======="),
64 64
                                      $edit->final2,
65
-                                     array('>>>>>>>' . ($label2 ? ' ' . $label2 : '')));
65
+                                     array('>>>>>>>'.($label2 ? ' '.$label2 : '')));
66 66
                 $this->_conflictingBlocks++;
67 67
             } else {
68 68
                 $lines = array_merge($lines, $edit->merged());
@@ -126,11 +126,11 @@  discard block
 block discarded – undo
126 126
                     }
127 127
                 }
128 128
 
129
-                if ($e1 && ! $e1->orig) {
129
+                if ($e1 && !$e1->orig) {
130 130
                     $bb->out1($e1->final);
131 131
                     $e1 = next($edits1);
132 132
                 }
133
-                if ($e2 && ! $e2->orig) {
133
+                if ($e2 && !$e2->orig) {
134 134
                     $bb->out2($e2->final);
135 135
                     $e2 = next($edits2);
136 136
                 }
Please login to merge, or discard this patch.
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/inline.php 1 patch
Spacing   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -83,14 +83,14 @@  discard block
 block discarded – undo
83 83
         if ($this->_split_level == 'words') {
84 84
             return implode('', $lines);
85 85
         } else {
86
-            return implode("\n", $lines) . "\n";
86
+            return implode("\n", $lines)."\n";
87 87
         }
88 88
     }
89 89
 
90 90
     function _added($lines)
91 91
     {
92 92
         array_walk($lines, array(&$this, '_encode'));
93
-        $lines[0] = $this->_ins_prefix . $lines[0];
93
+        $lines[0] = $this->_ins_prefix.$lines[0];
94 94
         $lines[count($lines) - 1] .= $this->_ins_suffix;
95 95
         return $this->_lines($lines, ' ', false);
96 96
     }
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
     function _deleted($lines, $words = false)
99 99
     {
100 100
         array_walk($lines, array(&$this, '_encode'));
101
-        $lines[0] = $this->_del_prefix . $lines[0];
101
+        $lines[0] = $this->_del_prefix.$lines[0];
102 102
         $lines[count($lines) - 1] .= $this->_del_suffix;
103 103
         return $this->_lines($lines, ' ', false);
104 104
     }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
                 $orig[0] = substr($orig[0], 1);
117 117
                 $final[0] = substr($final[0], 1);
118 118
             }
119
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
119
+            return $prefix.$this->_deleted($orig).$this->_added($final);
120 120
         }
121 121
 
122 122
         $text1 = implode("\n", $orig);
@@ -133,12 +133,11 @@  discard block
 block discarded – undo
133 133
                                     $this->_splitOnWords($text2, $nl)));
134 134
 
135 135
         /* Get the diff in inline format. */
136
-        $renderer = new Text_Diff_Renderer_inline
137
-            (array_merge($this->getParams(),
136
+        $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
138 137
                          array('split_level' => 'words')));
139 138
 
140 139
         /* Run the diff and get the output. */
141
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
140
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
142 141
     }
143 142
 
144 143
     function _splitOnWords($string, $newlineEscape = "\n")
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/Renderer.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
     function Text_Diff_Renderer($params = array())
39 39
     {
40 40
         foreach ($params as $param => $value) {
41
-            $v = '_' . $param;
41
+            $v = '_'.$param;
42 42
             if (isset($this->$v)) {
43 43
                 $this->$v = $value;
44 44
             }
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
                                      $block);
141 141
         }
142 142
 
143
-        return $output . $this->_endDiff();
143
+        return $output.$this->_endDiff();
144 144
     }
145 145
 
146 146
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
             }
168 168
         }
169 169
 
170
-        return $output . $this->_endBlock();
170
+        return $output.$this->_endBlock();
171 171
     }
172 172
 
173 173
     function _startDiff()
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
184 184
     {
185 185
         if ($xlen > 1) {
186
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
186
+            $xbeg .= ','.($xbeg + $xlen - 1);
187 187
         }
188 188
         if ($ylen > 1) {
189
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
189
+            $ybeg .= ','.($ybeg + $ylen - 1);
190 190
         }
191 191
 
192 192
         // this matches the GNU Diff behaviour
@@ -196,12 +196,12 @@  discard block
 block discarded – undo
196 196
             $xbeg--;
197 197
         }
198 198
 
199
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
199
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
200 200
     }
201 201
 
202 202
     function _startBlock($header)
203 203
     {
204
-        return $header . "\n";
204
+        return $header."\n";
205 205
     }
206 206
 
207 207
     function _endBlock()
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 
212 212
     function _lines($lines, $prefix = ' ')
213 213
     {
214
-        return $prefix . implode("\n$prefix", $lines) . "\n";
214
+        return $prefix.implode("\n$prefix", $lines)."\n";
215 215
     }
216 216
 
217 217
     function _context($lines)
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 
232 232
     function _changed($orig, $final)
233 233
     {
234
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
234
+        return $this->_deleted($orig)."---\n".$this->_added($final);
235 235
     }
236 236
 
237 237
 }
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Engine/native.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
      * match.  The caller must trim matching lines from the beginning and end
149 149
      * of the portions it is going to specify.
150 150
      */
151
-    function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
151
+    function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
152 152
     {
153 153
         $flip = false;
154 154
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         }
172 172
 
173 173
         $this->lcs = 0;
174
-        $this->seq[0]= $yoff - 1;
174
+        $this->seq[0] = $yoff - 1;
175 175
         $this->in_seq = array();
176 176
         $ymids[0] = array();
177 177
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
                 }
185 185
             }
186 186
 
187
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
187
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $chunk) / $nchunks);
188 188
             for (; $x < $x1; $x++) {
189 189
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
190 190
                 if (empty($ymatches[$line])) {
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
         $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
221 221
         $ymid = $ymids[$this->lcs];
222 222
         for ($n = 0; $n < $nchunks - 1; $n++) {
223
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
223
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $n) / $nchunks);
224 224
             $y1 = $ymid[$n] + 1;
225 225
             $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
226 226
         }
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
         $beg = 1;
242 242
         while ($beg < $end) {
243
-            $mid = (int)(($beg + $end) / 2);
243
+            $mid = (int) (($beg + $end) / 2);
244 244
             if ($ypos > $this->seq[$mid]) {
245 245
                 $beg = $mid + 1;
246 246
             } else {
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
269 269
      * origin-0 and discarded lines are not counted.
270 270
      */
271
-    function _compareseq ($xoff, $xlim, $yoff, $ylim)
271
+    function _compareseq($xoff, $xlim, $yoff, $ylim)
272 272
     {
273 273
         /* Slide down the bottom initial diagonal. */
274 274
         while ($xoff < $xlim && $yoff < $ylim
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
             reset($seps);
310 310
             $pt1 = $seps[0];
311 311
             while ($pt2 = next($seps)) {
312
-                $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
312
+                $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
313 313
                 $pt1 = $pt2;
314 314
             }
315 315
         }
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
                 $j++;
353 353
             }
354 354
 
355
-            while ($i < $len && ! $changed[$i]) {
355
+            while ($i < $len && !$changed[$i]) {
356 356
                 assert('$j < $other_len && ! $other_changed[$j]');
357 357
                 $i++; $j++;
358 358
                 while ($j < $other_len && $other_changed[$j]) {
Please login to merge, or discard this patch.