Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
oleibman 2022-09-17 07:32:12 -07:00 committed by GitHub
parent ceb3bb2f38
commit c465b1c283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -81,7 +81,7 @@
"dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
"dompdf/dompdf": "^1.0 || ^2.0", "dompdf/dompdf": "^1.0 || ^2.0",
"friendsofphp/php-cs-fixer": "^3.2", "friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "10.2.3", "mitoteam/jpgraph": "10.2.4",
"mpdf/mpdf": "8.1.1", "mpdf/mpdf": "8.1.1",
"phpcompatibility/php-compatibility": "^9.3", "phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.1", "phpstan/phpstan": "^1.1",

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b5bdb9f96d18ce59557436521053fdd9", "content-hash": "6d946e91cbe5d38e1cfb0208512ab981",
"packages": [ "packages": [
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",
@ -1342,16 +1342,16 @@
}, },
{ {
"name": "mitoteam/jpgraph", "name": "mitoteam/jpgraph",
"version": "10.2.3", "version": "10.2.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mitoteam/jpgraph.git", "url": "https://github.com/mitoteam/jpgraph.git",
"reference": "21121535537e05c32e7964327b80746462a6057d" "reference": "9ce4d106a89f120c7e220ea22205ef7956a7027b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/21121535537e05c32e7964327b80746462a6057d", "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/9ce4d106a89f120c7e220ea22205ef7956a7027b",
"reference": "21121535537e05c32e7964327b80746462a6057d", "reference": "9ce4d106a89f120c7e220ea22205ef7956a7027b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1382,9 +1382,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/mitoteam/jpgraph/issues", "issues": "https://github.com/mitoteam/jpgraph/issues",
"source": "https://github.com/mitoteam/jpgraph/tree/10.2.3" "source": "https://github.com/mitoteam/jpgraph/tree/10.2.4"
}, },
"time": "2022-09-14T04:02:09+00:00" "time": "2022-09-15T05:57:43+00:00"
}, },
{ {
"name": "mpdf/mpdf", "name": "mpdf/mpdf",

6
tests/PhpSpreadsheetTests/Shared/FileTest.php
View File

@ -87,12 +87,14 @@ class FileTest extends TestCase
public function testNotReadable(): void public function testNotReadable(): void
{ {
if (PHP_OS_FAMILY === 'Windows') { if (PHP_OS_FAMILY === 'Windows' || stristr(PHP_OS, 'CYGWIN') !== false) {
self::markTestSkipped('chmod does not work reliably on Windows'); self::markTestSkipped('chmod does not work reliably on Windows');
} }
$this->tempfile = $temp = File::temporaryFileName(); $this->tempfile = $temp = File::temporaryFileName();
file_put_contents($temp, ''); file_put_contents($temp, '');
chmod($temp, 0070); if (chmod($temp, 0070) === false) {
self::markTestSkipped('chmod failed');
}
self::assertFalse(File::testFileNoThrow($temp)); self::assertFalse(File::testFileNoThrow($temp));
$this->expectException(ReaderException::class); $this->expectException(ReaderException::class);
$this->expectExceptionMessage('for reading'); $this->expectExceptionMessage('for reading');