From a4985fc101a469bc9971b1fd267d9cdebed263e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Feb 2019 09:39:11 +0100 Subject: update to 2.2.2 drop patch merged upstream use range dependencies --- php-horde-Horde-Compress-pr1.patch | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 php-horde-Horde-Compress-pr1.patch (limited to 'php-horde-Horde-Compress-pr1.patch') diff --git a/php-horde-Horde-Compress-pr1.patch b/php-horde-Horde-Compress-pr1.patch deleted file mode 100644 index 4fea729..0000000 --- a/php-horde-Horde-Compress-pr1.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 85336803f0d78ce9d5530617898e0809cddb3c50 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 14 Nov 2017 08:15:39 +0100 -Subject: [PATCH] don't rely on directory order - ---- - test/Horde/Compress/TarTest.php | 3 +++ - test/Horde/Compress/ZipTest.php | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/test/Horde/Compress/TarTest.php b/test/Horde/Compress/TarTest.php -index 1875f8b..af1a2ca 100644 ---- a/test/Horde/Compress/TarTest.php -+++ b/test/Horde/Compress/TarTest.php -@@ -111,6 +111,9 @@ public function testTarDirectory() - $this->assertNotEmpty($tar_data); - - $list = $compress->decompress($tar_data); -+ usort($list, function ($a, $b) { -+ return strcmp($a['name'], $b['name']); -+ }); - $this->assertCount(3, $list); - $this->assertEquals('one.txt', $list[0]['name']); - $this->assertEquals(4, $list[0]['size']); -diff --git a/test/Horde/Compress/ZipTest.php b/test/Horde/Compress/ZipTest.php -index 7e215b2..9a74b59 100644 ---- a/test/Horde/Compress/ZipTest.php -+++ b/test/Horde/Compress/ZipTest.php -@@ -142,6 +142,9 @@ public function testZipDirectory() - $list = $compress->decompress( - $zip_data, array('action' => Horde_Compress_Zip::ZIP_LIST) - ); -+ usort($list, function ($a, $b) { -+ return strcmp($a['name'], $b['name']); -+ }); - $this->assertCount(3, $list); - $this->assertEquals('one.txt', $list[0]['name']); - $this->assertEquals(4, $list[0]['size']); -- cgit