Skip to content

Commit 4786819

Browse files
jmikolajmikola
committed
Merge pull request #627 
2 parents a61df73 + 58324ad commit 4786819

File tree

706 files changed

+784
-783
lines changed

Some content is hidden

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

706 files changed

+784
-783
lines changed

‎php_phongo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,8 +2560,8 @@ static const zend_function_entry mongodb_functions[] = {
25602560
ZEND_NS_NAMED_FE("MongoDB\\BSON", fromPHP, PHP_FN(MongoDB_BSON_fromPHP), ai_bson_fromPHP)
25612561
ZEND_NS_NAMED_FE("MongoDB\\BSON", toPHP, PHP_FN(MongoDB_BSON_toPHP), ai_bson_toPHP)
25622562
ZEND_NS_NAMED_FE("MongoDB\\BSON", toJSON, PHP_FN(MongoDB_BSON_toJSON), ai_bson_toJSON)
2563-
ZEND_NS_NAMED_FE("MongoDB\\BSON", toCanonicalJSON, PHP_FN(MongoDB_BSON_toCanonicalJSON), ai_bson_toJSON)
2564-
ZEND_NS_NAMED_FE("MongoDB\\BSON", toRelaxedJSON, PHP_FN(MongoDB_BSON_toRelaxedJSON), ai_bson_toJSON)
2563+
ZEND_NS_NAMED_FE("MongoDB\\BSON", toCanonicalExtendedJSON, PHP_FN(MongoDB_BSON_toCanonicalExtendedJSON), ai_bson_toJSON)
2564+
ZEND_NS_NAMED_FE("MongoDB\\BSON", toRelaxedExtendedJSON, PHP_FN(MongoDB_BSON_toRelaxedExtendedJSON), ai_bson_toJSON)
25652565
ZEND_NS_NAMED_FE("MongoDB\\BSON", fromJSON, PHP_FN(MongoDB_BSON_fromJSON), ai_bson_fromJSON)
25662566
ZEND_NS_NAMED_FE("MongoDB\\Driver\\Monitoring", addSubscriber, PHP_FN(MongoDB_Driver_Monitoring_addSubscriber), ai_mongodb_driver_monitoring_subscriber)
25672567
ZEND_NS_NAMED_FE("MongoDB\\Driver\\Monitoring", removeSubscriber, PHP_FN(MongoDB_Driver_Monitoring_removeSubscriber), ai_mongodb_driver_monitoring_subscriber)

‎scripts/convert-bson-corpus-tests.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ function getParamsForValid(array $test, array $case)
151151
$expect .= $expectedCanonicalBson . "\n";
152152

153153
$code .= "\n// Canonical BSON -> Canonical extJSON \n";
154-
$code .= 'echo json_canonicalize(toCanonicalJSON($canonicalBson)), "\n";' . "\n";;
154+
$code .= 'echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";' . "\n";;
155155
$expect .= $expectedCanonicalExtJson . "\n";
156156

157157
if (isset($relaxedExtJson)) {
158158
$code .= "\n// Canonical BSON -> Relaxed extJSON \n";
159-
$code .= 'echo json_canonicalize(toRelaxedJSON($canonicalBson)), "\n";' . "\n";;
159+
$code .= 'echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n";' . "\n";;
160160
$expect .= $expectedRelaxedExtJson . "\n";
161161
}
162162

@@ -172,12 +172,12 @@ function getParamsForValid(array $test, array $case)
172172
$expect .= $expectedCanonicalBson . "\n";
173173

174174
$code .= "\n// Degenerate BSON -> Canonical extJSON \n";
175-
$code .= 'echo json_canonicalize(toCanonicalJSON($degenerateBson)), "\n";' . "\n";;
175+
$code .= 'echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n";' . "\n";;
176176
$expect .= $expectedCanonicalExtJson . "\n";
177177

178178
if (isset($relaxedExtJson)) {
179179
$code .= "\n// Degenerate BSON -> Relaxed extJSON \n";
180-
$code .= 'echo json_canonicalize(toRelaxedJSON($degenerateBson)), "\n";' . "\n";;
180+
$code .= 'echo json_canonicalize(toRelaxedExtendedJSON($degenerateBson)), "\n";' . "\n";;
181181
$expect .= $expectedRelaxedExtJson . "\n";
182182
}
183183
}
@@ -190,7 +190,7 @@ function getParamsForValid(array $test, array $case)
190190

191191
if (isset($relaxedExtJson)) {
192192
$code .= "\n// Relaxed extJSON -> BSON -> Relaxed extJSON \n";
193-
$code .= 'echo json_canonicalize(toRelaxedJSON(fromJSON($relaxedExtJson))), "\n";' . "\n";
193+
$code .= 'echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n";' . "\n";
194194
$expect .= $expectedRelaxedExtJson . "\n";
195195
}
196196

‎src/BSON/functions.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,16 @@ PHP_FUNCTION(MongoDB_BSON_toJSON)
159159
phongo_bson_to_json(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHONGO_JSON_MODE_LEGACY);
160160
} /* }}} */
161161

162-
/* {{{ proto string MongoDB\BSON\toCanonicalJSON(string $bson)
163-
Returns the canonical JSON representation of a BSON value */
164-
PHP_FUNCTION(MongoDB_BSON_toCanonicalJSON)
162+
/* {{{ proto string MongoDB\BSON\toCanonicalExtendedJSON(string $bson)
163+
Returns the canonical extended JSON representation of a BSON value */
164+
PHP_FUNCTION(MongoDB_BSON_toCanonicalExtendedJSON)
165165
{
166166
phongo_bson_to_json(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHONGO_JSON_MODE_CANONICAL);
167167
} /* }}} */
168168

169-
/* {{{ proto string MongoDB\BSON\toRelaxedJSON(string $bson)
170-
Returns the relaxed JSON representation of a BSON value */
171-
PHP_FUNCTION(MongoDB_BSON_toRelaxedJSON)
169+
/* {{{ proto string MongoDB\BSON\toRelaxedExtendedJSON(string $bson)
170+
Returns the relaxed extended JSON representation of a BSON value */
171+
PHP_FUNCTION(MongoDB_BSON_toRelaxedExtendedJSON)
172172
{
173173
phongo_bson_to_json(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHONGO_JSON_MODE_RELAXED);
174174
} /* }}} */

‎src/BSON/functions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ PHP_FUNCTION(MongoDB_BSON_toPHP);
2424

2525
PHP_FUNCTION(MongoDB_BSON_fromJSON);
2626
PHP_FUNCTION(MongoDB_BSON_toJSON);
27-
PHP_FUNCTION(MongoDB_BSON_toCanonicalJSON);
28-
PHP_FUNCTION(MongoDB_BSON_toRelaxedJSON);
27+
PHP_FUNCTION(MongoDB_BSON_toCanonicalExtendedJSON);
28+
PHP_FUNCTION(MongoDB_BSON_toRelaxedExtendedJSON);
2929

3030
#endif /* PHONGO_BSON_FUNCTIONS_H */
3131

‎tests/bson-corpus/array-valid-001.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $canonicalExtJson = '{"a" : []}';
1616
echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n";
1717

1818
// Canonical BSON -> Canonical extJSON
19-
echo json_canonicalize(toCanonicalJSON($canonicalBson)), "\n";
19+
echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";
2020

2121
// Canonical extJSON -> Canonical BSON
2222
echo bin2hex(fromJSON($canonicalExtJson)), "\n";

‎tests/bson-corpus/array-valid-002.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $canonicalExtJson = '{"a" : [{"$numberInt": "10"}]}';
1616
echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n";
1717

1818
// Canonical BSON -> Canonical extJSON
19-
echo json_canonicalize(toCanonicalJSON($canonicalBson)), "\n";
19+
echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";
2020

2121
// Canonical extJSON -> Canonical BSON
2222
echo bin2hex(fromJSON($canonicalExtJson)), "\n";

‎tests/bson-corpus/array-valid-003.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $canonicalExtJson = '{"a" : [{"$numberInt": "10"}]}';
1717
echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n";
1818

1919
// Canonical BSON -> Canonical extJSON
20-
echo json_canonicalize(toCanonicalJSON($canonicalBson)), "\n";
20+
echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";
2121

2222
// Canonical extJSON -> Canonical BSON
2323
echo bin2hex(fromJSON($canonicalExtJson)), "\n";
@@ -26,7 +26,7 @@ echo bin2hex(fromJSON($canonicalExtJson)), "\n";
2626
echo bin2hex(fromPHP(toPHP($degenerateBson))), "\n";
2727

2828
// Degenerate BSON -> Canonical extJSON
29-
echo json_canonicalize(toCanonicalJSON($degenerateBson)), "\n";
29+
echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n";
3030

3131
?>
3232
===DONE===

‎tests/bson-corpus/array-valid-004.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $canonicalExtJson = '{"a" : [{"$numberInt": "10"}]}';
1717
echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n";
1818

1919
// Canonical BSON -> Canonical extJSON
20-
echo json_canonicalize(toCanonicalJSON($canonicalBson)), "\n";
20+
echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";
2121

2222
// Canonical extJSON -> Canonical BSON
2323
echo bin2hex(fromJSON($canonicalExtJson)), "\n";
@@ -26,7 +26,7 @@ echo bin2hex(fromJSON($canonicalExtJson)), "\n";
2626
echo bin2hex(fromPHP(toPHP($degenerateBson))), "\n";
2727

2828
// Degenerate BSON -> Canonical extJSON
29-
echo json_canonicalize(toCanonicalJSON($degenerateBson)), "\n";
29+
echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n";
3030

3131
?>
3232
===DONE===

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "", "subType" : "00"}}}';
1616
echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n";
1717

1818
// Canonical BSON -> Canonical extJSON
19-
echo json_canonicalize(toCanonicalJSON($canonicalBson)), "\n";
19+
echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";
2020

2121
// Canonical extJSON -> Canonical BSON
2222
echo bin2hex(fromJSON($canonicalExtJson)), "\n";

‎tests/bson-corpus/binary-valid-002.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $degenerateExtJson = '{"x" : { "$binary" : {"subType" : "00", "base64" : ""}}}';
1717
echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n";
1818

1919
// Canonical BSON -> Canonical extJSON
20-
echo json_canonicalize(toCanonicalJSON($canonicalBson)), "\n";
20+
echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";
2121

2222
// Canonical extJSON -> Canonical BSON
2323
echo bin2hex(fromJSON($canonicalExtJson)), "\n";

0 commit comments

Comments
 (0)