From 855adfd8a378af0b2ed0bf9e76b2c79c6167b527 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 10 Jan 2023 10:46:20 -0500
Subject: [PATCH 1/2] Upgrading to voku/portable-ascii 2.0

---
 composer.json                                | 2 +-
 src/mantle/support/composer.json             | 2 +-
 tests/filesystem/test-filesystem-adapter.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index b6775dae6..da89a5614 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "symfony/string": "^6.0",
         "symfony/var-dumper": "^6.0",
         "vlucas/phpdotenv": "^5.5",
-        "voku/portable-ascii": "^1.4"
+        "voku/portable-ascii": "^2.0"
     },
     "require-dev": {
         "alleyinteractive/alley-coding-standards": "^0.3 || ^0.4 || ^1.0",
diff --git a/src/mantle/support/composer.json b/src/mantle/support/composer.json
index c322ebef1..2fe926df2 100644
--- a/src/mantle/support/composer.json
+++ b/src/mantle/support/composer.json
@@ -10,7 +10,7 @@
         "nesbot/carbon": "^2.53",
         "symfony/finder": "^6.0",
         "symfony/var-dumper": "^6.0",
-        "voku/portable-ascii": "^1.4"
+        "voku/portable-ascii": "^2.0"
     },
     "extra": {
         "branch-alias": {
diff --git a/tests/filesystem/test-filesystem-adapter.php b/tests/filesystem/test-filesystem-adapter.php
index 99ae0a01f..33ab65d6b 100644
--- a/tests/filesystem/test-filesystem-adapter.php
+++ b/tests/filesystem/test-filesystem-adapter.php
@@ -66,7 +66,7 @@ public function testDownloadNonAsciiFilename() {
 	$files    = new Filesystem_Adapter( $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() {
@@ -74,7 +74,7 @@ public function testDownloadNonAsciiEmptyFilename() {
 	$files    = new Filesystem_Adapter( $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() {

From 6f470e3c85ffc9ef39adcf9057c77369ad055631 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 10 Jan 2023 10:47:11 -0500
Subject: [PATCH 2/2] CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88d7314d0..dedd0baae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.10.1 - 2023-01-10
+
+- Upgrading to `voku/portable-ascii` v2 to fix conflicted version with `illuminate/support`.
+
 ## v0.10.0 - 2023-01-06
 
 - Improvements to database factories: adds `with_meta()` to all supported types, adds `with_posts()` to term factory.