Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 2f65991a9dfa · 2020-07-06T15:18:39.000+02:00
* 3.4:
  [Process] Fix Permission Denied error when writing sf_proc_00 lock files on Windows
  fix handling null as empty data
  No need to create an issue when creating a PR
  [Console] Fixes question input encoding on Windows
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,7 @@
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
-| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", if any -->
+| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
 | License       | MIT
 | Doc PR        | symfony/symfony-docs#... <!-- required for new features -->
 <!--
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -108,6 +108,11 @@ private function doAsk(OutputInterface $output, Question $question)
         $inputStream = $this->inputStream ?: STDIN;
         $autocomplete = $question->getAutocompleterCallback();
 
+        if (\function_exists('sapi_windows_cp_set')) {
+            // Codepage used by cmd.exe on Windows to allow special characters (éàüñ).
+            sapi_windows_cp_set(1252);
+        }
+
         if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
             $ret = false;
             if ($question->isHidden()) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -140,11 +140,11 @@ public function transform($value)
      */
     public function reverseTransform($value)
     {
-        if (!\is_string($value)) {
+        if (null !== $value && !\is_string($value)) {
             throw new TransformationFailedException('Expected a string.');
         }
 
-        if ('' === $value) {
+        if (null === $value || '' === $value) {
             return null;
         }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -130,6 +130,21 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = '10', $expectedD
         $this->assertSame($expectedData, $form->getData());
     }
 
+    public function testSubmitNullWithEmptyDataSetToNull()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'empty_data' => null,
+        ]);
+        $form->submit(null);
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertTrue($form->isSynchronized());
+        $this->assertTrue($form->isValid());
+        $this->assertSame('', $form->getViewData());
+        $this->assertNull($form->getNormData());
+        $this->assertNull($form->getData());
+    }
+
     public function testSubmitNumericInput(): void
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'number']);
diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -56,6 +56,9 @@ public function __construct($input, bool $haveReadSupport)
                     $file = sprintf('%s\\sf_proc_%02X.%s', $tmpDir, $i, $name);
 
                     if (!$h = fopen($file.'.lock', 'w')) {
+                        if (file_exists($file.'.lock')) {
+                            continue 2;
+                        }
                         restore_error_handler();
                         throw new RuntimeException('A temporary file could not be opened to write the process output: '.$lastError);
                     }

Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,11 @@ public function transform($value)`
`140`	`140`	`*/`
`141`	`141`	`public function reverseTransform($value)`
`142`	`142`	`{`
`143`		`- if (!\is_string($value)) {`
	`143`	`+ if (null !== $value && !\is_string($value)) {`
`144`	`144`	`throw new TransformationFailedException('Expected a string.');`
`145`	`145`	`}`
`146`	`146`
`147`		`- if ('' === $value) {`
	`147`	`+ if (null === $value \|\| '' === $value) {`
`148`	`148`	`return null;`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ public function __construct($input, bool $haveReadSupport)`
`56`	`56`	`$file = sprintf('%s\\sf_proc_%02X.%s', $tmpDir, $i, $name);`
`57`	`57`
`58`	`58`	`if (!$h = fopen($file.'.lock', 'w')) {`
	`59`	`+ if (file_exists($file.'.lock')) {`
	`60`	`+ continue 2;`
	`61`	`+ }`
`59`	`62`	`restore_error_handler();`
`60`	`63`	`throw new RuntimeException('A temporary file could not be opened to write the process output: '.$lastError);`
`61`	`64`	`}`