Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ichikaway/cakephp-mongodb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cake2.2
Choose a base ref
...
head repository: idio/cakephp-mongodb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cake2.2
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 2, 2015

  1. Fixing reading from the cursor as per https://jira.mongodb.org/browse… 

    …/PHP-1381
    @jsgriffin
    jsgriffin committed Feb 2, 2015
    Copy the full SHA
    fd30ec3 View commit details

Commits on Jul 1, 2015

  1. PHP5.6 method sig agreement

    @mal
    mal committed Jul 1, 2015
    Copy the full SHA
    2bdab67 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 Model/Datasource/MongodbSource.php
5 changes: 2 additions & 3 deletions Model/Datasource/MongodbSource.php
View file
Original file line number Diff line number Diff line change
@@ -668,7 +668,7 @@ public function distinct(&$Model, $keys = array(), $params = array()) {
* @return void
* @access public
*/
public function group($params, Model $Model = null) {
public function group($params, $Model = null) {

if (!$this->isConnected() || count($params) === 0 || $Model === null) {
return false;
@@ -1165,8 +1165,7 @@ public function read(Model $Model, $query = array(), $recursive = null) {

if (is_object($return)) {
$_return = array();
while ($return->hasNext()) {
$mongodata = $return->getNext();
foreach ($return as $mongodata) {
if ($this->config['set_string_id'] && !empty($mongodata['_id']) && is_object($mongodata['_id'])) {
$mongodata['_id'] = $mongodata['_id']->__toString();
}