Skip to content

Commit a6ef46a

Browse files
author
Henrik Algmark
committed
Merge branch 'php_driver_port'
2 parents 81af66c + 0aaa3c8 commit a6ef46a

4 files changed

Lines changed: 14 additions & 9 deletions

File tree

CHANGELOG.markdown

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v2.4.1-beta (Unofficial)
2+
3+
* Fixed an issue with regex based document searches.
4+
* PHP version ported to the latest PECL MongoDB driver extension, adding support for PHP7
5+
6+
17
## v2.4-beta (Unofficial)
28

39
* PHP version ported to the latest PECL MongoDB driver extension, adding support for PHP7

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4-beta
1+
2.4.1-beta

genghis.php

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

src/php/Genghis/Json.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private static function doDecode($object)
138138
$pattern = self::getProp($value, 'pattern');
139139
$flags = self::getProp($value, 'flags');
140140

141-
return new MongoRegex(sprintf('/%s/%s', $pattern, $flags));
141+
return new MongoDB\BSON\Regex($pattern, $flags);
142142

143143
// change untested, function unused
144144
// edit button for chunks as been disabled
@@ -147,7 +147,6 @@ private static function doDecode($object)
147147
$type = self::getProp($value, 'subtype');
148148

149149
return new MongoDB\BSON\Binary($data, $type);
150-
// return new MongoBinData($data, $type);
151150
}
152151
} else {
153152
foreach ($object as $prop => $value) {

0 commit comments

Comments
 (0)