fixes EloquentModel trait

fixes EloquentGenerator

Author: Cyril Mizzi

src/Generator/EloquentGenerator.php

@@ -30,16 +30,16 @@ public function getResolver(Model $model) {
 			}
 
 			// Retrieve single node
-			if (array_key_exists($primary, $args)) {
-				return $builder->findOrFail($args[$primary]);
+			if (array_key_exists('id', $args)) {
+				return $builder->findOrFail($args['id']);
 			}
 
 			foreach ($args as $key => $value) {
 				switch ($key) {
-				case 'after'  : $builder->where($primary, '>', $value) ; break;
-				case 'before' : $builder->where($primary, '<', $value) ; break;
-				case 'skip'   : $builder->skip($value)                 ; break;
-				case 'take'   : $builder->take($value)                 ; break;
+				case 'after'  : $builder = $builder->where($primary, '>', $value) ; break;
+				case 'before' : $builder = $builder->where($primary, '<', $value) ; break;
+				case 'skip'   : $builder = $builder->skip($value)                 ; break;
+				case 'take'   : $builder = $builder->take($value)                 ; break;
 				}
 			}
 

src/Traits/EloquentModel.php

@@ -16,12 +16,7 @@ trait EloquentModel {
 	 * @return array
 	 */
 	public function getRelationship() {
-		static $relations = [];
-
-		if (!empty($relations)) {
-			return $relations;
-		}
-
+		$relations  = [];
 		$reflection = new ReflectionClass($this);
 		$traits     = $reflection->getTraits();
 		$exclude    = [];
@@ -83,12 +78,7 @@ public function getRelationship() {
 	 * @return array
 	 */
 	public function getColumns() {
-		static $data = [];
-
-		if (!empty($data)) {
-			return $data;
-		}
-
+		$data       = [];
 		$table      = $this->getTable();
 		$connection = $this->getConnection();
 		$primary    = $this->getKeyName();