Skip to content

Commit 682e2f6

Browse files
chapeupretonikic
chapeupreto
authored and
nikic
committed
Trim trailing whitespaces and fix code style
Closes GH-5554.
1 parent 16f23cd commit 682e2f6

23 files changed

+149
-149
lines changed

‎Zend/tests/bug72038.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ Bug #72038 (Function calls with values to a by-ref parameter don't always throw
44
<?php
55

66
try {
7-
test($foo = new stdClass);
8-
var_dump($foo);
7+
test($foo = new stdClass);
8+
var_dump($foo);
99
} catch (Throwable $e) {
10-
echo "Exception: " . $e->getMessage() . "\n";
10+
echo "Exception: " . $e->getMessage() . "\n";
1111
}
1212
try {
13-
test($bar = 2);
14-
var_dump($bar);
13+
test($bar = 2);
14+
var_dump($bar);
1515
} catch (Throwable $e) {
16-
echo "Exception: " . $e->getMessage() . "\n";
16+
echo "Exception: " . $e->getMessage() . "\n";
1717
}
1818
try {
19-
test($baz = &$bar);
20-
var_dump($baz);
19+
test($baz = &$bar);
20+
var_dump($baz);
2121
} catch (Throwable $e) {
22-
echo "Exception: " . $e->getMessage() . "\n";
22+
echo "Exception: " . $e->getMessage() . "\n";
2323
}
2424

2525
function test(&$param) {

‎Zend/tests/bug77589.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ BUG #77589 (Core dump using parse_ini_string with numeric sections)
33
--FILE--
44
<?php
55
var_dump(
6-
parse_ini_string(<<<INI
6+
parse_ini_string(<<<INI
77
[0]
88
a = 1
99
b = on
1010
c = true
1111
1212
["true"]
13-
a = 100
13+
a = 100
1414
b = null
1515
c = yes
1616
INI

‎Zend/tests/bug78154.phpt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ Bug #78154: SEND_VAR_NO_REF does not always send reference
44
<?php
55

66
namespace {
7-
try {
8-
var_dump(similar_text('a', 'a', $c=0x44444444));
9-
var_dump($c);
10-
} catch (Throwable $e) {
11-
echo "Exception: " . $e->getMessage() . "\n";
12-
}
7+
try {
8+
var_dump(similar_text('a', 'a', $c=0x44444444));
9+
var_dump($c);
10+
} catch (Throwable $e) {
11+
echo "Exception: " . $e->getMessage() . "\n";
12+
}
1313
}
1414
namespace Foo {
15-
try {
16-
var_dump(similar_text('a', 'a', $d=0x44444444));
17-
var_dump($d);
18-
} catch (\Throwable $e) {
19-
echo "Exception: " . $e->getMessage() . "\n";
20-
}
15+
try {
16+
var_dump(similar_text('a', 'a', $d=0x44444444));
17+
var_dump($d);
18+
} catch (\Throwable $e) {
19+
echo "Exception: " . $e->getMessage() . "\n";
20+
}
2121
}
2222

2323
?>

‎Zend/tests/bug79477.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #79477: casting object into array creates references
44
<?php
55

66
class Test {
7-
public $prop = 'default value';
7+
public $prop = 'default value';
88
}
99

1010
$obj = new Test;

‎Zend/tests/lsb_021.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class B extends A {
2424
B::test();
2525
call_user_func("B::test");
2626
call_user_func(array("B", "test"));
27-
27+
2828
(self::class)::test();
2929
call_user_func(self::class . "::test");
3030
call_user_func(array(self::class, "test"));

‎Zend/tests/magic_methods_serialize.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ __serialize declaration
33
--FILE--
44
<?php
55
class Foo {
6-
static function __serialize($arguments) {}
6+
static function __serialize($arguments) {}
77
}
88
?>
99
--EXPECTF--

‎Zend/tests/magic_methods_unserialize.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ __unserialize declaration
33
--FILE--
44
<?php
55
class Foo {
6-
static function __unserialize($data, $value) {}
6+
static function __unserialize($data, $value) {}
77
}
88
?>
99
--EXPECTF--

‎ext/ffi/tests/101.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ ffi.enable=1
1717
require_once('utils.inc');
1818
$fastcall = ffi_get_fastcall_specifier();
1919
$zend = ffi_cdef("
20-
const char *get_zend_version(void);
21-
//char *get_zend_version(void);
22-
extern size_t (*zend_printf)(const char *format, ...);
20+
const char *get_zend_version(void);
21+
//char *get_zend_version(void);
22+
extern size_t (*zend_printf)(const char *format, ...);
2323
24-
unsigned long $fastcall zend_hash_func(const char *str, size_t len);
24+
unsigned long $fastcall zend_hash_func(const char *str, size_t len);
2525
26-
void $fastcall zend_str_tolower(char *str, size_t length);
26+
void $fastcall zend_str_tolower(char *str, size_t length);
2727
2828
", ffi_get_php_dll_name());
2929
$f = $zend->get_zend_version;

‎ext/ffi/tests/301-win32.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ffi.enable=1
1010
require_once('utils.inc');
1111
$fn = __DIR__ . "/300-win32.h";
1212
$cont = str_replace(
13-
"PHP_DLL_NAME",
14-
ffi_get_php_dll_name(),
15-
file_get_contents("$fn.in")
16-
);
13+
"PHP_DLL_NAME",
14+
ffi_get_php_dll_name(),
15+
file_get_contents("$fn.in")
16+
);
1717
file_put_contents($fn, $cont);
1818

1919
$ffi = FFI::load($fn);

‎ext/phar/tests/bug79082.phpt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ chmod(__DIR__ . '/test79082/test79082-testfile', 0644);
1313
chmod(__DIR__ . '/test79082/test79082-testfile2', 0400);
1414

1515
foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
16-
clearstatcache();
17-
$phar = new PharData(__DIR__ . '/test79082.' . $ext, null, null, $mode);
18-
$phar->buildFromIterator(new \RecursiveDirectoryIterator(__DIR__ . '/test79082', \FilesystemIterator::SKIP_DOTS), __DIR__ . '/test79082');
19-
$phar->extractTo(__DIR__);
20-
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
21-
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
22-
unlink(__DIR__ . '/test79082-testfile');
23-
unlink(__DIR__ . '/test79082-testfile2');
16+
clearstatcache();
17+
$phar = new PharData(__DIR__ . '/test79082.' . $ext, null, null, $mode);
18+
$phar->buildFromIterator(new \RecursiveDirectoryIterator(__DIR__ . '/test79082', \FilesystemIterator::SKIP_DOTS), __DIR__ . '/test79082');
19+
$phar->extractTo(__DIR__);
20+
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
21+
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
22+
unlink(__DIR__ . '/test79082-testfile');
23+
unlink(__DIR__ . '/test79082-testfile2');
2424
}
2525
foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
26-
clearstatcache();
27-
$phar = new PharData(__DIR__ . '/test79082-d.' . $ext, null, null, $mode);
28-
$phar->buildFromDirectory(__DIR__ . '/test79082');
29-
$phar->extractTo(__DIR__);
30-
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
31-
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
32-
unlink(__DIR__ . '/test79082-testfile');
33-
unlink(__DIR__ . '/test79082-testfile2');
26+
clearstatcache();
27+
$phar = new PharData(__DIR__ . '/test79082-d.' . $ext, null, null, $mode);
28+
$phar->buildFromDirectory(__DIR__ . '/test79082');
29+
$phar->extractTo(__DIR__);
30+
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
31+
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
32+
unlink(__DIR__ . '/test79082-testfile');
33+
unlink(__DIR__ . '/test79082-testfile2');
3434
}
3535
?>
3636
--CLEAN--

0 commit comments

Comments
 (0)