Merge branch '2.3'

Author: dunglas

client-generator/images/demo.gif renamed to client-generator/images/client-generator-demo.gif

@@ -2,7 +2,7 @@
 
 Client Generator is the fastest way to scaffold fully-featured webapps and native mobile apps from APIs supporting the [Hydra](http://www.hydra-cg.com/) format.
 
-![Screencast](images/demo.gif)
+![Screencast](images/client-generator-demo.gif)
 
 *Generated React and React Native apps, updated in real time* 
 

client-generator/images/react-native/add.png renamed to client-generator/images/react-native/client-generator-react-native-add.png

@@ -1,6 +1,6 @@
 # React Native generator
 
-![List](images/list.png) 
+![List](images/react-native/client-generator-react-native-list.png) 
 
 ## Install
 
@@ -106,5 +106,5 @@ $ expo start
 
 ## Screenshots in iOS Simulator
 
-![List](images/react-native/list.png) ![Show](images/react-native/show.png)
-![Add](images/react-native/add.png) ![Delete](images/react-native/delete.png)
+![List](images/react-native/client-generator-react-native-list.png) ![Show](images/react-native/client-generator-react-native-show.png)
+![Add](images/react-native/client-generator-react-native-add.png) ![Delete](images/react-native/client-generator-react-native-delete.png)

client-generator/images/react-native/delete.png renamed to client-generator/images/react-native/client-generator-react-native-delete.png

@@ -1,6 +1,6 @@
 # React Generator
 
-![List screenshot](images/react/list.png)
+![List screenshot](images/react/client-generator-react-list.png)
 
 The React Client Generator generates a Progressive Web App built with battle-tested libraries from the ecosystem:
 
@@ -123,8 +123,8 @@ That's all!
 
 ## Screenshots
 
-![List](images/react/list.png)
-![Pagination](images/react/list-pagination.png)
-![Show](images/react/show.png)
-![Edit](images/react/edit.png)
-![Delete](images/react/delete.png)
+![List](images/react/client-generator-react-list.png)
+![Pagination](images/react/client-generator-react-list-pagination.png)
+![Show](images/react/client-generator-react-show.png)
+![Edit](images/react/client-generator-react-edit.png)
+![Delete](images/react/client-generator-react-delete.png)

client-generator/images/react-native/list.png renamed to client-generator/images/react-native/client-generator-react-native-list.png

@@ -438,7 +438,7 @@ services:
 ```
 
 The Normalizer class is a bit harder to understand, because it must ensure that it is only called once and that there is no recursion. 
-To accomplish this, it needs to be aware of the Serializer instance itself.
+To accomplish this, it needs to be aware of the parent Normalizer instance itself.
 
 Here is an example:
 
@@ -450,15 +450,15 @@ namespace App\Serializer;
 
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Serializer\SerializerAwareInterface;
-use Symfony\Component\Serializer\SerializerAwareTrait;
 
-class BookAttributeNormalizer implements ContextAwareNormalizerInterface, SerializerAwareInterface
+class BookAttributeNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
-    use SerializerAwareTrait;
+    use NormalizerAwareTrait;
 
-    private const BOOK_ATTRIBUTE_NORMALIZER_ALREADY_CALLED = 'BOOK_ATTRIBUTE_NORMALIZER_ALREADY_CALLED';
+    private const ALREADY_CALLED = 'BOOK_ATTRIBUTE_NORMALIZER_ALREADY_CALLED';
 
     private $tokenStorage;
 
@@ -473,13 +473,15 @@ class BookAttributeNormalizer implements ContextAwareNormalizerInterface, Serial
             $context['groups'][] = 'can_retrieve_book';
         }
 
-        return $this->passOn($object, $format, $context);
+        $context[self::ALREADY_CALLED] = true;
+
+        return $this->normalizer->normalize($object, $format, $context);
     }
     
     public function supportsNormalization($data, $format = null, array $context = [])
     {
         // Make sure we're not called twice
-        if (isset($context[self::BOOK_ATTRIBUTE_NORMALIZER_ALREADY_CALLED])) {
+        if (isset($context[self::ALREADY_CALLED])) {
             return false;
         }
 
@@ -492,17 +494,6 @@ class BookAttributeNormalizer implements ContextAwareNormalizerInterface, Serial
         // for the current $object (book) and
         // return true or false
     }
-
-    private function passOn($object, $format = null, array $context = [])
-    {
-        if (!$this->serializer instanceof NormalizerInterface) {
-            throw new \LogicException(sprintf('Cannot normalize object "%s" because the injected serializer is not a normalizer', $object));
-        }
-
-        $context[self::BOOK_ATTRIBUTE_NORMALIZER_ALREADY_CALLED] = true;
-
-        return $this->serializer->normalize($object, $format, $context);
-    }
 }
 ```