Request #19827	pass filename to _addFile function - downstream patch

... and minor whitespace, CS fixes

http://pear.php.net/bugs/bug.php?id=19827