Fix PHP 8.4 syntax (#175)

Fixes #173

Author: jakubboucek

src/Deployment/CommandLine.php

@@ -67,7 +67,7 @@ public function __construct(string $help, array $defaults = [])
 	}
 
 
-	public function parse(array $args = null): array
+	public function parse(?array $args = null): array
 	{
 		if ($args === null) {
 			$args = isset($_SERVER['argv']) ? array_slice($_SERVER['argv'], 1) : [];

src/Deployment/Deployer.php

@@ -446,8 +446,8 @@ private function writeProgress(
 		int $count,
 		int $total,
 		string $path,
-		float $percent = null,
-		string $color = null,
+		?float $percent = null,
+		?string $color = null,
 	): void
 	{
 		$len = strlen((string) $total);

src/Deployment/FileServer.php

@@ -58,7 +58,7 @@ public function readFile(string $remote, string $local): void
 	 * Uploads file.
 	 * @throws ServerException
 	 */
-	public function writeFile(string $local, string $remote, callable $progress = null): void
+	public function writeFile(string $local, string $remote, ?callable $progress = null): void
 	{
 		Safe::copy($local, $this->root . $remote);
 		if ($this->filePermissions) {
@@ -117,7 +117,7 @@ public function removeDir(string $dir): void
 	 * Recursive deletes content of directory or file.
 	 * @throws ServerException
 	 */
-	public function purge(string $dir, callable $progress = null): void
+	public function purge(string $dir, ?callable $progress = null): void
 	{
 		$dir = $this->root . $dir;
 		if (!file_exists($dir)) {

src/Deployment/FtpServer.php

@@ -106,7 +106,7 @@ public function readFile(string $remote, string $local): void
 	 * Uploads file to FTP server.
 	 * @throws ServerException
 	 */
-	public function writeFile(string $local, string $remote, callable $progress = null): void
+	public function writeFile(string $local, string $remote, ?callable $progress = null): void
 	{
 		$size = max(filesize($local), 1);
 		$blocks = 0;
@@ -222,7 +222,7 @@ public function removeDir(string $dir): void
 	 * Recursive deletes content of directory or file.
 	 * @throws ServerException
 	 */
-	public function purge(string $dir, callable $progress = null): void
+	public function purge(string $dir, ?callable $progress = null): void
 	{
 		if (!$this->isDir($dir)) {
 			return;

src/Deployment/Helpers.php

@@ -77,7 +77,7 @@ public static function matchMask(string $path, array $patterns, bool $isDir = fa
 	/**
 	 * Processes HTTP request.
 	 */
-	public static function fetchUrl(string $url, ?string &$error, array $postData = null): string
+	public static function fetchUrl(string $url, ?string &$error, ?array $postData = null): string
 	{
 		if (extension_loaded('curl')) {
 			$ch = curl_init($url);

src/Deployment/Logger.php

@@ -47,7 +47,7 @@ public function __construct(string $file)
 	}
 
 
-	public function log(string $s, string $color = null, int $shorten = 1): void
+	public function log(string $s, ?string $color = null, int $shorten = 1): void
 	{
 		fwrite($this->file, $s . "\n");
 

src/Deployment/PhpsecServer.php

@@ -20,11 +20,11 @@ class PhpsecServer implements Server
 
 	public function __construct(
 		string $url,
-		string $publicKey = null,
+		?string $publicKey = null,
 		#[\SensitiveParameter]
-		string $privateKey = null,
+		?string $privateKey = null,
 		#[\SensitiveParameter]
-		string $passPhrase = null,
+		?string $passPhrase = null,
 	) {
 		$this->url = parse_url($url);
 		if (!isset($this->url['scheme'], $this->url['user'], $this->url['host']) || $this->url['scheme'] !== 'phpsec') {
@@ -64,7 +64,7 @@ public function readFile(string $remote, string $local): void
 	}
 
 
-	public function writeFile(string $local, string $remote, callable $progress = null): void
+	public function writeFile(string $local, string $remote, ?callable $progress = null): void
 	{
 		if ($this->sftp->put($remote, $local, SFTP::SOURCE_LOCAL_FILE, -1, -1, $progress) === false) {
 			throw new ServerException('Unable to write file');
@@ -129,7 +129,7 @@ public function removeDir(string $dir): void
 	}
 
 
-	public function purge(string $path, callable $progress = null): void
+	public function purge(string $path, ?callable $progress = null): void
 	{
 		if ($this->sftp->file_exists($path)) {
 			if ($this->sftp->delete($path, true) === false) {

src/Deployment/RetryServer.php

@@ -42,7 +42,7 @@ public function readFile(string $remote, string $local): void
 	}
 
 
-	public function writeFile(string $local, string $remote, callable $progress = null): void
+	public function writeFile(string $local, string $remote, ?callable $progress = null): void
 	{
 		$this->retry(__FUNCTION__, func_get_args());
 	}
@@ -72,7 +72,7 @@ public function removeDir(string $dir): void
 	}
 
 
-	public function purge(string $path, callable $progress = null): void
+	public function purge(string $path, ?callable $progress = null): void
 	{
 		$this->retry(__FUNCTION__, func_get_args());
 	}

src/Deployment/Safe.php

@@ -89,7 +89,7 @@ public static function __callStatic(string $func, array $args = [])
 
 
 	/** @throws ServerException */
-	public static function exec(string $command, array &$output = null, int &$return_var = null): string
+	public static function exec(string $command, ?array &$output = null, ?int &$return_var = null): string
 	{
 		return self::__callStatic(__FUNCTION__, [$command, &$output, &$return_var]);
 	}

src/Deployment/Server.php

@@ -32,7 +32,7 @@ function readFile(string $remote, string $local): void;
 	 * Uploads file to server. Paths are absolute.
 	 * @throws ServerException
 	 */
-	function writeFile(string $local, string $remote, callable $progress = null): void;
+	function writeFile(string $local, string $remote, ?callable $progress = null): void;
 
 	/**
 	 * Removes file from server if exists. Path is absolute.
@@ -62,7 +62,7 @@ function removeDir(string $dir): void;
 	 * Recursive deletes content of directory or file. Path is absolute.
 	 * @throws ServerException
 	 */
-	function purge(string $path, callable $progress = null): void;
+	function purge(string $path, ?callable $progress = null): void;
 
 	/**
 	 * Changes file permissions. Path is absolute.