From b4a786aed1341c93ca54ad517421a7c2c6b1b66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20W=C3=B3js?= <adam@wojs.pl>
Date: Mon, 6 Jul 2020 14:04:33 +0200
Subject: [PATCH 1/2] EZP-31718: Added normalizer for SimplifiedRequest

---
 .../Component/Serializer/SerializerTrait.php  |  1 +
 .../SimplifiedRequestNormalizer.php           | 36 ++++++++++++
 .../SimplifiedRequestNormalizerTest.php       | 55 +++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php
 create mode 100644 eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/SimplifiedRequestNormalizerTest.php

diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SerializerTrait.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SerializerTrait.php
index 6ea71638cc2..ba0cf330883 100644
--- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SerializerTrait.php
+++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SerializerTrait.php
@@ -20,6 +20,7 @@ public function getSerializer()
         return new Serializer(
             [
                 new CompoundMatcherNormalizer(),
+                new SimplifiedRequestNormalizer(),
                 (new PropertyNormalizer())->setIgnoredAttributes(['request', 'container', 'matcherBuilder']),
             ],
             [new JsonEncoder()]
diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php
new file mode 100644
index 00000000000..675cb26e2c2
--- /dev/null
+++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer;
+
+use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+
+final class SimplifiedRequestNormalizer implements ContextAwareNormalizerInterface
+{
+    /**
+     * @see \Symfony\Component\Serializer\Normalizer\NormalizerInterface::normalize
+     *
+     * @param \eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest $object
+     */
+    public function normalize($object, $format = null, array $context = [])
+    {
+        return [
+            'scheme' => $object->scheme,
+            'host' => $object->host,
+            'port' => $object->port,
+            'pathinfo' => $object->pathinfo,
+            'queryParams' => $object->queryParams,
+            'languages' => $object->languages,
+            'headers' => [],
+        ];
+    }
+
+    public function supportsNormalization($data, $format = null, array $context = [])
+    {
+        return $data instanceof SimplifiedRequest;
+    }
+}
diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/SimplifiedRequestNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/SimplifiedRequestNormalizerTest.php
new file mode 100644
index 00000000000..18ddbb88c73
--- /dev/null
+++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/SimplifiedRequestNormalizerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer;
+
+use eZ\Publish\Core\MVC\Symfony\Component\Serializer\SimplifiedRequestNormalizer;
+use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest;
+use PHPUnit\Framework\TestCase;
+use stdClass;
+
+final class SimplifiedRequestNormalizerTest extends TestCase
+{
+    public function testNormalize()
+    {
+        $request = new SimplifiedRequest([
+            'scheme' => 'http',
+            'host' => 'www.example.com',
+            'port' => 8080,
+            'pathinfo' => '/foo',
+            'queryParams' => ['param' => 'value', 'this' => 'that'],
+            'headers' => [
+                'Accept' => 'text/html,application/xhtml+xml',
+                'Accept-Encoding' => 'gzip, deflate, br',
+                'Accept-Language' => 'pl-PL,pl;q=0.9,en-US;q=0.8,en;q=0.7',
+                'User-Agent' => 'Mozilla/5.0',
+                'Cookie' => 'eZSESSID21232f297a57a5a743894a0e4a801fc3=mgbs2p6lv936hb5hmdd2cvq6bq',
+                'Connection' => 'keep-alive',
+            ],
+            'languages' => ['pl-PL', 'en-US'],
+        ]);
+
+        $normalizer = new SimplifiedRequestNormalizer();
+
+        $this->assertEquals([
+            'scheme' => 'http',
+            'host' => 'www.example.com',
+            'port' => 8080,
+            'pathinfo' => '/foo',
+            'queryParams' => ['param' => 'value', 'this' => 'that'],
+            'headers' => [],
+            'languages' => ['pl-PL', 'en-US'],
+        ], $normalizer->normalize($request));
+    }
+
+    public function testSupportsNormalization()
+    {
+        $normalizer = new SimplifiedRequestNormalizer();
+
+        $this->assertTrue($normalizer->supportsNormalization(new SimplifiedRequest()));
+        $this->assertFalse($normalizer->supportsNormalization(new stdClass()));
+    }
+}

From 1b8113d15d135b8e7364112daa894fa26dcfb3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20W=C3=B3js?= <adam@wojs.pl>
Date: Mon, 6 Jul 2020 15:35:37 +0200
Subject: [PATCH 2/2] fixup! EZP-31718: Added normalizer for SimplifiedRequest

---
 .../Component/Serializer/SimplifiedRequestNormalizer.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php
index 675cb26e2c2..7911f55f554 100644
--- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php
+++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php
@@ -7,9 +7,9 @@
 namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer;
 
 use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest;
-use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\PropertyNormalizer;
 
-final class SimplifiedRequestNormalizer implements ContextAwareNormalizerInterface
+final class SimplifiedRequestNormalizer extends PropertyNormalizer
 {
     /**
      * @see \Symfony\Component\Serializer\Normalizer\NormalizerInterface::normalize