Skip to content

Commit 21e3b0c

Browse files
carusogabrielnikic
authored andcommitted
Remove trailing whitespace in inc files
1 parent 1422e2f commit 21e3b0c

File tree

84 files changed

+504
-504
lines changed

Some content is hidden

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

84 files changed

+504
-504
lines changed

Zend/tests/closures/closure_from_callable.inc

+13-13
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Foo
2626
{
2727
return $param1;
2828
}
29-
29+
3030
private static function privateStaticFunction($param1)
3131
{
3232
return $param1;
@@ -41,18 +41,18 @@ class Foo
4141
{
4242
return $param1;
4343
}
44-
44+
4545
protected function protectedInstanceFunc($param1)
4646
{
4747
return $param1;
4848
}
49-
50-
49+
50+
5151
public function publicInstanceFunc($param1)
5252
{
5353
return $param1;
5454
}
55-
55+
5656
public function closePrivateValid()
5757
{
5858
return Closure::fromCallable([$this, 'privateInstanceFunc']);
@@ -87,23 +87,23 @@ class Foo
8787

8888

8989
class SubFoo extends Foo {
90-
90+
9191
public function closePrivateStaticInvalid()
9292
{
9393
return Closure::fromCallable([__CLASS__, 'privateStaticFunction']);
9494
}
95-
96-
95+
96+
9797
public function closePrivateInvalid()
9898
{
9999
return Closure::fromCallable([$this, 'privateInstanceFunc']);
100100
}
101-
101+
102102
public function closeProtectedStaticMethod()
103103
{
104104
return Closure::fromCallable([__CLASS__, 'protectedStaticFunction']);
105105
}
106-
106+
107107
public function closeProtectedValid()
108108
{
109109
return Closure::fromCallable([$this, 'protectedInstanceFunc']);
@@ -113,13 +113,13 @@ class SubFoo extends Foo {
113113
{
114114
return Closure::fromCallable('parent::publicInstanceFunc');
115115
}
116-
116+
117117
public function getSelfColonParentPublicInstanceMethod()
118118
{
119119
return Closure::fromCallable('self::publicInstanceFunc');
120120
}
121-
122-
121+
122+
123123
public function getSelfColonParentProtectedInstanceMethod()
124124
{
125125
return Closure::fromCallable('self::protectedInstanceFunc');

Zend/tests/list_keyed_evaluation_order.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class IndexableRetrievable
4747
{
4848
private $label;
4949
private $indexable;
50-
50+
5151
public function __construct(string $label, Indexable $indexable) {
5252
$this->label = $label;
5353
$this->indexable = $indexable;

ext/calendar/tests/skipif.inc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
2-
if(!extension_loaded("calendar"))
3-
print "skip - CALENDAR extension not available";
1+
<?php
2+
if(!extension_loaded("calendar"))
3+
print "skip - CALENDAR extension not available";
44
?>

ext/curl/tests/server.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function curl_cli_server_start() {
88
if(getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
99
return getenv('PHP_CURL_HTTP_REMOTE_SERVER');
1010
}
11-
11+
1212
$php_executable = getenv('TEST_PHP_EXECUTABLE');
1313
$doc_root = __DIR__;
1414
$router = "responder/get.php";
@@ -30,7 +30,7 @@ function curl_cli_server_start() {
3030

3131
$handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root);
3232
}
33-
33+
3434
// note: even when server prints 'Listening on localhost:8964...Press Ctrl-C to quit.'
3535
// it might not be listening yet...need to wait until fsockopen() call returns
3636
$error = "Unable to connect to server\n";

ext/gd/tests/func.inc

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,44 @@ function get_php_info()
1818
function get_freetype_version()
1919
{
2020
$version = 0;
21-
21+
2222
if (preg_match(',FreeType Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) {
2323
$version = $match[1];
2424
}
25-
25+
2626
return $version;
2727
}
2828

2929
function get_libjpeg_version()
3030
{
3131
$version = 0;
32-
32+
3333
if (preg_match(',libJPEG Version => ([a-z0-9]+),s', get_php_info(), $match)) {
3434
$version = $match[1];
3535
}
36-
36+
3737
return $version;
3838
}
3939

4040
function get_libpng_version()
4141
{
4242
$version = 0;
43-
43+
4444
if (preg_match(',libPNG Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) {
4545
$version = $match[1];
4646
}
47-
47+
4848
return $version;
4949
}
5050

5151
function get_libxpm_version()
5252
{
5353
$version = 0;
54-
54+
5555
if (preg_match(',libXpm Version => (\d+),s', get_php_info(), $match)) {
5656
$version = $match[1];
5757
}
58-
58+
5959
return $version;
6060
}
6161

ext/imap/tests/clean.inc

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
66
// delete all msgs in default mailbox, i.e INBOX
77
$check = imap_check($imap_stream);
88
for ($i = 1; $i <= $check->Nmsgs; $i++) {
9-
imap_delete($imap_stream, $i);
9+
imap_delete($imap_stream, $i);
1010
}
1111

1212
$mailboxes = imap_getmailboxes($imap_stream, $server, '*');
1313

1414
foreach($mailboxes as $value) {
1515
// Only delete mailboxes with our prefix
1616
if (preg_match('/\{.*?\}INBOX\.(.+)/', $value->name, $match) == 1) {
17-
if (strlen($match[1]) >= strlen($mailbox_prefix)
17+
if (strlen($match[1]) >= strlen($mailbox_prefix)
1818
&& substr_compare($match[1], $mailbox_prefix, 0, strlen($mailbox_prefix)) == 0) {
1919
imap_deletemailbox($imap_stream, $value->name);
2020
}
21-
}
21+
}
2222
}
2323

24-
imap_close($imap_stream, CL_EXPUNGE);
24+
imap_close($imap_stream, CL_EXPUNGE);
2525
?>

ext/imap/tests/imap_include.inc

+26-26
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$server = '{127.0.0.1/norsh}';
44
$default_mailbox = $server . "INBOX";
55
$domain = "something.com";
6-
$admin_user = "webmaster"; // a user with admin access
6+
$admin_user = "webmaster"; // a user with admin access
77
$username = "$admin_user@$domain";
88
$password = 'p4ssw0rd';
99
$users = array("webmaster", "info", "admin", "foo"); // tests require 4 valid userids
@@ -56,39 +56,39 @@ function displayOverviewFields($resp, $fields=null) {
5656

5757

5858
/**
59-
* Create a test mailbox and populate with msgs
59+
* Create a test mailbox and populate with msgs
6060
*
6161
* @param string mailbox_suffix Suffix used to uniquely identify mailboxes
62-
* @param int message_count number of test msgs to be written to new mailbox
63-
*
62+
* @param int message_count number of test msgs to be written to new mailbox
63+
*
6464
* @return IMAP stream to new mailbox on success; FALSE on failure
6565
*/
6666
function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){
6767
global $server, $default_mailbox, $username, $password;
68-
68+
6969
// open a stream to default mailbox
7070
$imap_stream = imap_open($default_mailbox, $username, $password);
7171

7272
if ($imap_stream === false) {
7373
echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
7474
return false;
75-
}
76-
75+
}
76+
7777
echo "Create a temporary mailbox and add " . $message_count . " msgs\n";
7878
$new_mailbox = create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type);
7979
if ($new_mailbox === false) {
8080
echo "Cant create a temporary mailbox: " . imap_last_error(). "\n";
8181
return false;
8282
}
83-
83+
8484
echo ".. mailbox '$new_mailbox' created\n";
85-
85+
8686
// reopen stream to new mailbox
8787
if (imap_reopen($imap_stream, $new_mailbox) === false) {
8888
echo "cant re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n";
8989
return false;
9090
}
91-
91+
9292
return $imap_stream;
9393
}
9494

@@ -101,27 +101,27 @@ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = nul
101101
function create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type= "simple"){
102102
global $default_mailbox, $mailbox_prefix;
103103
$mailbox = $default_mailbox . "." . $mailbox_prefix . $mailbox_suffix;
104-
104+
105105
$mailboxes = imap_getmailboxes($imap_stream, $mailbox, '*');
106-
106+
107107
// check mailbox does not already exist
108108
if ($mailboxes) {
109109
foreach($mailboxes as $value) {
110110
if ($value->name == $mailbox) {
111111
exit ("TEST FAILED : Mailbox '$mailbox' already exists\n");
112112
}
113113
}
114-
}
114+
}
115115

116116
if (imap_createmailbox($imap_stream, $mailbox) === false) {
117117
return false;
118118
}
119-
119+
120120
// Add number of test msgs requested
121121
if ($message_count > 0) {
122122
populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type);
123-
}
124-
123+
}
124+
125125
return $mailbox;
126126
}
127127

@@ -146,42 +146,42 @@ function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type = "s
146146
$envelope["from"]= "[email protected]";
147147
$envelope["to"] = "$users[0]@$domain";
148148
$envelope["subject"] = "Test msg $i";
149-
149+
150150
$part1["type"] = TYPEMULTIPART;
151151
$part1["subtype"] = "mixed";
152-
152+
153153
$part2["type"] = TYPETEXT;
154154
$part2["subtype"] = "plain";
155155
$part2["description"] = "imap_mail_compose() function";
156156
$part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx";
157-
157+
158158
$part3["type"] = TYPETEXT;
159159
$part3["subtype"] = "plain";
160160
$part3["description"] = "Example";
161161
$part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy";
162-
162+
163163
$part4["type"] = TYPETEXT;
164164
$part4["subtype"] = "plain";
165165
$part4["description"] = "Return Values";
166166
$part4["contents.data"] = "message 3:zzzzzzzzzzzzzzzzzzzzzzzzzz";
167-
167+
168168
$body[1] = $part1;
169169
$body[2] = $part2;
170170
$body[3] = $part3;
171171
$body[4] = $part4;
172-
172+
173173
$msg = imap_mail_compose($envelope, $body);
174174
}
175-
175+
176176
imap_append($imap_stream, $mailbox, $msg);
177177
}
178178
}
179179

180180
/**
181-
* Get the mailbox name from a mailbox decription, i.e strip off server details.
181+
* Get the mailbox name from a mailbox decription, i.e strip off server details.
182182
*
183-
* @param string mailbox complete mailbox name
184-
* @return mailbox name
183+
* @param string mailbox complete mailbox name
184+
* @return mailbox name
185185
*/
186186
function get_mailbox_name($mailbox){
187187

ext/imap/tests/skipif.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
extension_loaded('imap') or die('skip imap extension not available in this build');
3-
3+
44
// Change these to make tests run successfully
55
$mailbox = '{localhost/norsh}';
66
$username = '[email protected]';

ext/interbase/tests/interbase.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function init_db()
1414
{
1515
global $test_base, $user, $password;
1616

17-
$test_db = ibase_query(IBASE_CREATE,
17+
$test_db = ibase_query(IBASE_CREATE,
1818
sprintf("CREATE SCHEMA '%s' USER '%s' PASSWORD '%s' DEFAULT CHARACTER SET %s",$test_base,
1919
$user, $password, ($charset = ini_get('ibase.default_charset')) ? $charset : 'NONE'));
2020
$tr = ibase_trans($test_db);
@@ -28,7 +28,7 @@ function init_db()
2828
function cleanup_db()
2929
{
3030
global $test_base;
31-
31+
3232
$r = ibase_connect($test_base);
3333
ibase_drop_db($r);
3434
}

ext/interbase/tests/skipif.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
if (!extension_loaded("interbase")) print "skip interbase extension not available";
3+
if (!extension_loaded("interbase")) print "skip interbase extension not available";
44
require("interbase.inc");
55
if(!@ibase_connect($test_base)){
66
die("skip cannot connnect");

ext/mbstring/tests/common.inc

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Custom Error Hanlder for testing
77
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
88
global $debug;
9-
9+
1010
$err_type = array (
1111
1 => "Error", // E_ERROR
1212
2 => "Warning", // E_WARINING
@@ -23,7 +23,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
2323
4096=> "Recoverable fatal error", // E_RECOVERABLE_ERROR
2424
8192=> "Deprecated", // E_DEPRECATED
2525
);
26-
26+
2727
if (!empty($debug)) {
2828
printf("%s: %s (%d)\n", $err_type[$err_no], $err_msg, $linenum);
2929
}
@@ -46,7 +46,7 @@ class tc
4646
public $s1 = '日本語EUC-JPの文字列';
4747
public $s2 = 'English Text';
4848

49-
function __construct()
49+
function __construct()
5050
{
5151
}
5252
}

0 commit comments

Comments
 (0)