coding style: fixes in code

src/Deployment/CliRunner.php

@@ -28,7 +28,7 @@ class CliRunner
 	];
 
 	/** @var string[] */
-	public $ignoreMasks = ['*.bak', '.svn' , '.git*', 'Thumbs.db', '.DS_Store', '.idea'];
+	public $ignoreMasks = ['*.bak', '.svn', '.git*', 'Thumbs.db', '.DS_Store', '.idea'];
 
 	/** @var Logger */
 	private $logger;
@@ -67,7 +67,7 @@ public function run()
 		}
 
 		$time = time();
-		$this->logger->log("Started at " . date('[Y/m/d H:i]'));
+		$this->logger->log('Started at ' . date('[Y/m/d H:i]'));
 		$this->logger->log("Config file is $this->configFile");
 
 		foreach ($this->batches as $name => $batch) {
@@ -79,7 +79,7 @@ public function run()
 			if ($this->mode === 'generate') {
 				$this->logger->log('Scanning files');
 				$localPaths = $deployment->collectPaths();
-				$this->logger->log("Saved " . $deployment->writeDeploymentFile($localPaths));
+				$this->logger->log('Saved ' . $deployment->writeDeploymentFile($localPaths));
 				continue;
 			}
 
@@ -171,7 +171,7 @@ private function setupPhp()
 	/** @return array */
 	private function loadConfig()
 	{
-		$cmd = new CommandLine(<<<XX
+		$cmd = new CommandLine(<<<'XX'
 
 FTP deployment v2.7
 -------------------
@@ -210,7 +210,7 @@ private function loadConfig()
 			? ['' => $config]
 			: array_filter($config, 'is_array');
 
-		foreach ($this->batches as & $batch) {
+		foreach ($this->batches as &$batch) {
 			$batch = array_change_key_case($batch, CASE_LOWER) + $this->defaults;
 		}
 

src/Deployment/CommandLine.php

@@ -146,7 +146,7 @@ public function help()
 	}
 
 
-	public function checkArg(array $opt, & $arg)
+	public function checkArg(array $opt, &$arg)
 	{
 		if (!empty($opt[self::REALPATH])) {
 			$path = realpath($arg);

src/Deployment/Deployer.php

@@ -43,6 +43,9 @@ class Deployer
 	/** @var string */
 	public $tempDir = '';
 
+	/** @var string[] */
+	public $preprocessMasks = [];
+
 	/** @var string */
 	private $localDir;
 
@@ -52,9 +55,6 @@ class Deployer
 	/** @var Logger */
 	private $logger;
 
-	/** @var string[] */
-	public $preprocessMasks = [];
-
 	/** @var array */
 	private $filters = [];
 
@@ -83,7 +83,7 @@ public function __construct(Server $server, $localDir, Logger $logger)
 	 */
 	public function deploy()
 	{
-		$this->logger->log("Connecting to server");
+		$this->logger->log('Connecting to server');
 		$this->server->connect();
 		$this->remoteDir = $this->server->getDir();
 
@@ -321,7 +321,7 @@ public function collectPaths($subdir = '')
 		$list = [];
 		$iterator = dir($this->localDir . $subdir);
 		$counter = 0;
-		while (false !== ($entry = $iterator->read())) {
+		while (($entry = $iterator->read()) !== false) {
 			$this->logger->progress(str_pad(str_repeat('.', $counter++ % 40), 40));
 
 			$path = "$this->localDir$subdir/$entry";
@@ -436,7 +436,7 @@ private function writeProgress($count, $total, $path, $percent = null, $color =
 		if ($percent === null) {
 			$this->logger->log($s, $color);
 		} else {
-			$this->logger->progress($s . ' [' . round($percent) . "%]");
+			$this->logger->progress($s . ' [' . round($percent) . '%]');
 		}
 	}
 }

src/Deployment/FtpServer.php

@@ -44,7 +44,7 @@ public function __construct($url, $passiveMode = true)
 		}
 		$this->url = $url = is_array($url) ? $url : parse_url($url);
 		if (!isset($url['scheme'], $url['user'], $url['pass']) || ($url['scheme'] !== 'ftp' && $url['scheme'] !== 'ftps')) {
-			throw new \InvalidArgumentException("Invalid URL or missing username or password");
+			throw new \InvalidArgumentException('Invalid URL or missing username or password');
 		} elseif ($url['scheme'] === 'ftps' && !function_exists('ftp_ssl_connect')) {
 			throw new \Exception('PHP extension OpenSSL is not built statically in PHP.');
 		}
@@ -128,7 +128,7 @@ public function removeFile($file)
 		try {
 			$this->ftp('delete', $file);
 		} catch (FtpException $e) {
-			if (in_array($file, (array) $this->ftp('nlist', $file . '*'))) {
+			if (in_array($file, (array) $this->ftp('nlist', $file . '*'), true)) {
 				throw $e;
 			}
 		}
@@ -203,7 +203,7 @@ public function removeDir($dir)
 		try {
 			$this->ftp('rmDir', $dir);
 		} catch (FtpException $e) {
-			if (in_array($dir, (array) $this->ftp('nlist', $dir . '*'))) {
+			if (in_array($dir, (array) $this->ftp('nlist', $dir . '*'), true)) {
 				throw $e;
 			}
 		}

src/Deployment/Helpers.php

@@ -80,7 +80,7 @@ public static function matchMask($path, array $patterns, $isDir = false)
 	 * Processes HTTP request.
 	 * @return string
 	 */
-	public static function fetchUrl($url, & $error, array $postData = null)
+	public static function fetchUrl($url, &$error, array $postData = null)
 	{
 		if (extension_loaded('curl')) {
 			$ch = curl_init($url);
@@ -106,7 +106,7 @@ public static function fetchUrl($url, & $error, array $postData = null)
 					'method' => 'POST',
 					'header' => 'Content-type: application/x-www-form-urlencoded',
 					'content' => http_build_query($postData, null, '&'),
-				]
+				],
 			]));
 			$error = $output === false
 				? preg_replace("#^file_get_contents\(.*?\): #", '', error_get_last()['message'])

src/Deployment/Logger.php

@@ -14,15 +14,15 @@
  */
 class Logger
 {
-	/** @var resource */
-	private $file;
-
 	/** @var bool */
 	public $useColors;
 
 	/** @var bool */
 	public $showProgress = true;
 
+	/** @var resource */
+	private $file;
+
 	/** @var array */
 	private $colors = [
 		'black' => '0;30',

src/Deployment/SshServer.php

@@ -14,15 +14,15 @@
  */
 class SshServer implements Server
 {
-	/** @var resource */
-	private $connection;
-
 	/** @var int */
 	public $filePermissions;
 
 	/** @var int */
 	public $dirPermissions;
 
+	/** @var resource */
+	private $connection;
+
 	/** @var resource */
 	private $sftp;
 
@@ -41,7 +41,7 @@ public function __construct($url)
 		}
 		$this->url = is_array($url) ? $url : parse_url($url);
 		if (!isset($this->url['scheme'], $this->url['user']) || $this->url['scheme'] !== 'sftp') {
-			throw new \InvalidArgumentException("Invalid URL or missing username");
+			throw new \InvalidArgumentException('Invalid URL or missing username');
 		}
 	}
 
@@ -161,7 +161,7 @@ public function purge($dir, callable $progress = null)
 		$dirs = $entries = [];
 
 		$iterator = dir($path = "ssh2.sftp://$this->sftp$dir");
-		while (false !== ($entry = $iterator->read())) {
+		while (($entry = $iterator->read()) !== false) {
 			if ($entry !== '.' && $entry !== '..') {
 				$entries[] = $entry;
 			}

tests/Helpers.hashFile.phpt

@@ -7,7 +7,7 @@ require __DIR__ . '/bootstrap.php';
 
 
 file_put_contents(TEMP_DIR . '/file', "a\r\nb");
-Assert::same( md5("a\nb"), Helpers::hashFile(TEMP_DIR . '/file') );
+Assert::same(md5("a\nb"), Helpers::hashFile(TEMP_DIR . '/file'));
 
 file_put_contents(TEMP_DIR . '/file', "a\r\nb\x00");
-Assert::same( md5("a\r\nb\x00"), Helpers::hashFile(TEMP_DIR . '/file') );
+Assert::same(md5("a\r\nb\x00"), Helpers::hashFile(TEMP_DIR . '/file'));