From 1865a2712e004efb244cdbb241a8b7694bcdbfd7 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 30 Mar 2015 21:45:57 +0200
Subject: [PATCH] filter {.git,.hg.svn}

---
 bin/pharext                     | Bin 69828 -> 69977 bytes
 src/pharext/SourceDir/Basic.php |  13 +++++++++++--
 src/pharext/Task/PharBuild.php  |   4 ----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bin/pharext b/bin/pharext
index 9e1cff6f08faf1930766d458d9aa252942f7dfdd..c8de4259d0bc763a9c251de50459988ed4e2f602 100755
GIT binary patch
delta 677
zcmX@IkmcqgmJJ&en4*_Y-lSjwqTVRzf+%T4JrL!ss1KrQ6iq<XCPhQZ^(+hw(aR-6
zL3EW|)Z}f93}7HRxnEI~*FCdDuOOqKkrkw9vYZmwEMFzCS+z=9AVXFvS%IjhN=6_`
zQW;G7DjNtKXNQ;!qHWC@oF*Hp3r}94ECf=vMcEugy;U{_QA#Rc=R~L&f_U93W+3XY
ziYbWtr2;lkPZg{(8A8o~P-j(5ctCES19W@p&yrb_FQ|zKIp<{RI~JuEgWT;c33j)!
z8ra}8HC?cBL7?(yB`Gmr2W?UVJLs62mcV-jh=W12h3{%<u)MH3SYBNn9B>ipAg^!k
zQ2%Gk=bV_6la!d8?UtESl3FymKUI9v664J~Q$raiPwp40PXh~Us3eyb6{Y5t=qRXU
zr&a>VOrYY#lKdh~g=#KNPL<-)Bn4Xqm?~Yn^wg5z(xiaIk_-(^YoLP6GzATaB3oMp
zCB5{_5+#M28U-YwjC6F7;<7xY$^V~9@B#G~rIwTy<tdaDm8MQ!mnJ>=doKTE<Me|L
z$(cZF^HR$df>MDlEY2)TMfHy-)R`J8MJbs&3ehSh8JWd83Q7=fDaB5Ho36u@oVnR8
zLri+}(dKP+(|0g23UBXaVwC2S$-m%os^_nDpp9>~!v6BD@|x8P*qMOI%H7G=2>=YI
B;cx%|

delta 494
zcmcb)h~>yamJJ&em?nx(-lSjwqTVRzf+%T4JrL!ss1KrQ6iq<XCPhQZP0S1o6U8M%
zLA30Z?AzNI8Nfhta=)S|uX|>RUO`4dBP&SJWH}|US-whOvuc&JK!&VTvI0?0m5e}?
zq%xTDRW=YX;DDG6qC<?cj!!mJ7oNO8SqP+Ti?TV0daG;<qLfs?&WTVl1o666%s|v(
z6;lxPO9gD8o+?;nGK87|q0XwB@POPthlPP5^=HYf$rsc_gq(9S^&N}Si$U)8mIS-o
zSPg7&nwl<Hxgb#avyzk;u!A<KfgN;AO-taN0>r@}`pLx<Q?R_SI#^y^9UO2G>L9Og
z?oj_{yLokL2jk>LX=0OEGcHV4U9K}ZXu0;}y5;Jd^D|#b@ulS#r6wk4C}`xRmMg?e
z)>|&ET#%7iq^Xctte}#XnUkuiP|d~3$yrd8nOBmgp%jpqoSm3HdE-vm&5<qJ>b46o
lGwSlmoUWWZf8M141>K*AWJ)5o@6bA_cZLZVKkiPxP5`S1n}+}Z

diff --git a/src/pharext/SourceDir/Basic.php b/src/pharext/SourceDir/Basic.php
index 7decdc6..414c201 100644
--- a/src/pharext/SourceDir/Basic.php
+++ b/src/pharext/SourceDir/Basic.php
@@ -7,6 +7,7 @@ use pharext\SourceDir;
 
 use FilesystemIterator;
 use IteratorAggregate;
+use RecursiveCallbackFilterIterator;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 
@@ -33,14 +34,22 @@ class Basic implements IteratorAggregate, SourceDir
 	
 	public function setArgs(Args $args) {
 	}
+
+	public function filter($current, $key, $iterator) {
+		$sub = $current->getSubPath();
+		if ($sub === ".git" || $sub === ".hg" || $sub === ".svn") {
+			return false;
+		}
+		return true;
+	}
 	
 	public function getIterator() {
 		$rdi = new RecursiveDirectoryIterator($this->path,
 				FilesystemIterator::CURRENT_AS_SELF | // needed for 5.5
 				FilesystemIterator::KEY_AS_PATHNAME |
 				FilesystemIterator::SKIP_DOTS);
-		$rii = new RecursiveIteratorIterator($rdi,
-			RecursiveIteratorIterator::CHILD_FIRST);
+		$rci = new RecursiveCallbackFilterIterator($rdi, [$this, "filter"]);
+		$rii = new RecursiveIteratorIterator($rci);
 		foreach ($rii as $path => $child) {
 			if (!$child->isDir()) {
 				yield $path;
diff --git a/src/pharext/Task/PharBuild.php b/src/pharext/Task/PharBuild.php
index 5468755..bc79f79 100644
--- a/src/pharext/Task/PharBuild.php
+++ b/src/pharext/Task/PharBuild.php
@@ -86,10 +86,6 @@ class PharBuild implements Task
 
 		$phar->stopBuffering();
 		
-		foreach (new \RecursiveIteratorIterator($phar) as $file) {
-			printf("Packaged %s ...\n", $file);
-		}
-
 		if (!chmod($temp, fileperms($temp) | 0111)) {
 			throw new Exception;
 		}
-- 
2.30.2