Merge pull request #704 from WillSkates/pecl-mongodb

[Ready] Fixing incompatabilities and upgrading to work with php7.

Author: jenssegers

.travis.yml

@@ -3,7 +3,7 @@ language: php
 php:
   - 5.5
   - 5.6
-  - 7.0
+  - 7
   - hhvm
 
 matrix:
@@ -13,7 +13,16 @@ matrix:
 
 sudo: false
 
-services: mongodb
+services:
+  - mongodb
+  - mysql
+
+addons:
+  apt:
+    sources:
+    - mongodb-3.0-precise
+    packages:
+    - mongodb-org-server
 
 before_script:
   - pecl install mongodb
@@ -23,7 +32,7 @@ before_script:
 
 script:
   - mkdir -p build/logs
-  - phpunit --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
 after_success:
   - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php vendor/bin/coveralls -v; fi;'

composer.json

@@ -15,12 +15,12 @@
         "illuminate/container": "^5.1",
         "illuminate/database": "^5.1",
         "illuminate/events": "^5.1",
-        "mongodb/mongodb": "^1.0.0@beta"
+        "mongodb/mongodb": "^1.0.0"
 
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0|^5.0",
-        "orchestra/testbench": "^3.2",
+        "orchestra/testbench": "^3.1",
         "mockery/mockery": "^0.9",
         "satooshi/php-coveralls": "^0.6"
     },

phpunit.xml

@@ -9,6 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
+         verbose="true"
 >
     <testsuites>
         <testsuite name="all">

src/Jenssegers/Mongodb/Collection.php

@@ -39,7 +39,7 @@ public function __call($method, $parameters)
     {
         $start = microtime(true);
         $result = call_user_func_array([$this->collection, $method], $parameters);
-
+        
         if ($this->connection->logging())
         {
             // Once we have run the query we will calculate the time that it took to run and

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -3,6 +3,7 @@
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use MongoDB\Driver\Cursor;
+use MongoDB\Model\BSONDocument;
 
 class Builder extends EloquentBuilder {
 
@@ -221,18 +222,20 @@ public function raw($expression = null)
         if ($results instanceof Cursor)
         {
             $results = iterator_to_array($results, false);
-
             return $this->model->hydrate($results);
         }
 
+        // Convert Mongo BSONDocument to a single object.
+        elseif ($results instanceof BSONDocument)
+        {
+            $results = $results->getArrayCopy();
+            return $this->model->newFromBuilder((array) $results);
+        }
+
         // The result is a single object.
         elseif (is_array($results) and array_key_exists('_id', $results))
         {
-            $model = $this->model->newFromBuilder((array) $results);
-
-            $model->setConnection($this->model->getConnection());
-
-            return $model;
+            return $this->model->newFromBuilder((array) $results);
         }
 
         return $results;

src/Jenssegers/Mongodb/Model.php

@@ -360,7 +360,7 @@ public function attributesToArray()
      *
      * @return array
      */
-    protected function getCasts()
+    public function getCasts()
     {
         return $this->casts;
     }

src/Jenssegers/Mongodb/Query/Builder.php

@@ -85,6 +85,7 @@ class Builder extends BaseBuilder {
      */
     public function __construct(Connection $connection, Processor $processor)
     {
+        $this->grammar = new Grammar;
         $this->connection = $connection;
         $this->processor = $processor;
     }

src/Jenssegers/Mongodb/Query/Grammar.php

@@ -0,0 +1,7 @@
+<?php namespace Jenssegers\Mongodb\Query;
+
+use Illuminate\Database\Query\Grammars\Grammar as BaseGrammar;
+
+class Grammar extends BaseGrammar {
+
+}

src/Jenssegers/Mongodb/Relations/HasMany.php

@@ -19,6 +19,21 @@ public function getRelationCountQuery(Builder $query, Builder $parent)
         return $query->select($this->getHasCompareKey())->where($this->getHasCompareKey(), 'exists', true);
     }
 
+    /**
+     * Add the constraints for a relationship query.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $parent
+     * @param  array|mixed $columns
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*'])
+    {
+        $query->select($columns);
+        $key = $this->wrap($this->getQualifiedParentKeyName());
+        return $query->where($this->getHasCompareKey(), 'exists', true);
+    }
+
     /**
      * Get the plain foreign key.
      *

src/Jenssegers/Mongodb/Relations/HasOne.php

@@ -19,6 +19,21 @@ public function getRelationCountQuery(Builder $query, Builder $parent)
         return $query->select($this->getHasCompareKey())->where($this->getHasCompareKey(), 'exists', true);
     }
 
+    /**
+     * Add the constraints for a relationship query.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $parent
+     * @param  array|mixed $columns
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*'])
+    {
+        $query->select($columns);
+        $key = $this->wrap($this->getQualifiedParentKeyName());
+        return $query->where($this->getHasCompareKey(), 'exists', true);
+    }
+
     /**
      * Get the plain foreign key.
      *