diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
commit | 6426420f61de0df32a6085924d25b347c8788363 (patch) | |
tree | ef32814ffbea0ad3c3c38a942f9751302606c736 /ext/phar/tests/zip/phar_setsignaturealgo2.phpt | |
parent | f26c8644bb340e9e7abb6d1cedb091e9d87dd1d4 (diff) | |
parent | 26dfce7f36d1c6f737ac241df1315a1b42b932c7 (diff) | |
download | php-git-6426420f61de0df32a6085924d25b347c8788363.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace dirname(__FILE__) by __DIR__ in tests
Diffstat (limited to 'ext/phar/tests/zip/phar_setsignaturealgo2.phpt')
-rw-r--r-- | ext/phar/tests/zip/phar_setsignaturealgo2.phpt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt index 7d3730c416..c3a5955c3f 100644 --- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt @@ -11,12 +11,12 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar.zip'; -$fname4 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.4.phar.zip'; -$fname5 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.5.phar.zip'; -$fname6 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.6.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.3.phar.zip'; +$fname4 = __DIR__ . '/' . basename(__FILE__, '.php') . '.4.phar.zip'; +$fname5 = __DIR__ . '/' . basename(__FILE__, '.php') . '.5.phar.zip'; +$fname6 = __DIR__ . '/' . basename(__FILE__, '.php') . '.6.phar.zip'; $p = new Phar($fname); $p['file1.txt'] = 'hi'; var_dump($p->getSignature()); @@ -49,7 +49,7 @@ var_dump($p->getSignature()); echo $e->getMessage(); } try { -$config = dirname(__FILE__) . '/../files/openssl.cnf'; +$config = __DIR__ . '/../files/openssl.cnf'; $config_arg = array('config' => $config); $keys=openssl_pkey_new($config_arg); openssl_pkey_export($keys, $privkey, NULL, $config_arg); @@ -67,13 +67,13 @@ echo $e->getMessage(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.4.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.5.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip.pubkey'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.4.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.5.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip.pubkey'); ?> --EXPECTF-- array(2) { |