From 4fe00f52b8029a58e9f31d7b84b1fd8f29f56024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sun, 17 Jul 2016 00:50:22 +0200
Subject: [PATCH] More quality fixes

---
 src/Action/ExceptionAction.php                    |  6 +++---
 src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php | 11 ++++-------
 src/Hal/Serializer/ItemNormalizer.php             |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Action/ExceptionAction.php b/src/Action/ExceptionAction.php
index b0a8a297155..7b4d760b3ea 100644
--- a/src/Action/ExceptionAction.php
+++ b/src/Action/ExceptionAction.php
@@ -46,12 +46,12 @@ public function __construct(SerializerInterface $serializer, array $errorFormats
     /**
      * Converts a an exception to a JSON response.
      *
-     * @param \Exception|FlattenException $exception
-     * @param Request                     $request
+     * @param FlattenException $exception
+     * @param Request          $request
      *
      * @return Response
      */
-    public function __invoke($exception, Request $request) : Response
+    public function __invoke(FlattenException $exception, Request $request) : Response
     {
         $exceptionClass = $exception->getClass();
         foreach ($this->exceptionToStatus as $class => $status) {
diff --git a/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php b/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php
index 1e8fccf6330..53444d1ae3a 100644
--- a/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php
+++ b/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php
@@ -192,11 +192,6 @@ protected function extractProperties(Request $request) : array
     protected function addJoinsForNestedProperty(string $property, string $rootAlias, QueryBuilder $queryBuilder) : array
     {
         $propertyParts = $this->splitPropertyParts($property);
-
-        if (0 === count($propertyParts['associations'])) {
-            throw new InvalidArgumentException(sprintf('Cannot add joins for property "%s" - property is not nested.', $property));
-        }
-
         $parentAlias = $rootAlias;
 
         foreach ($propertyParts['associations'] as $association) {
@@ -205,8 +200,10 @@ protected function addJoinsForNestedProperty(string $property, string $rootAlias
             $parentAlias = $alias;
         }
 
-        $field = $propertyParts['field'];
+        if (!isset($alias)) {
+            throw new InvalidArgumentException(sprintf('Cannot add joins for property "%s" - property is not nested.', $property));
+        }
 
-        return [$alias, $field];
+        return [$alias, $propertyParts['field']];
     }
 }
diff --git a/src/Hal/Serializer/ItemNormalizer.php b/src/Hal/Serializer/ItemNormalizer.php
index 1bff738960e..5a1377b3199 100644
--- a/src/Hal/Serializer/ItemNormalizer.php
+++ b/src/Hal/Serializer/ItemNormalizer.php
@@ -56,7 +56,7 @@ public function supportsNormalization($data, $format = null)
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        $context['cache_key'] = $this->getCacheKey($format, $context);
+        $context['cache_key'] = $this->getHalCacheKey($format, $context);
 
         $rawData = parent::normalize($object, $format, $context);
         if (!is_array($rawData)) {
@@ -217,7 +217,7 @@ private function getRelationIri($rel) : string
      *
      * @return bool|string
      */
-    private function getCacheKey(string $format = null, array $context)
+    private function getHalCacheKey(string $format = null, array $context)
     {
         try {
             return md5($format.serialize($context));