Merge pull request #930 from pi0/UnitTests

5.3 UnitTests

Author: jenssegers

.travis.yml

@@ -1,15 +1,11 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7
-  - hhvm
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: hhvm
 
 sudo: false
 
@@ -35,4 +31,4 @@ script:
   - 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;'
+  - sh -c 'php vendor/bin/coveralls -v'

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Support\Collection;
 use MongoDB\Driver\Cursor;
 use MongoDB\Model\BSONDocument;
 
@@ -167,9 +168,10 @@ protected function addHasWhere(EloquentBuilder $hasQuery, Relation $relation, $o
         $query = $hasQuery->getQuery();
 
         // Get the number of related objects for each possible parent.
+        $relations = $query->pluck($relation->getHasCompareKey());
         $relationCount = array_count_values(array_map(function ($id) {
             return (string) $id; // Convert Back ObjectIds to Strings
-        }, $query->pluck($relation->getHasCompareKey())));
+        }, is_array($relations) ? $relations : $relations->toArray()));
 
         // Remove unwanted related objects based on the operator and count.
         $relationCount = array_filter($relationCount, function ($counted) use ($count, $operator) {

src/Jenssegers/Mongodb/Eloquent/Model.php

@@ -244,6 +244,18 @@ public function getAttribute($key)
                     // Get the relation results.
                     return $this->getRelationshipFromMethod($key, $camelKey);
                 }
+
+                if ($relations instanceof Relation) {
+                    // If the key already exists in the relationships array, it just means the
+                    // relationship has already been loaded, so we'll just return it out of
+                    // here because there is no need to query within the relations twice.
+                    if (array_key_exists($key, $this->relations) && $this->relations[$key] != null) {
+                        return $this->relations[$key];
+                    }
+
+                    // Get the relation results.
+                    return $this->getRelationshipFromMethod($key, $camelKey);
+                }
             }
         }
 

src/Jenssegers/Mongodb/Query/Builder.php

@@ -577,7 +577,16 @@ public function pluck($column, $key = null)
     {
         $results = $this->get(is_null($key) ? [$column] : [$column, $key]);
 
-        return $this->useCollections ? $results->pluck($column, $key) : Arr::pluck($results, $column, $key);
+        // Convert ObjectID's to strings
+        if ($key == '_id') {
+            $results = $results->map(function ($item) {
+                $item['_id'] = (string) $item['_id'];
+                return $item;
+            });
+        }
+
+        $p = Arr::pluck($results, $column, $key);
+        return $this->useCollections ? new Collection($p) : $p;
     }
 
     /**
@@ -632,20 +641,7 @@ public function truncate()
      */
     public function lists($column, $key = null)
     {
-        if ($key == '_id') {
-            $results = new Collection($this->get([$column, $key]));
-
-            // Convert ObjectID's to strings so that lists can do its work.
-            $results = $results->map(function ($item) {
-                $item['_id'] = (string) $item['_id'];
-
-                return $item;
-            });
-
-            return $results->pluck($column, $key)->all();
-        }
-
-        return parent::pluck($column, $key);
+        return $this->pluck($column, $key);
     }
 
     /**

src/Jenssegers/Mongodb/Queue/MongoQueue.php

@@ -79,12 +79,21 @@ protected function getNextAvailableJobAndReserve($queue)
      */
     protected function releaseJobsThatHaveBeenReservedTooLong($queue)
     {
-        $expired = Carbon::now()->subSeconds($this->expire)->getTimestamp();
+        $expiration = Carbon::now()->subSeconds($this->expire)->getTimestamp();
+        $now = time();
 
         $reserved = $this->database->collection($this->table)
             ->where('queue', $this->getQueue($queue))
-            ->where('reserved', 1)
-            ->where('reserved_at', '<=', $expired)->get();
+            ->where(function ($query) use ($expiration, $now) {
+                // Check for available jobs
+                $query->where(function ($query) use ($now) {
+                    $query->whereNull('reserved_at');
+                    $query->where('available_at', '<=', $now);
+                });
+
+                // Check for jobs that are reserved but have expired
+                $query->orWhere('reserved_at', '<=', $expiration);
+            })->get();
 
         foreach ($reserved as $job) {
             $attempts = $job['attempts'] + 1;

src/Jenssegers/Mongodb/Relations/BelongsToMany.php

@@ -286,4 +286,24 @@ public function getForeignKey()
     {
         return $this->foreignKey;
     }
+
+    /**
+     * Format the sync list so that it is keyed by ID. (Legacy Support)
+     * The original function has been renamed to formatRecordsList since Laravel 5.3
+     *
+     * @deprecated
+     * @param  array  $records
+     * @return array
+     */
+    protected function formatSyncList(array $records)
+    {
+        $results = [];
+        foreach ($records as $id => $attributes) {
+            if (! is_array($attributes)) {
+                list($id, $attributes) = [$attributes, []];
+            }
+            $results[$id] = $attributes;
+        }
+        return $results;
+    }
 }

src/Jenssegers/Mongodb/Schema/Blueprint.php

@@ -44,9 +44,11 @@ public function __construct(Connection $connection, $collection)
      *
      * @param  string|array  $columns
      * @param  array         $options
+     * @param  string  $name
+     * @param  string|null  $algorithm
      * @return Blueprint
      */
-    public function index($columns = null, $options = [])
+    public function index($columns = null, $name = null, $algorithm = null, $options = [])
     {
         $columns = $this->fluent($columns);
 
@@ -71,10 +73,12 @@ public function index($columns = null, $options = [])
      * Specify the primary key(s) for the table.
      *
      * @param  string|array  $columns
+     * @param  string  $name
+     * @param  string|null  $algorithm
      * @param  array         $options
      * @return \Illuminate\Support\Fluent
      */
-    public function primary($columns = null, $options = [])
+    public function primary($columns = null, $name = null, $algorithm = null, $options = [])
     {
         return $this->unique($columns, $options);
     }
@@ -112,16 +116,18 @@ public function dropIndex($columns = null)
      * Specify a unique index for the collection.
      *
      * @param  string|array  $columns
+     * @param  string  $name
+     * @param  string|null  $algorithm
      * @param  array         $options
      * @return Blueprint
      */
-    public function unique($columns = null, $options = [])
+    public function unique($columns = null, $name = null, $algorithm = null, $options = [])
     {
         $columns = $this->fluent($columns);
 
         $options['unique'] = true;
 
-        $this->index($columns, $options);
+        $this->index($columns, null, null, $options);
 
         return $this;
     }
@@ -136,7 +142,7 @@ public function background($columns = null)
     {
         $columns = $this->fluent($columns);
 
-        $this->index($columns, ['background' => true]);
+        $this->index($columns, null, null, ['background' => true]);
 
         return $this;
     }
@@ -154,7 +160,7 @@ public function sparse($columns = null, $options = [])
 
         $options['sparse'] = true;
 
-        $this->index($columns, $options);
+        $this->index($columns, null, null, $options);
 
         return $this;
     }
@@ -171,7 +177,7 @@ public function expire($columns, $seconds)
     {
         $columns = $this->fluent($columns);
 
-        $this->index($columns, ['expireAfterSeconds' => $seconds]);
+        $this->index($columns, null, null, ['expireAfterSeconds' => $seconds]);
 
         return $this;
     }