clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trim trailing whitespaces and fix code style

Browse Source 
Closes GH-5554.
This commit is contained in:
Rod Elias 2020-05-11 11:08:17 -03:00 committed by Nikita Popov
parent 16f23cd159
commit 682e2f6c20
23 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Zend/tests/bug72038.phpt
View File

@ -4,22 +4,22 @@ Bug #72038 (Function calls with values to a by-ref parameter don't always throw
<?php
try {
test($foo = new stdClass);
var_dump($foo);
test($foo = new stdClass);
var_dump($foo);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
echo "Exception: " . $e->getMessage() . "\n";
}
try {
test($bar = 2);
var_dump($bar);
test($bar = 2);
var_dump($bar);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
echo "Exception: " . $e->getMessage() . "\n";
}
try {
test($baz = &$bar);
var_dump($baz);
test($baz = &$bar);
var_dump($baz);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
echo "Exception: " . $e->getMessage() . "\n";
}
function test(&$param) {

4
Zend/tests/bug77589.phpt
View File

@ -3,14 +3,14 @@ BUG #77589 (Core dump using parse_ini_string with numeric sections)
--FILE--
<?php
var_dump(
parse_ini_string(<<<INI
parse_ini_string(<<<INI
[0]
a = 1
b = on
c = true
["true"]
a = 100
a = 100
b = null
c = yes
INI

24
Zend/tests/bug78154.phpt
View File

@ -4,20 +4,20 @@ Bug #78154: SEND_VAR_NO_REF does not always send reference
<?php
namespace {
try {
var_dump(similar_text('a', 'a', $c=0x44444444));
var_dump($c);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
}
try {
var_dump(similar_text('a', 'a', $c=0x44444444));
var_dump($c);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
}
}
namespace Foo {
try {
var_dump(similar_text('a', 'a', $d=0x44444444));
var_dump($d);
} catch (\Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
}
try {
var_dump(similar_text('a', 'a', $d=0x44444444));
var_dump($d);
} catch (\Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
}
}
?>

2
Zend/tests/bug79477.phpt
View File

@ -4,7 +4,7 @@ Bug #79477: casting object into array creates references
<?php
class Test {
public $prop = 'default value';
public $prop = 'default value';
}
$obj = new Test;

2
Zend/tests/lsb_021.phpt
View File

@ -24,7 +24,7 @@ class B extends A {
B::test();
call_user_func("B::test");
call_user_func(array("B", "test"));
(self::class)::test();
call_user_func(self::class . "::test");
call_user_func(array(self::class, "test"));

2
Zend/tests/magic_methods_serialize.phpt
View File

@ -3,7 +3,7 @@ __serialize declaration
--FILE--
<?php
class Foo {
static function __serialize($arguments) {}
static function __serialize($arguments) {}
}
?>
--EXPECTF--

2
Zend/tests/magic_methods_unserialize.phpt
View File

@ -3,7 +3,7 @@ __unserialize declaration
--FILE--
<?php
class Foo {
static function __unserialize($data, $value) {}
static function __unserialize($data, $value) {}
}
?>
--EXPECTF--

10
ext/ffi/tests/101.phpt
View File

@ -17,13 +17,13 @@ ffi.enable=1
require_once('utils.inc');
$fastcall = ffi_get_fastcall_specifier();
$zend = ffi_cdef("
const char *get_zend_version(void);
//char *get_zend_version(void);
extern size_t (*zend_printf)(const char *format, ...);
const char *get_zend_version(void);
//char *get_zend_version(void);
extern size_t (*zend_printf)(const char *format, ...);
unsigned long $fastcall zend_hash_func(const char *str, size_t len);
unsigned long $fastcall zend_hash_func(const char *str, size_t len);
void $fastcall zend_str_tolower(char *str, size_t length);
void $fastcall zend_str_tolower(char *str, size_t length);
", ffi_get_php_dll_name());
$f = $zend->get_zend_version;

8
ext/ffi/tests/301-win32.phpt
View File

@ -10,10 +10,10 @@ ffi.enable=1
require_once('utils.inc');
$fn = __DIR__ . "/300-win32.h";
$cont = str_replace(
"PHP_DLL_NAME",
ffi_get_php_dll_name(),
file_get_contents("$fn.in")
);
"PHP_DLL_NAME",
ffi_get_php_dll_name(),
file_get_contents("$fn.in")
);
file_put_contents($fn, $cont);
$ffi = FFI::load($fn);

32
ext/phar/tests/bug79082.phpt
View File

@ -13,24 +13,24 @@ chmod(__DIR__ . '/test79082/test79082-testfile', 0644);
chmod(__DIR__ . '/test79082/test79082-testfile2', 0400);
foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
clearstatcache();
$phar = new PharData(__DIR__ . '/test79082.' . $ext, null, null, $mode);
$phar->buildFromIterator(new \RecursiveDirectoryIterator(__DIR__ . '/test79082', \FilesystemIterator::SKIP_DOTS), __DIR__ . '/test79082');
$phar->extractTo(__DIR__);
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
unlink(__DIR__ . '/test79082-testfile');
unlink(__DIR__ . '/test79082-testfile2');
clearstatcache();
$phar = new PharData(__DIR__ . '/test79082.' . $ext, null, null, $mode);
$phar->buildFromIterator(new \RecursiveDirectoryIterator(__DIR__ . '/test79082', \FilesystemIterator::SKIP_DOTS), __DIR__ . '/test79082');
$phar->extractTo(__DIR__);
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
unlink(__DIR__ . '/test79082-testfile');
unlink(__DIR__ . '/test79082-testfile2');
}
foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
clearstatcache();
$phar = new PharData(__DIR__ . '/test79082-d.' . $ext, null, null, $mode);
$phar->buildFromDirectory(__DIR__ . '/test79082');
$phar->extractTo(__DIR__);
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
unlink(__DIR__ . '/test79082-testfile');
unlink(__DIR__ . '/test79082-testfile2');
clearstatcache();
$phar = new PharData(__DIR__ . '/test79082-d.' . $ext, null, null, $mode);
$phar->buildFromDirectory(__DIR__ . '/test79082');
$phar->extractTo(__DIR__);
var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
unlink(__DIR__ . '/test79082-testfile');
unlink(__DIR__ . '/test79082-testfile2');
}
?>
--CLEAN--

42
ext/soap/tests/bug79536.phpt
View File

@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0
--FILE--
<?php
$GLOBALS['HTTP_RAW_POST_DATA']="
<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\"
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"
xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
xmlns:ns1=\"http://schemas.nothing.com\"
<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\"
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"
xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\"
xmlns:ns1=\"http://schemas.nothing.com\"
>
<env:Body>
<ns1:dotest2>
@ -22,35 +22,35 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
</env:Envelope>";
class myFault extends SoapFault {
public function __destruct() {
}
public function __destruct() {
}
}
function book_to_xml($book) {
throw new myFault("Server", "Conversion Fault");
throw new myFault("Server", "Conversion Fault");
}
class test{
function dotest2($str){
$book = new book;
$book->a = "foo";
$book->b = "bar";
return $book;
}
function dotest2($str){
$book = new book;
$book->a = "foo";
$book->b = "bar";
return $book;
}
}
class book{
public $a="a";
public $b="c";
public $a="a";
public $b="c";
}
$options=Array(
'actor' =>'http://schemas.nothing.com',
'typemap' => array(array("type_ns" => "http://schemas.nothing.com",
"type_name" => "book",
"to_xml" => "book_to_xml"))
);
'actor' =>'http://schemas.nothing.com',
'typemap' => array(array("type_ns" => "http://schemas.nothing.com",
"type_name" => "book",
"to_xml" => "book_to_xml"))
);
$server = new SoapServer(__DIR__."/classmap.wsdl",$options);
$server->setClass("test");

12
ext/standard/tests/serialize/bug79526.phpt
View File

@ -4,9 +4,9 @@ Bug #79526 (`__sleep` error message doesn't include the name of the class)
<?php
class A
{
public function __sleep() {
return 1;
}
public function __sleep() {
return 1;
}
}
@ -14,9 +14,9 @@ serialize(new A());
class B
{
public function __sleep() {
return [1];
}
public function __sleep() {
return [1];
}
}

2
ext/xml/tests/xml_parser_set_option_variation5.phpt
View File

@ -11,7 +11,7 @@ if (!extension_loaded('xml')) {
$xmlParser = xml_parser_create();
var_dump(xml_parser_set_option($xmlParser, 42, 1));
var_dump(xml_parser_set_option($xmlParser, 42, 1));
?>
--EXPECTF--

8
ext/zip/tests/oo_add_encoding.phpt
View File

@ -15,7 +15,7 @@ $file = $dirname . 'tmp.zip';
@mkdir($dirname);
$zip = new ZipArchive;
if (!$zip->open($file, ZipArchive::CREATE)) {
exit('failed');
exit('failed');
}
$zip->addEmptyDir('foo');
@ -27,10 +27,10 @@ $zip->addFromString(chr(0x91), __FILE__, ZipArchive::FL_ENC_CP437);
$zip->addFromString('€', __FILE__, ZipArchive::FL_ENC_UTF_8);
if ($zip->status == ZIPARCHIVE::ER_OK) {
dump_entries_name($zip);
$zip->close();
dump_entries_name($zip);
$zip->close();
} else {
echo "failed\n";
echo "failed\n";
}
?>
--CLEAN--

6
ext/zip/tests/oo_add_from_string.phpt
View File

@ -31,10 +31,10 @@ var_dump($zip->addFromString('entry1.txt', __FILE__, ZipArchive::FL_OVERWRITE));
var_dump($zip->status == ZipArchive::ER_OK);
if ($zip->status == ZipArchive::ER_OK) {
dump_entries_name($zip);
$zip->close();
dump_entries_name($zip);
$zip->close();
} else {
echo "failed\n";
echo "failed\n";
}
?>
Done

4
ext/zip/tests/oo_addfile.phpt
View File

@ -23,7 +23,7 @@ if (!$zip->addFile($dirname . 'utils.inc', 'test.php')) {
}
var_dump($zip->lastId);
if (!$zip->addFile($dirname . 'utils.inc', 'mini.txt', 12, 34)) {
echo "failed\n";
echo "failed\n";
}
var_dump($zip->lastId);
if ($zip->status == ZIPARCHIVE::ER_OK) {
@ -44,7 +44,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {
echo "failed\n";
}
if (!$zip->open($file)) {
exit('failed');
exit('failed');
}
var_dump(strlen($zip->getFromName('test.php')) == filesize($dirname . 'utils.inc'));
var_dump(strlen($zip->getFromName('mini.txt')) == 34);

8
ext/zip/tests/oo_addglob.phpt
View File

@ -26,18 +26,18 @@ if (!$zip->open($file)) {
}
$options = array('add_path' => 'baz/', 'remove_all_path' => TRUE);
if (!$zip->addGlob($dirname . '*.{txt,baz}', GLOB_BRACE, $options)) {
echo "failed 1\n";
echo "failed 1\n";
}
if (!$zip->addGlob($dirname . '*.{txt,baz}', GLOB_BRACE, $options)) {
echo "failed 2\n";
echo "failed 2\n";
}
$options['flags'] = 0; // clean FL_OVERWRITE
if (!$zip->addGlob($dirname . '*.{txt,baz}', GLOB_BRACE, $options)) {
var_dump($zip->getStatusString());
var_dump($zip->getStatusString());
}
$options['flags'] = ZipArchive::FL_OVERWRITE;
if (!$zip->addGlob($dirname . '*.{txt,baz}', GLOB_BRACE, $options)) {
echo "failed 3\n";
echo "failed 3\n";
}
if ($zip->status == ZIPARCHIVE::ER_OK) {
if (!verify_entries($zip, [

28
ext/zip/tests/oo_addglob2.phpt
View File

@ -23,18 +23,18 @@ if (!$zip->open($file, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
exit('failed');
}
$options = [
'remove_all_path' => true,
'remove_all_path' => true,
];
if (!$zip->addGlob($dirname . 'foo.*', GLOB_BRACE, $options)) {
echo "failed 1\n";
}
$options = [
'remove_all_path' => true,
'comp_method' => ZipArchive::CM_STORE,
'comp_flags' => 5,
'enc_method' => ZipArchive::EM_AES_256,
'enc_password' => 'secret',
'remove_all_path' => true,
'comp_method' => ZipArchive::CM_STORE,
'comp_flags' => 5,
'enc_method' => ZipArchive::EM_AES_256,
'enc_password' => 'secret',
];
if (!$zip->addGlob($dirname . 'bar.*', GLOB_BRACE, $options)) {
echo "failed 2\n";
@ -42,14 +42,14 @@ if (!$zip->addGlob($dirname . 'bar.*', GLOB_BRACE, $options)) {
if ($zip->status == ZIPARCHIVE::ER_OK) {
$zip->close();
$zip = new ZipArchive();
$zip->open($file);
for($i=0; $i<$zip->numFiles; $i++) {
$sb = $zip->statIndex($i);
echo "$i: " . $sb['name'] .
", comp=" . $sb['comp_method'] .
", enc=" . $sb['encryption_method'] . "\n";
}
$zip = new ZipArchive();
$zip->open($file);
for($i=0; $i<$zip->numFiles; $i++) {
$sb = $zip->statIndex($i);
echo "$i: " . $sb['name'] .
", comp=" . $sb['comp_method'] .
", enc=" . $sb['encryption_method'] . "\n";
}
} else {
echo "failed 3\n";
}

6
ext/zip/tests/oo_addpattern.phpt
View File

@ -27,15 +27,15 @@ if (!$zip->open($file)) {
$dir = realpath($dirname);
$options = array('add_path' => 'baz/', 'remove_path' => $dir);
if (!$zip->addPattern('/\.txt$/', $dir, $options)) {
echo "failed 1\n";
echo "failed 1\n";
}
$options['flags'] = 0; // clean FL_OVERWRITE
if (!$zip->addPattern('/\.txt$/', $dir, $options)) {
var_dump($zip->getStatusString());
var_dump($zip->getStatusString());
}
$options['flags'] = ZipArchive::FL_OVERWRITE;
if (!$zip->addPattern('/\.txt$/', $dir, $options)) {
echo "failed 2\n";
echo "failed 2\n";
}
if ($zip->status == ZIPARCHIVE::ER_OK) {

2
ext/zip/tests/oo_replacefile.phpt
View File

@ -42,7 +42,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {
echo "failed\n";
}
if (!$zip->open($file)) {
exit('re-open failed');
exit('re-open failed');
}
var_dump(strlen($zip->getFromName('bar')) == filesize($dirname . 'utils.inc'));
var_dump(strlen($zip->getFromName('foobar/baz')) == 42);

30
ext/zip/tests/oo_supported.phpt
View File

@ -9,28 +9,28 @@ if (!method_exists('ZipArchive', 'isCompressionMethodSupported')) die('skip need
--FILE--
<?php
$methods = [
ZipArchive::CM_STORE => "STORE",
ZipArchive::CM_DEFLATE => "DEFLATE",
ZipArchive::CM_BZIP2 => "BZIP2",
ZipArchive::CM_XZ => "XZ",
ZipArchive::CM_STORE => "STORE",
ZipArchive::CM_DEFLATE => "DEFLATE",
ZipArchive::CM_BZIP2 => "BZIP2",
ZipArchive::CM_XZ => "XZ",
];
foreach($methods as $method => $name) {
echo "Compression $name\n";
var_dump(ZipArchive::isCompressionMethodSupported($method));
var_dump(ZipArchive::isCompressionMethodSupported($method, false));
echo "Compression $name\n";
var_dump(ZipArchive::isCompressionMethodSupported($method));
var_dump(ZipArchive::isCompressionMethodSupported($method, false));
}
$methods = [
ZipArchive::EM_NONE => "NONE",
ZipArchive::EM_TRAD_PKWARE => "TRAD_PKWARE",
ZipArchive::EM_AES_128 => "AES-128",
ZipArchive::EM_AES_192 => "AES-192",
ZipArchive::EM_AES_256 => "AES-256",
ZipArchive::EM_NONE => "NONE",
ZipArchive::EM_TRAD_PKWARE => "TRAD_PKWARE",
ZipArchive::EM_AES_128 => "AES-128",
ZipArchive::EM_AES_192 => "AES-192",
ZipArchive::EM_AES_256 => "AES-256",
];
foreach($methods as $method => $name) {
echo "Encryption $name\n";
var_dump(ZipArchive::isEncryptionMethodSupported($method));
var_dump(ZipArchive::isEncryptionMethodSupported($method, false));
echo "Encryption $name\n";
var_dump(ZipArchive::isEncryptionMethodSupported($method));
var_dump(ZipArchive::isEncryptionMethodSupported($method, false));
}
?>
Done

8
ext/zip/tests/utils.inc
View File

@ -1,9 +1,9 @@
<?php
function dump_entries_name($z) {
for($i=0; $i<$z->numFiles; $i++) {
$sb = $z->statIndex($i);
echo $i . ' ' . $sb['name'] . "\n";
}
for($i=0; $i<$z->numFiles; $i++) {
$sb = $z->statIndex($i);
echo $i . ' ' . $sb['name'] . "\n";
}
}
function verify_entries($zip, $entries = []) {

38
tests/lang/passByReference_010.phpt
View File

@ -10,41 +10,41 @@ function f(&$a) {
echo "\n\n---> Pass constant assignment by reference:\n";
try {
f($a="a.original");
var_dump($a);
f($a="a.original");
var_dump($a);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() ."\n";
echo "Exception: " . $e->getMessage() ."\n";
}
echo "\n\n---> Pass variable assignment by reference:\n";
try {
unset($a);
$a = "a.original";
f($b = $a);
var_dump($a);
unset($a);
$a = "a.original";
f($b = $a);
var_dump($a);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() ."\n";
echo "Exception: " . $e->getMessage() ."\n";
}
echo "\n\n---> Pass reference assignment by reference:\n";
try {
unset($a, $b);
$a = "a.original";
f($b =& $a);
var_dump($a);
unset($a, $b);
$a = "a.original";
f($b =& $a);
var_dump($a);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() ."\n";
echo "Exception: " . $e->getMessage() ."\n";
}
echo "\n\n---> Pass concat assignment by reference:\n";
try {
unset($a, $b);
$b = "b.original";
$a = "a.original";
f($b .= $a);
var_dump($a);
unset($a, $b);
$b = "b.original";
$a = "a.original";
f($b .= $a);
var_dump($a);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() ."\n";
echo "Exception: " . $e->getMessage() ."\n";
}
?>