From 58a7f464231606f46c093005db9ca3ec67f24c4e Mon Sep 17 00:00:00 2001
From: battye <battye@phpbb.com>
Date: Fri, 14 Jun 2019 04:04:38 +0000
Subject: [PATCH] [Serializer] Remove null check

---
 .../Component/Serializer/Encoder/CsvEncoder.php        | 10 ++--------
 .../Serializer/Tests/Encoder/CsvEncoderTest.php        |  9 ++++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
index 926eb72d1ceaa..5e353b7da27ba 100644
--- a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -196,11 +196,11 @@ private function flatten(array $array, array &$result, $keySeparator, $parentKey
 
     /**
      * Ensures an actual value is used instead of a blank value when dealing
-     * with true, false and null (like a nullable bool in a database).
+     * with true and false.
      *
      * @param string $value
      *
-     * @return string|int
+     * @return int
      */
     private function cleanValueByType($value)
     {
@@ -208,12 +208,6 @@ private function cleanValueByType($value)
             return 0;
         }
 
-        if (null === $value) {
-            // fputcsv will enclose a space
-            // https://github.com/php/php-src/blob/master/ext/standard/file.c
-            return ' ';
-        }
-
         if (true === $value) {
             return 1;
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
index a3a13f47f9edf..7b5131cb533a6 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
@@ -29,20 +29,19 @@ protected function setUp()
         $this->encoder = new CsvEncoder();
     }
 
-    public function testTrueFalseNullValues()
+    public function testTrueFalseValues()
     {
         $data = [
             'string' => 'foo',
             'int' => 2,
             'false' => false,
             'true' => true,
-            'null' => null,
         ];
 
-        // Check that true, false and null are appropriately handled
+        // Check that true and false are appropriately handled
         $this->assertEquals(<<<'CSV'
-string,int,false,true,null
-foo,2,0,1," "
+string,int,false,true
+foo,2,0,1
 
 CSV
     , $this->encoder->encode($data, 'csv'));