[HttpFoundation] Add a dependency on the mbstring polyfill

jakzal · nicolas-grekas · commit 59b9f156a9a8 · 2016-03-07T14:08:49.000+01:00
diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
         "doctrine/common": "~2.4",
         "paragonie/random_compat": "~1.0",
         "symfony/polyfill-apcu": "~1.1",
+        "symfony/polyfill-mbstring": "~1.1",
         "twig/twig": "~1.23|~2.0",
         "psr/log": "~1.0"
     },
diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
@@ -36,7 +36,13 @@ public function testConstruction()
 
     public function testConstructWithNonAsciiFilename()
     {
-        new BinaryFileResponse(__DIR__.'/Fixtures/föö.html', 200, array(), true, 'attachment');
+        touch(sys_get_temp_dir().'/fööö.html');
+
+        $response = new BinaryFileResponse(sys_get_temp_dir().'/fööö.html', 200, array(), true, 'attachment');
+
+        @unlink(sys_get_temp_dir().'/fööö.html');
+
+        $this->assertSame('fööö.html', $response->getFile()->getFilename());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Fixtures/föö.html b/src/Symfony/Component/HttpFoundation/Tests/Fixtures/föö.html
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.3",
+        "symfony/polyfill-mbstring": "~1.1"
     },
     "autoload": {
         "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" },

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,13 @@ public function testConstruction()`
`36`	`36`
`37`	`37`	`public function testConstructWithNonAsciiFilename()`
`38`	`38`	`{`
`39`		`- new BinaryFileResponse(__DIR__.'/Fixtures/föö.html', 200, array(), true, 'attachment');`
	`39`	`+ touch(sys_get_temp_dir().'/fööö.html');`
	`40`	`+`
	`41`	`+ $response = new BinaryFileResponse(sys_get_temp_dir().'/fööö.html', 200, array(), true, 'attachment');`
	`42`	`+`
	`43`	`+ @unlink(sys_get_temp_dir().'/fööö.html');`
	`44`	`+`
	`45`	`+ $this->assertSame('fööö.html', $response->getFile()->getFilename());`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`/**`