Skip to content

Commit a9823e7

Browse files
bjoribjori
committed
Ignore me. Trim trailing space
This has been annoying me for a long time, especially the '<?php '
1 parent dad5d51 commit a9823e7

Some content is hidden

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

47 files changed

+70
-70
lines changed

‎Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ patch:
109109
fi \
110110
done; \
111111
touch $(top_srcdir)/.patched; \
112-
fi
112+
fi
113113

114114
package.xml:
115115
php bin/prep-release.php $(PHONGO_VERSION)-$(PHONGO_STABILITY)

‎docs/batch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<?php
55

66
$hannes = array(
7-
"name" => "Hannes",
7+
"name" => "Hannes",
88
"nick" => "bjori",
99
"citizen" => "Iceland",
1010
);

‎docs/ods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ This will result in the following document to be stored (as shown by mongo shell
180180
]
181181
],
182182
{
183-
183+
184184
}
185185
]
186186
]

‎php_array.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ zend_bool php_array_existsl_safe(zval *zarr, const char *key, int key_len) {
8080
return ret;
8181
}
8282
#define php_array_existsn(zarr, idx) \
83-
zend_hash_index_exists(Z_ARRVAL_P(zarr), idx)
83+
zend_hash_index_exists(Z_ARRVAL_P(zarr), idx)
8484
static inline
8585
zend_bool php_array_existsz(zval *zarr, zval *key) {
8686
switch (Z_TYPE_P(key)) {

‎php_compat_53.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
default: \
3131
RETURN_NULL(); \
3232
} \
33-
}
33+
}
3434
#endif

‎scripts/centos/ldap/ldapconfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def main():
3232
print "adding ", uname
3333
dn= 'uid=' + uname.lower() + ',ou=Users,dc=10gen,dc=me'
3434

35-
ldif = configUser(uname.rstrip('\r\n'))
35+
ldif = configUser(uname.rstrip('\r\n'))
3636

3737
# Do the actual synchronous add-operation to the ldapserver
3838
l.add_s(dn,ldif)

‎scripts/presets/standalone-auth.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"name": "mongod",
2+
"name": "mongod",
33
"id" : "STANDALONE-AUTH",
44
"auth_key": "secret",
5-
"login": "root",
6-
"password": "toor",
5+
"login": "root",
6+
"password": "toor",
77
"procParams": {
88
"dbpath": "/tmp/standalone-auth/",
9-
"ipv6": true,
10-
"logappend": true,
11-
"logpath": "/tmp/standalone-auth/m.log",
9+
"ipv6": true,
10+
"logappend": true,
11+
"logpath": "/tmp/standalone-auth/m.log",
1212
"journal": true,
1313
"port": 2200,
1414
"setParameter": {"enableTestCommands": 1}

‎scripts/presets/standalone-ssl.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"name": "mongod",
2+
"name": "mongod",
33
"id" : "STANDALONE-SSL",
44
"procParams": {
55
"dbpath": "/tmp/standalone-ssl/",
6-
"ipv6": true,
7-
"logappend": true,
8-
"logpath": "/tmp/standalone-ssl/m.log",
6+
"ipv6": true,
7+
"logappend": true,
8+
"logpath": "/tmp/standalone-ssl/m.log",
99
"journal": true,
1010
"port": 2100,
1111
"setParameter": {"enableTestCommands": 1}
12-
},
12+
},
1313
"sslParams": {
1414
"sslMode": "requireSSL",
15-
"sslCAFile": "/phongo/scripts/ssl/ca.pem",
16-
"sslPEMKeyFile": "/phongo/scripts/ssl/server.pem",
15+
"sslCAFile": "/phongo/scripts/ssl/ca.pem",
16+
"sslPEMKeyFile": "/phongo/scripts/ssl/server.pem",
1717
"sslWeakCertificateValidation": true
1818
}
1919
}

‎scripts/presets/standalone-x509.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"name": "mongod",
2+
"name": "mongod",
33
"id" : "STANDALONE-X509",
44
"authSource": "$external",
55
"login": "C=US,ST=California,L=Palo Alto,O=MongoDB,OU=phongo,CN=localhost",
66
"procParams": {
77
"dbpath": "/tmp/standalone-x509/",
8-
"ipv6": true,
9-
"logappend": true,
10-
"logpath": "/tmp/standalone-x509/m.log",
8+
"ipv6": true,
9+
"logappend": true,
10+
"logpath": "/tmp/standalone-x509/m.log",
1111
"journal": true,
1212
"port": 2300,
1313
"setParameter": {"enableTestCommands": 1, "authenticationMechanisms": "MONGODB-X509"}
14-
},
14+
},
1515
"sslParams": {
1616
"sslMode": "requireSSL",
17-
"sslCAFile": "/phongo/scripts/ssl/ca.pem",
18-
"sslPEMKeyFile": "/phongo/scripts/ssl/server.pem",
17+
"sslCAFile": "/phongo/scripts/ssl/ca.pem",
18+
"sslPEMKeyFile": "/phongo/scripts/ssl/server.pem",
1919
"sslWeakCertificateValidation": true
2020
}
2121
}

‎scripts/presets/standalone.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "mongod",
2+
"name": "mongod",
33
"id" : "STANDALONE",
44
"procParams": {
55
"dbpath": "/tmp/standalone/",
6-
"ipv6": true,
7-
"logappend": true,
8-
"logpath": "/tmp/standalone/mongod.log",
6+
"ipv6": true,
7+
"logappend": true,
8+
"logpath": "/tmp/standalone/mongod.log",
99
"journal": true,
1010
"port": 2000,
1111
"setParameter": {"enableTestCommands": 1}

‎scripts/ssl/crl.pem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Certificate Revocation List (CRL):
55
Last Update: Aug 21 13:56:28 2014 GMT
66
Next Update: Aug 18 13:56:28 2024 GMT
77
CRL extensions:
8-
X509v3 CRL Number:
8+
X509v3 CRL Number:
99
4096
1010
No Revoked Certificates.
1111
Signature Algorithm: sha256WithRSAEncryption

‎tests/batch/write-0001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MongoDB\Driver\Write\Batch: #001 Variety Batch
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$mc = new MongoDB\Driver\Manager(MONGODB_URI);

‎tests/batch/write-0002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MongoDB\Driver\Write\Batch: #002 Get the generated ID
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$mm = new MongoDB\Driver\Manager(MONGODB_URI);

‎tests/bson/bson-binary-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON BSON\Binary #001
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$types = array(

‎tests/bson/bson-decode-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON encoding: Encoding data into BSON representation, and BSON into Extended JS
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$tests = array(

‎tests/bson/bson-decode-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON encoding: Encoding object/arrays data into user specificied classes
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
class MyArrayObject extends ArrayObject implements BSON\Unserializable {

‎tests/bson/bson-encode-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON encoding: Encoding data into BSON representation, and BSON into Extended JS
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$tests = array(

‎tests/bson/bson-encode-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON encoding: Encoding objects into BSON representation
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
class MyClass implements BSON\Serializable, BSON\Unserializable {

‎tests/bson/bson-encode-003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON encoding: Encoding objects into BSON representation
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
class MyClass implements BSON\Persistable {

‎tests/bson/bson-encode-004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON encoding: Object Document Mapper
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88
require_once "tests/utils/classes.inc";
99

‎tests/bson/bson-javascript-001.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON BSON\Javascript #001
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$js = new BSON\Javascript("function foo(bar) {var baz = bar; var bar = foo; return bar; }");
@@ -30,10 +30,10 @@ foreach($tests as $n => $test) {
3030
<?php exit(0); ?>
3131
--EXPECTF--
3232
OK: Got InvalidArgumentException
33-
Test#0
33+
Test#0
3434
bool(true)
3535
bool(true)
36-
Test#1
36+
Test#1
3737
bool(true)
3838
bool(true)
3939
===DONE===

‎tests/bson/bson-maxkey-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON BSON\MaxKey #001
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$maxkey = new BSON\MaxKey;

‎tests/bson/bson-minkey-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON BSON\MinKey #001
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$minkey = new BSON\MinKey;

‎tests/bson/bson-objectid-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON BSON\ObjectID #001
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$sameid = new BSON\ObjectID("53e2a1c40640fd72175d4603");

‎tests/bson/bson-regex-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON BSON\Regex #001
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$regexp = new BSON\Regex("regexp", "i");

‎tests/bson/bson-timestamp-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BSON BSON\Timestamp #001
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$timestamp = new BSON\Timestamp(1234, 5678);

‎tests/connect/standalone-auth-0001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Connect to MongoDB with using default auth mechanism
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$username = "root";

‎tests/connect/standalone-plain-0001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Connect to MongoDB with using PLAIN auth mechanism
33
--SKIPIF--
44
<?php require "tests/utils/auth-plain-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$username = "root";

‎tests/connect/standalone-ssl-0001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Connect to MongoDB with using SSL
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$dsn = sprintf("%s/?ssl=true", MONGODB_STANDALONE_SSL_URI);

‎tests/connect/standalone-ssl-0002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Connect to MongoDB with using SSL and verify the stream
33
--SKIPIF--
44
<?php require "tests/utils/basic-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$dsn = sprintf("%s/?ssl=true", MONGODB_STANDALONE_SSL_URI);

‎tests/connect/standalone-x509-0001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Connect to MongoDB with using SSL and X.509 auth
33
--SKIPIF--
44
<?php require "tests/utils/auth-x509-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$SSL_DIR = realpath(__DIR__ . "/" . "./../../scripts/ssl/");

‎tests/connect/standalone-x509-0002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Connect to MongoDB with using X509 retrieving username from certificate #002
33
--SKIPIF--
44
<?php require "tests/utils/auth-x509-skipif.inc"?>
55
--FILE--
6-
<?php
6+
<?php
77
require_once "tests/utils/basic.inc";
88

99
$SSL_DIR = realpath(__DIR__ . "/" . "./../../scripts/ssl/");

‎tests/functional/cursor-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Sorting single field, ascending, using the Cursor Iterator
44
<?php require "tests/utils/basic-skipif.inc" ?>
55
<?php require "tests/utils/fixtures-users.inc" ?>
66
--FILE--
7-
<?php
7+
<?php
88
require_once "tests/utils/basic.inc";
99

1010
$manager = new MongoDB\Driver\Manager(MONGODB_URI);

‎tests/functional/cursor-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Sorting single field, ascending, using the Cursor Iterator
44
<?php require "tests/utils/basic-skipif.inc" ?>
55
<?php require "tests/utils/fixtures-users.inc" ?>
66
--FILE--
7-
<?php
7+
<?php
88
require_once "tests/utils/basic.inc";
99

1010
$manager = new MongoDB\Driver\Manager(MONGODB_URI);

‎tests/functional/cursorid-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Sorting single field, ascending, using the Cursor Iterator
44
<?php require "tests/utils/basic-skipif.inc" ?>
55
<?php require "tests/utils/fixtures-users.inc" ?>
66
--FILE--
7-
<?php
7+
<?php
88
require_once "tests/utils/basic.inc";
99

1010
$manager = new MongoDB\Driver\Manager(MONGODB_URI);

‎tests/functional/query-sort-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Sorting single field, ascending
44
<?php require "tests/utils/basic-skipif.inc" ?>
55
<?php require "tests/utils/fixtures-users.inc" ?>
66
--FILE--
7-
<?php
7+
<?php
88
require_once "tests/utils/basic.inc";
99

1010
$manager = new MongoDB\Driver\Manager(MONGODB_URI);

0 commit comments

Comments
 (0)