Merge pull request #45 from kiwilan/develop

Fix tests
kiwilan · Mar 8, 2024 · 90a21d1 · 90a21d1
2 parents 0861f86 + 464f6b4
commit 90a21d1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/run-windows.yml b/.github/workflows/run-windows.yml
@@ -14,10 +14,8 @@ jobs:
           scoop update
           scoop install 7zip
           scoop install imagemagick ghostscript ffmpeg
-          scoop install which
           scoop checkup
           [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-          which 7z
         shell: powershell
 
       - name: Checkout code

diff --git a/README.md b/README.md
@@ -27,13 +27,15 @@ Supports Linux, macOS and Windows.
     -   [`imagick`](https://www.php.net/manual/en/book.imagick.php) (optional) for `.PDF`
     -   [`bz2`](https://www.php.net/manual/en/book.bzip2.php) (optional) for `.BZ2` archives
 
-|           Type            | Supported |                                               Requirement                                                |                                 Uses                                 |
-| :-----------------------: | :-------: | :------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------: |
-|  `.zip`, `.epub`, `.cbz`  |    ✅     |                                                   N/A                                                    |  Uses [`zip` extension](https://www.php.net/manual/en/book.zip.php)  |
-| `.tar`, `.tar.gz`, `.cbt` |    ✅     |                                                   N/A                                                    | Uses [`phar` extension](https://www.php.net/manual/en/book.phar.php) |
-|      `.rar`, `.cbr`       |    ✅     | [`rar` PHP extension](https://github.com/cataphract/php-rar) or [`p7zip`](https://www.7-zip.org/) binary |                         PHP `rar` or `p7zip`                         |
-|       `.7z`, `.cb7`       |    ✅     |                                 [`p7zip`](https://www.7-zip.org/) binary                                 |                            `p7zip` binary                            |
-|          `.pdf`           |    ✅     |         Optional (for extraction) [`imagick` PHP extension](https://github.com/Imagick/imagick)          |                          `smalot/pdfparser`                          |
+|           Type            | Supported |                                               Requirement                                                |                                  Uses                                  |
+| :-----------------------: | :-------: | :------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------: |
+|  `.zip`, `.epub`, `.cbz`  |    ✅     |                                                   N/A                                                    |   Uses [`zip` extension](https://www.php.net/manual/en/book.zip.php)   |
+| `.tar`, `.tar.gz`, `.cbt` |    ✅     |                                                   N/A                                                    | Uses [`phar` extension](https://www.php.net/manual/en/book.phar.php)\* |
+|      `.rar`, `.cbr`       |    ✅     | [`rar` PHP extension](https://github.com/cataphract/php-rar) or [`p7zip`](https://www.7-zip.org/) binary |                          PHP `rar` or `p7zip`                          |
+|       `.7z`, `.cb7`       |    ✅     |                                 [`p7zip`](https://www.7-zip.org/) binary                                 |                             `p7zip` binary                             |
+|          `.pdf`           |    ✅     |         Optional (for extraction) [`imagick` PHP extension](https://github.com/Imagick/imagick)          |       [`smalot/pdfparser`](https://github.com/smalot/pdfparser)        |
+
+\*: for `.tar` archives with password, `.7z` will be used because extension don't support password.
 
 > [!NOTE]
 >
@@ -54,6 +56,7 @@ If you want more information, you can read section [**About**](#about).
 
 -   List files as `ArchiveItem` array
     -   With `getFileItems()` method: list of files
+    -   With `getFileItem(string $path)` method: file corresponding to `path` property
     -   With `getFirst()` method: first file
     -   With `getLast()` method: last file
     -   With `find()` method: find first file that match with `path` property
@@ -274,7 +277,7 @@ Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed re
 
 ## Credits
 
--   [Kiwilan](https://github.com/kiwilan)
+-   [Ewilan Riviere](https://github.com/ewilan-riviere)
 -   [All Contributors](../../contributors)
 -   [spatie](https://github.com/spatie) for `spatie/package-skeleton-php` and `spatie/temporary-directory`
 -   [`smalot/pdfparser`](https://github.com/smalot/pdfparser) for PDF parser

diff --git a/tests/ArchiveTest.php b/tests/ArchiveTest.php
@@ -162,8 +162,10 @@ function (Pest\Expectation $item) use ($ext) {
     if (PHP_OS_FAMILY === 'Windows') {
         $current_user = exec('echo %USERNAME%');
         $binary_path = "C:\\Users\\{$current_user}\\scoop\\apps\\7zip\\current\\7z.exe";
-    } else {
+    } elseif (PHP_OS_FAMILY === 'Darwin') {
         $binary_path = '/opt/homebrew/bin/7z';
+    } else {
+        $binary_path = '/usr/bin/7z';
     }
     $archive = Archive::read($path)->overrideBinaryPath($binary_path);
 

diff --git a/tests/PdfTest.php b/tests/PdfTest.php
@@ -26,7 +26,7 @@
 
     expect($content)->toBeString();
     expect($file)->toBeReadableFile();
-});
+})->skip(PHP_OS_FAMILY === 'Windows', 'Skip on Windows');
 
 it('can extract some files', function () {
     $archive = Archive::read(PDF);