[Serializer] Remove null check

battye · battye · commit 58a7f4642316 · 2019-06-14T04:04:38.000Z
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -196,24 +196,18 @@ 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)
     {
         if (false === $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
@@ -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'));

Original file line number	Diff line number	Diff line change
`@@ -196,24 +196,18 @@ private function flatten(array $array, array &$result, $keySeparator, $parentKey`
`196`	`196`
`197`	`197`	`/**`
`198`	`198`	`* Ensures an actual value is used instead of a blank value when dealing`
`199`		`- * with true, false and null (like a nullable bool in a database).`
	`199`	`+ * with true and false.`
`200`	`200`	`*`
`201`	`201`	`* @param string $value`
`202`	`202`	`*`
`203`		`- * @return string\|int`
	`203`	`+ * @return int`
`204`	`204`	`*/`
205	`205`	`private function cleanValueByType($value)`
`206`	`206`	`{`
`207`	`207`	`if (false === $value) {`
`208`	`208`	`return 0;`
`209`	`209`	`}`
`210`	`210`
`211`		`- if (null === $value) {`
`212`		`- // fputcsv will enclose a space`
`213`		`- // https://github.com/php/php-src/blob/master/ext/standard/file.c`
`214`		`- return ' ';`
`215`		`- }`
`216`		`-`
`217`	`211`	`if (true === $value) {`
`218`	`212`	`return 1;`
`219`	`213`	`}`