From f70d527661d21810846beb94de96e69ef4f54f57 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Sun, 20 Apr 2008 21:48:30 +0000
Subject: [PATCH] use a tar generated by the tar command to test links.  Test
 still fails

---
 ext/phar/tests/tar/files/links.tar | Bin 0 -> 10240 bytes
 ext/phar/tests/tar/links.phpt      |  37 ++++++-----------------------
 2 files changed, 7 insertions(+), 30 deletions(-)
 create mode 100644 ext/phar/tests/tar/files/links.tar

diff --git a/ext/phar/tests/tar/files/links.tar b/ext/phar/tests/tar/files/links.tar
new file mode 100644
index 0000000000000000000000000000000000000000..6cd22df2bcc83642a75fbf675332f6c3922eb802
GIT binary patch
literal 10240
zcmeI0?M{O*6o&iTtLPPI5B<6xqA(h9n$abC_qGU*uncCxiE+OD)2!XP@;sc=1F`C2
zh!29Zsnoo+B6Z}gn)Z1rH$kLS;k8kezDMM&7t(TWYFzu+#quDfc&ys?bvKTl_iOX#
zzxWd)@ymbp@)kep&{iCq&VrpWQ}5$_kf(AR{cCGn@~^FTLMo2U%-4kf9RE#uc$$;h
z>~j{p>|dY!+amcdEW!U~{FfGL!rjs|=5Cz8kpH<-e@|~c{wMjrkALI55|W0^u_h<v
z|D6B(^Pj5<%>J*e|I+zS`TSQ!@{jtDKlyxzSeH{k$8rn&$iGW<B5C6+{PWuvV(!0-
z$GX0c?{ULFU(NqSr~0q=Z?#GOQU7l!;lff)kmarndsKlJ0NwcT5dUr1KeJtFpZ~qT
z=J`Lp|4HwMNNZ0*7OYk2aJm1y{$rDlg+TxWKmY_l00ck)1V8`;KmY_l00ck)1V8`;
Hex1N4X7RtW

literal 0
HcmV?d00001

diff --git a/ext/phar/tests/tar/links.phpt b/ext/phar/tests/tar/links.phpt
index f1201a6209..2e0fdcbf65 100644
--- a/ext/phar/tests/tar/links.phpt
+++ b/ext/phar/tests/tar/links.phpt
@@ -4,37 +4,14 @@ Phar: tar with hard link and symbolic link
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE--
 <?php
-$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
-$pname = 'phar://' . $fname;
-
-include dirname(__FILE__) . '/files/corrupt_tarmaker.php.inc';
-$a = new corrupt_tarmaker($fname, 'none');
-$a->init();
-$a->addFile('symlink', 'internal/file.txt', array(
-                    'mode' => 0xA000 + 0644,
-                    'uid' => 0,
-                    'gid' => 0,
-                    'size' => strlen('internal/file.txt'),
-                    'mtime' => time(),
-                ), 'symlink');
-$a->addFile('hardlink', 'internal/file.txt', array(
-                    'mode' => 0xA000 + 0644,
-                    'uid' => 0,
-                    'gid' => 0,
-                    'size' => strlen('internal/file.txt'),
-                    'mtime' => time(),
-                ));
-$a->addFile('internal/file.txt', 'hi there');
-$a->close();
-
 try {
-	$p = new PharData($fname);
+	$p = new PharData(dirname(__FILE__) . '/files/links.tar');
 } catch (Exception $e) {
 	echo $e->getMessage() . "\n";
 }
-var_dump($p['symlink']->getContent());
-var_dump($p['hardlink']->getContent());
-var_dump($p['internal/file.txt']->getContent());
+var_dump($p['testit/link']->getContent());
+var_dump($p['testit/hard']->getContent());
+var_dump($p['testit/file']->getContent());
 ?>
 ===DONE===
 --CLEAN--
@@ -42,7 +19,7 @@ var_dump($p['internal/file.txt']->getContent());
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
 ?>
 --EXPECTF--
-string(17) "internal/file.txt"
-string(17) "internal/file.txt"
-string(8) "hi there"
+string(2) "hi"
+string(2) "hi"
+string(2) "hi"
 ===DONE===
-- 
2.50.1