Skip to content

Commit 1698057

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Apply tidy formatting
2 parents 6b38251 + 58b1790 commit 1698057

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+7410
-7410
lines changed

Zend/bench.php

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
if (function_exists("date_default_timezone_set")) {
3-
date_default_timezone_set("UTC");
3+
date_default_timezone_set("UTC");
44
}
55

66
function simple() {
@@ -220,30 +220,30 @@ function heapsort_r($n, &$ra) {
220220
$ir = $n;
221221

222222
while (1) {
223-
if ($l > 1) {
224-
$rra = $ra[--$l];
225-
} else {
226-
$rra = $ra[$ir];
227-
$ra[$ir] = $ra[1];
228-
if (--$ir == 1) {
229-
$ra[1] = $rra;
230-
return;
231-
}
232-
}
233-
$i = $l;
234-
$j = $l << 1;
235-
while ($j <= $ir) {
236-
if (($j < $ir) && ($ra[$j] < $ra[$j+1])) {
237-
$j++;
238-
}
239-
if ($rra < $ra[$j]) {
240-
$ra[$i] = $ra[$j];
241-
$j += ($i = $j);
242-
} else {
243-
$j = $ir + 1;
244-
}
245-
}
246-
$ra[$i] = $rra;
223+
if ($l > 1) {
224+
$rra = $ra[--$l];
225+
} else {
226+
$rra = $ra[$ir];
227+
$ra[$ir] = $ra[1];
228+
if (--$ir == 1) {
229+
$ra[1] = $rra;
230+
return;
231+
}
232+
}
233+
$i = $l;
234+
$j = $l << 1;
235+
while ($j <= $ir) {
236+
if (($j < $ir) && ($ra[$j] < $ra[$j+1])) {
237+
$j++;
238+
}
239+
if ($rra < $ra[$j]) {
240+
$ra[$i] = $ra[$j];
241+
$j += ($i = $j);
242+
} else {
243+
$j = $ir + 1;
244+
}
245+
}
246+
$ra[$i] = $rra;
247247
}
248248
}
249249

@@ -268,23 +268,23 @@ function mkmatrix ($rows, $cols) {
268268
$count = 1;
269269
$mx = array();
270270
for ($i=0; $i<$rows; $i++) {
271-
for ($j=0; $j<$cols; $j++) {
272-
$mx[$i][$j] = $count++;
273-
}
271+
for ($j=0; $j<$cols; $j++) {
272+
$mx[$i][$j] = $count++;
273+
}
274274
}
275275
return($mx);
276276
}
277277

278278
function mmult ($rows, $cols, $m1, $m2) {
279279
$m3 = array();
280280
for ($i=0; $i<$rows; $i++) {
281-
for ($j=0; $j<$cols; $j++) {
282-
$x = 0;
283-
for ($k=0; $k<$cols; $k++) {
284-
$x += $m1[$i][$k] * $m2[$k][$j];
285-
}
286-
$m3[$i][$j] = $x;
287-
}
281+
for ($j=0; $j<$cols; $j++) {
282+
$x = 0;
283+
for ($k=0; $k<$cols; $k++) {
284+
$x += $m1[$i][$k] * $m2[$k][$j];
285+
}
286+
$m3[$i][$j] = $x;
287+
}
288288
}
289289
return($m3);
290290
}
@@ -353,7 +353,7 @@ function gethrtime()
353353

354354
function start_test()
355355
{
356-
ob_start();
356+
ob_start();
357357
return gethrtime();
358358
}
359359

@@ -367,7 +367,7 @@ function end_test($start, $name)
367367
$pad = str_repeat(" ", 24-strlen($name)-strlen($num));
368368

369369
echo $name.$pad.$num."\n";
370-
ob_start();
370+
ob_start();
371371
return gethrtime();
372372
}
373373

0 commit comments

Comments
 (0)