summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2018-12-02 15:12:21 -0800
committerStanislav Malyshev <stas@php.net>2018-12-02 15:12:21 -0800
commit377562fc6f1182245e7fecd5a1815b40b039f082 (patch)
treeeb96015f580da1991e1a7fedb6582b5492764450
parent8acc70316d8237b06b1fb7b79d6ff1cb43327f66 (diff)
parent1225467d8a02d91bc6791735d4e3148b06ed2d6a (diff)
downloadphp-git-377562fc6f1182245e7fecd5a1815b40b039f082.tar.gz
Merge branch 'PHP-7.2'
* PHP-7.2: Fix TSRM signature - php_stream_stat macro has it's own TSRM Regenerate certificates for openssl tests Improve test for bug77022
-rw-r--r--ext/phar/tests/bug77022.phpt6
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/phar/tests/bug77022.phpt b/ext/phar/tests/bug77022.phpt
index 66bcf66dd4..c78d1bdafd 100644
--- a/ext/phar/tests/bug77022.phpt
+++ b/ext/phar/tests/bug77022.phpt
@@ -1,7 +1,10 @@
--TEST--
Phar: Bug #77022: PharData always creates new files with mode 0666
--SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php
+if (!extension_loaded("phar")) die("skip");
+if (defined("PHP_WINDOWS_VERSION_MAJOR")) die("skip not for Windows")
+?>
--FILE--
<?php
umask(022);
@@ -11,6 +14,7 @@ $sFile = tempnam(__DIR__, 'test77022');
var_dump(decoct(stat($sFile)['mode']));
foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
+ clearstatcache();
$phar = new PharData(__DIR__ . '/test77022.' . $ext, null, null, $mode);
$phar->addFile($sFile, 'test-file-phar');
$phar->addFromString("test-from-string", 'test-file-phar');