Docblock and Strict Code updates

src/Illuminate/Contracts/Queue/Job.php

@@ -2,6 +2,11 @@
 
 namespace Illuminate\Contracts\Queue;
 
+/**
+ * @mixin \Illuminate\Queue\Jobs\Job
+ *
+ * @method int getJobId()
+ */
 interface Job
 {
     /**

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -22,21 +22,21 @@ trait HasRelationships
     /**
      * The loaded relationships for the model.
      *
-     * @var array
+     * @var Model[]
      */
     protected $relations = [];
 
     /**
      * The relationships that should be touched on save.
      *
-     * @var array
+     * @var string[]
      */
     protected $touches = [];
 
     /**
      * The many to many relationship methods.
      *
-     * @var array
+     * @var string[]
      */
     public static $manyMethods = [
         'belongsToMany', 'morphToMany', 'morphedByMany',
@@ -59,6 +59,7 @@ public function hasOne($related, $foreignKey = null, $localKey = null)
 
         $localKey = $localKey ?: $this->getKeyName();
 
+        /* @var Model $this */
         return new HasOne($instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey);
     }
 
@@ -82,6 +83,7 @@ public function morphOne($related, $name, $type = null, $id = null, $localKey =
 
         $localKey = $localKey ?: $this->getKeyName();
 
+        /* @var Model $this */
         return new MorphOne($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey);
     }
 
@@ -117,6 +119,7 @@ public function belongsTo($related, $foreignKey = null, $ownerKey = null, $relat
         // actually be responsible for retrieving and hydrating every relations.
         $ownerKey = $ownerKey ?: $instance->getKeyName();
 
+        /* @var Model $this */
         return new BelongsTo(
             $instance->newQuery(), $this, $foreignKey, $ownerKey, $relation
         );
@@ -159,6 +162,7 @@ public function morphTo($name = null, $type = null, $id = null)
      */
     protected function morphEagerTo($name, $type, $id)
     {
+        /* @var Model $this */
         return new MorphTo(
             $this->newQuery()->setEagerLoads([]), $this, $id, null, $type, $name
         );
@@ -179,6 +183,7 @@ protected function morphInstanceTo($target, $name, $type, $id)
             static::getActualClassNameForMorph($target)
         );
 
+        /* @var Model $this */
         return new MorphTo(
             $instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name
         );
@@ -202,9 +207,9 @@ public static function getActualClassNameForMorph($class)
      */
     protected function guessBelongsToRelation()
     {
-        list($one, $two, $caller) = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
+        $calls = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
 
-        return $caller['function'];
+        return $calls[2]['function'];
     }
 
     /**
@@ -223,6 +228,7 @@ public function hasMany($related, $foreignKey = null, $localKey = null)
 
         $localKey = $localKey ?: $this->getKeyName();
 
+        /* @var Model $this */
         return new HasMany(
             $instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey
         );
@@ -241,6 +247,8 @@ public function hasMany($related, $foreignKey = null, $localKey = null)
      */
     public function hasManyThrough($related, $through, $firstKey = null, $secondKey = null, $localKey = null, $secondLocalKey = null)
     {
+        /* @var Model $through */
+        /* @var Model $this */
         $through = new $through;
 
         $firstKey = $firstKey ?: $this->getForeignKey();
@@ -268,6 +276,7 @@ public function hasManyThrough($related, $through, $firstKey = null, $secondKey
      */
     public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
     {
+        /* @var Model $this */
         $instance = $this->newRelatedInstance($related);
 
         // Here we will gather up the morph type and ID for the relationship so that we
@@ -297,6 +306,7 @@ public function morphMany($related, $name, $type = null, $id = null, $localKey =
     public function belongsToMany($related, $table = null, $foreignPivotKey = null, $relatedPivotKey = null,
                                   $parentKey = null, $relatedKey = null, $relation = null)
     {
+        /* @var Model $this */
         // If no relationship name was passed, we will pull backtraces to get the
         // name of the calling function. We will use that function name as the
         // title of this relation since that is a great convention to apply.
@@ -344,6 +354,7 @@ public function morphToMany($related, $name, $table = null, $foreignPivotKey = n
                                 $relatedPivotKey = null, $parentKey = null,
                                 $relatedKey = null, $inverse = false)
     {
+        /* @var Model $this */
         $caller = $this->guessBelongsToManyRelation();
 
         // First, we will need to determine the foreign key and "other key" for the
@@ -503,7 +514,7 @@ public function getMorphClass()
      */
     protected function newRelatedInstance($class)
     {
-        return tap(new $class, function ($instance) {
+        return tap(new $class, function (Model $instance) {
             if (! $instance->getConnectionName()) {
                 $instance->setConnection($this->connection);
             }
@@ -559,7 +570,7 @@ public function setRelation($relation, $value)
     /**
      * Set the entire relations array on the model.
      *
-     * @param  array  $relations
+     * @param  Model[]  $relations
      * @return $this
      */
     public function setRelations(array $relations)