Skip to content

Commit c465b1c

Browse files
authored
Minor Changes for Cygwin (#3070)
No source code changes. Mitoteam added a change to better accomodate Cygwin; pick up their new release. While testing, discovered one test that was already skipped on Windows and needs to be skipped on Cygwin as well.
1 parent ceb3bb2 commit c465b1c

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"dealerdirect/phpcodesniffer-composer-installer": "dev-master",
8282
"dompdf/dompdf": "^1.0 || ^2.0",
8383
"friendsofphp/php-cs-fixer": "^3.2",
84-
"mitoteam/jpgraph": "10.2.3",
84+
"mitoteam/jpgraph": "10.2.4",
8585
"mpdf/mpdf": "8.1.1",
8686
"phpcompatibility/php-compatibility": "^9.3",
8787
"phpstan/phpstan": "^1.1",

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/PhpSpreadsheetTests/Shared/FileTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,14 @@ public function testNotExists(): void
8787

8888
public function testNotReadable(): void
8989
{
90-
if (PHP_OS_FAMILY === 'Windows') {
90+
if (PHP_OS_FAMILY === 'Windows' || stristr(PHP_OS, 'CYGWIN') !== false) {
9191
self::markTestSkipped('chmod does not work reliably on Windows');
9292
}
9393
$this->tempfile = $temp = File::temporaryFileName();
9494
file_put_contents($temp, '');
95-
chmod($temp, 0070);
95+
if (chmod($temp, 0070) === false) {
96+
self::markTestSkipped('chmod failed');
97+
}
9698
self::assertFalse(File::testFileNoThrow($temp));
9799
$this->expectException(ReaderException::class);
98100
$this->expectExceptionMessage('for reading');

0 commit comments

Comments
 (0)