Merge pull request #362 from alleyinteractive/ascii

Upgrading to voku/portable-ascii 2.0

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.

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",

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": {

tests/filesystem/test-filesystem-adapter.php

@@ -66,15 +66,15 @@ 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() {
 	$this->filesystem->write( 'пиздюк.txt', 'Hello World' );
 	$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() {