Merge branch '0.5.1-dev'

Author: marcelgwerder

README.md

@@ -11,7 +11,7 @@ Install the package through composer by adding it to your `composer.json` file:
 
 ```
 "require": {
-    "marcelgwerder/laravel-api-handler": "dev-master"
+    "marcelgwerder/laravel-api-handler": "~0.5.1"
 }
 ```
 Then run `composer update`. Once composer finished add the service provider to the `providers` array in `app/config/app.php`:

src/Parser.php

@@ -1,5 +1,7 @@
 <?php namespace Marcelgwerder\ApiHandler;
 
+use \Illuminate\Database\Eloquent\Relations\HasManyThrough;
+use \Illuminate\Database\Eloquent\Relations\HasOne;
 use \Illuminate\Database\Eloquent\Relations\HasMany;
 use \Illuminate\Database\Eloquent\Relations\BelongsTo;
 use \Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -407,47 +409,46 @@ protected function parseWith($withParam)
 				$model = $relation->getModel();
 				$relationType = $this->getRelationType($relation);
 
-				//Preserve backwards compatibility
-				if(method_exists($relation , 'getQualifiedOtherKeyName') && method_exists($relation , 'getQualifiedForeignKey')) 
+				if($relationType === 'HasManyThrough') 
 				{
-					$primaryKey = $relation->getOtherKey();
-					$foreignKey = $relation->getQualifiedForeignKey();
-				} 
+					$firstKey = $model->getKeyName();
+					$secondKey = null;
+				}
 				else 
 				{
 					$primaryKey = $model->getKeyName();
 					$foreignKey = $relation->getForeignKey();
 				}
 
 				//Switch keys according to the type of relationship
-				if($relationType == 'HasMany')
+				if($relationType === 'HasOne' || $relationType === 'HasMany' || $relationType === 'BelongsToMany')
 				{
 					$firstKey = $primaryKey;
 					$secondKey = $foreignKey;
 				}
-				else if($relationType == 'BelongsTo')
+				else if($relationType === 'BelongsTo')
 				{
 					$firstKey = $foreignKey;
 					$secondKey = $primaryKey;
 				} 
-		
+
 				//Check if we're on level 1 (e.g. a and not a.b)
-				if($previousHistoryPath == '')
+				if($firstKey !== null && $previousHistoryPath == '')
 				{
 					if($fieldsCount > 0 && !in_array($primaryKey, $fields))
 					{
 						$fields[] = $firstKey;
 					}
 				}
-				else 
+				else if($firstKey !== null)
 				{
 					if(count($withHistory[$previousHistoryPath]['fields']) > 0 && !in_array($firstKey, $withHistory[$previousHistoryPath]['fields']))
 					{
 						$withHistory[$previousHistoryPath]['fields'][] = $firstKey;
 					}
 				}
 
-				if(count($withHistory[$currentHistoryPath]['fields']) > 0 && !in_array($secondKey, $withHistory[$currentHistoryPath]['fields']))
+				if($secondKey !== null && count($withHistory[$currentHistoryPath]['fields']) > 0 && !in_array($secondKey, $withHistory[$currentHistoryPath]['fields']))
 				{
 					$withHistory[$currentHistoryPath]['fields'][] = $secondKey;
 				}
@@ -473,7 +474,7 @@ protected function parseWith($withParam)
 				}, $withHistory[$withHistoryKey]['fields']);
 
 				if(count($fields) > 0 && is_array($fields))
-				{
+				{	
 					$query->select($fields);
 				}
 
@@ -722,6 +723,11 @@ protected function parseConfig($configParam)
 	 */
 	protected function getRelationType($relation)
 	{
+		if($relation instanceof HasOne) 
+		{
+			return 'HasOne';
+		}
+
 		if($relation instanceof HasMany)
 		{
 			return 'HasMany';
@@ -736,6 +742,11 @@ protected function getRelationType($relation)
 		{
 			return 'BelongsToMany';
 		}
+
+		if($relation instanceof HasManyThrough)
+		{
+			return 'HasManyThrough';
+		}
 	}
 
 	/**