Scrutinizer changes
Make callbacks use consistent arg types
Fix random typing of error property in SMTP class, fixes #242
Make use of $smtp_conn consistent for a resource (i.e. null when not set, not 0)
Make use of $helo_rply consistent
Don't need a constructor any more - property default are fine
Code cleanup
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	class.phpmailer.php
Remove unnecessary TODOs
Cleanup
Refactor of error handling and debug output
Better property defaults, no need for constructor
Better default port handling
Cleanup
Handle unconnected connection resource consistently
Handle unconnected connection resource consistently
Make tests check for config
Generate debug output during POP tests
Ignore errors during POP3 disconnect
Update PHPUnit dependency to 4.1 in composer
PHPDoc cleanup - consistent naming of integer and boolean types
PHPDoc cleanup - consistent naming of integer and boolean types
More debug info about connection
Fall back to fsockopen if stream_socket_client is disabled, fixes #243
use PHP_VERSION constant

less shellcode, just use PHP_VERSION constant

http://www.php.net//manual/en/reserved.constants.php
Merge pull request #245 from glensc/patch-1

use PHP_VERSION constant