From b8c0ba1c71095882d43d9650538b395faf3f435e Mon Sep 17 00:00:00 2001
From: Abed Halawi <halawi.abed@gmail.com>
Date: Sun, 22 Feb 2015 20:09:12 +0200
Subject: [PATCH] mark overridden methods

---
 composer.json                                       |  4 ++--
 src/Vinelab/NeoEloquent/Eloquent/Model.php          | 13 +++++++++++++
 .../NeoEloquent/Eloquent/SoftDeletingTrait.php      |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 04bc4097..31c8c6ba 100644
--- a/composer.json
+++ b/composer.json
@@ -11,8 +11,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "4.2.*",
-        "illuminate/database": "4.2.*",
+        "illuminate/support": "5.*",
+        "illuminate/database": "5.*",
         "vinelab/neo4jphp": "0.1.*",
         "nesbot/carbon": "~1.0"
     },
diff --git a/src/Vinelab/NeoEloquent/Eloquent/Model.php b/src/Vinelab/NeoEloquent/Eloquent/Model.php
index f38ee3bd..78f51721 100644
--- a/src/Vinelab/NeoEloquent/Eloquent/Model.php
+++ b/src/Vinelab/NeoEloquent/Eloquent/Model.php
@@ -32,6 +32,7 @@ public function setLabel($label)
     }
 
     /**
+     * @override
      * Create a new Eloquent query builder for the model.
      *
      * @param  Vinelab\NeoEloquent\Query\Builder $query
@@ -43,6 +44,7 @@ public function newEloquentBuilder($query)
     }
 
     /**
+     * @override
 	 * Get a new query builder instance for the connection.
 	 *
 	 * @return Vinelab\NeoEloquent\Query\Builder
@@ -57,6 +59,7 @@ protected function newBaseQueryBuilder()
 	}
 
     /**
+     * @override
 	 * Get the format for database stored dates.
 	 *
 	 * @return string
@@ -101,6 +104,7 @@ public function getDefaultNodeLabel()
     }
 
     /**
+     * @override
 	 * Get the table associated with the model.
 	 *
 	 * @return string
@@ -111,6 +115,7 @@ public function getTable()
 	}
 
     /**
+     * @override
      * Define an inverse one-to-one or many relationship.
      *
      * @param  string  $related
@@ -152,6 +157,7 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
     }
 
     /**
+     * @override
      * Define a one-to-one relationship.
      *
      * @param  string  $related
@@ -192,6 +198,7 @@ public function hasOne($related, $foreignKey = null, $otherKey = null, $relation
     }
 
     /**
+     * @override
      * Define a one-to-many relationship.
      *
      * @param  string  $related
@@ -222,6 +229,7 @@ public function hasMany($related, $type = null, $key = null, $relation = null)
     }
 
     /**
+     * @override
      * Define a many-to-many relationship.
      *
      * @param  string  $related
@@ -271,6 +279,7 @@ public function belongsToMany($related, $table = null, $foreignKey = null, $othe
     }
 
     /**
+     * @override
      * Create a new HyperMorph relationship.
      *
      * @param  \Vinelab\NeoEloquent\Eloquent\Model  $model
@@ -315,6 +324,7 @@ public function hyperMorph($model, $related, $type = null, $morphType = null, $r
     }
 
     /**
+     * @override
      * Define a many-to-many relationship.
      *
      * @param  string  $related
@@ -365,6 +375,7 @@ public function morphMany($related, $name, $type = null, $id = null, $localKey =
     }
 
     /**
+     * @override
      * Create an inverse one-to-one polymorphic relationship with specified model and relation.
      *
      * @param  \Vinelab\NeoEloquent\Eloquent\Model $related
@@ -407,6 +418,7 @@ public function morphedByOne($related, $type, $key = null, $relation = null)
     }
 
     /**
+     * @override
      * Define a polymorphic, inverse one-to-one or many relationship.
      *
      * @param  string  $name
@@ -487,6 +499,7 @@ protected function getMorphs($name, $type, $id)
     }
 
     /**
+     * @override
      * Get the table qualified key name.
      *
      * @return string
diff --git a/src/Vinelab/NeoEloquent/Eloquent/SoftDeletingTrait.php b/src/Vinelab/NeoEloquent/Eloquent/SoftDeletingTrait.php
index f83742ff..a3e2a299 100644
--- a/src/Vinelab/NeoEloquent/Eloquent/SoftDeletingTrait.php
+++ b/src/Vinelab/NeoEloquent/Eloquent/SoftDeletingTrait.php
@@ -1,6 +1,6 @@
 <?php namespace Vinelab\NeoEloquent\Eloquent;
 
-use Illuminate\Database\Eloquent\SoftDeletingTrait as IlluminateSoftDeletingTrait;
+use Illuminate\Database\Eloquent\SoftDeletes as IlluminateSoftDeletingTrait;
 
 trait SoftDeletingTrait {