From 65c55199cedd21e4c6cd6563eff3817dac8eaf34 Mon Sep 17 00:00:00 2001
From: Robin Gustafsson <robin@rgson.se>
Date: Sat, 23 Jul 2022 20:10:03 +0200
Subject: [PATCH] [8.x] Bump voku/portable-ascii to v2

Backport of #40618
---
 composer.json                              | 2 +-
 src/Illuminate/Support/composer.json       | 2 +-
 tests/Filesystem/FilesystemAdapterTest.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index ea014010f5fd..a7112f69318f 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
         "symfony/var-dumper": "^5.4",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2",
         "vlucas/phpdotenv": "^5.4.1",
-        "voku/portable-ascii": "^1.6.1"
+        "voku/portable-ascii": "^2.0"
     },
     "replace": {
         "illuminate/auth": "self.version",
diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json
index 527bdcbb8690..30b82893d7cf 100644
--- a/src/Illuminate/Support/composer.json
+++ b/src/Illuminate/Support/composer.json
@@ -22,7 +22,7 @@
         "illuminate/contracts": "^8.0",
         "illuminate/macroable": "^8.0",
         "nesbot/carbon": "^2.53.1",
-        "voku/portable-ascii": "^1.6.1"
+        "voku/portable-ascii": "^2.0"
     },
     "conflict": {
         "tightenco/collect": "<5.5.33"
diff --git a/tests/Filesystem/FilesystemAdapterTest.php b/tests/Filesystem/FilesystemAdapterTest.php
index 440c03663283..7df4223bd875 100644
--- a/tests/Filesystem/FilesystemAdapterTest.php
+++ b/tests/Filesystem/FilesystemAdapterTest.php
@@ -64,7 +64,7 @@ public function testDownloadNonAsciiFilename()
         $files = new FilesystemAdapter($this->filesystem);
         $response = $files->download('file.txt', 'пиздюк.txt');
         $this->assertInstanceOf(StreamedResponse::class, $response);
-        $this->assertSame("attachment; filename=pizdyuk.txt; filename*=utf-8''%D0%BF%D0%B8%D0%B7%D0%B4%D1%8E%D0%BA.txt", $response->headers->get('content-disposition'));
+        $this->assertSame("attachment; filename=pizdiuk.txt; filename*=utf-8''%D0%BF%D0%B8%D0%B7%D0%B4%D1%8E%D0%BA.txt", $response->headers->get('content-disposition'));
     }
 
     public function testDownloadNonAsciiEmptyFilename()
@@ -73,7 +73,7 @@ public function testDownloadNonAsciiEmptyFilename()
         $files = new FilesystemAdapter($this->filesystem);
         $response = $files->download('пиздюк.txt');
         $this->assertInstanceOf(StreamedResponse::class, $response);
-        $this->assertSame('attachment; filename=pizdyuk.txt; filename*=utf-8\'\'%D0%BF%D0%B8%D0%B7%D0%B4%D1%8E%D0%BA.txt', $response->headers->get('content-disposition'));
+        $this->assertSame('attachment; filename=pizdiuk.txt; filename*=utf-8\'\'%D0%BF%D0%B8%D0%B7%D0%B4%D1%8E%D0%BA.txt', $response->headers->get('content-disposition'));
     }
 
     public function testDownloadPercentInFilename()