fix bugs

docs/helpers.md

@@ -51,9 +51,6 @@ $client->bucket(Bucket|'bucketId')->listAllFileVersions();
 // Get information on a file.
 $client->file()->getInfo('fileId');
 
-// Get a file by ID.
-$client->file()->getById('fileId');
-
 // Get a file by name.
 $client->file()->getByName('fileName');
 

src/Config.php

@@ -45,7 +45,7 @@ class Config
 
 	/**
 	 * Custom Guzzle handler or handler stack.
-	 * @var callable|\GuzzleHttp\HandlerStack
+	 * @var \GuzzleHttp\HandlerStack
 	 */
 	private $handler;
 
@@ -161,14 +161,6 @@ public function middleware(): array
 
 	public function handler(): HandlerStack
 	{
-		if (!$this->handler) {
-			$this->handler = HandlerStack::create();
-		}
-
-		if (is_callable($this->handler) && !$this->handler instanceof HandlerStack) {
-			$this->handler = new HandlerStack(($this->handler));
-		}
-
 		return $this->handler;
 	}
 
@@ -202,7 +194,12 @@ public static function fromArray($data): Config
 	private function setOptions(array $options) {
 		$options = array_merge(static::DEFAULTS, $options);
 
-		$this->handler = $options['handler'];
+		$this->handler = $options['handler'] ?? HandlerStack::create();
+
+		if (is_callable($this->handler) && !$this->handler instanceof HandlerStack) {
+			$this->handler = new HandlerStack(($this->handler));
+		}
+
 		$this->maxRetries = $options['maxRetries'];
 		$this->maxFileCount = $options['maxFileCount'];
 		$this->maxKeyCount = $options['maxKeyCount'];

src/Exceptions/NotFoundException.php → src/Exceptions/NoResultsException.php

@@ -3,6 +3,6 @@
 namespace Zaxbux\BackblazeB2\Exceptions;
 
 /** @package BackblazeB2\Exceptions */
-class NotFoundException extends \Exception {
+class NoResultsException extends \Exception {
 
 }

src/Helpers/DownloadHelper.php

@@ -30,11 +30,13 @@ public function download(
 			$options = DownloadOptions::fromArray($options ?? []);
 		}
 
-		// Build query string from query parameters and download options.
-		$queryString = implode('&', [http_build_query($query ?? []), $options->toQueryString() ?? []]);
-
-		$response = $this->getHttpClient()->request($headersOnly ? 'HEAD' : 'GET', $downloadUrl, [
-			'query'   => $queryString,
+		$response = $this->getHttpClient()->request(
+			$headersOnly ? 'HEAD' : 'GET',
+			Utils::joinPaths(
+				$this->client->accountAuthorization()->downloadUrl(),
+				$downloadUrl
+			), [
+			'query'   => Utils::filterRequestOptions([], $query, $options->getDownloadQueryOptions()),
 			'headers' => $options->getHeaders(),
 			'sink'    => $sink ?? null,
 			'stream'  => Utils::isStream($sink),

src/Helpers/FileOperationsHelper.php

@@ -121,11 +121,6 @@ public function getInfo(string $fileId): File
 		return $this->client->getFileInfo($fileId);
 	}
 
-	public function getById(string $fileId): File
-	{
-		return $this->client->getFileById($fileId);
-	}
-
 	public function getByName(string $fileName): File
 	{
 		return $this->client->getFileByName($fileName);

src/Helpers/UploadHelper.php

@@ -76,8 +76,8 @@ public function uploadStream(
 
 		// Upload as regular file
 		return $this->client->uploadFile(
-			$bucketId,
 			$fileName,
+			$bucketId,
 			$stream,
 			$contentType,
 			$fileInfo,

src/Http/Endpoint.php

@@ -15,7 +15,7 @@ final class Endpoint
 	public const DELETE_FILE_VERSION = 'b2_delete_file_version';
 	public const DELETE_KEY = 'b2_delete_key';
 	public const DOWNLOAD_FILE_BY_ID = 'b2_download_file_by_id';
-	public const DOWNLOAD_FILE_BY_NAME = 'b2_download_file_by_name';
+	public const DOWNLOAD_FILE_BY_NAME = 'file';
 	public const FINISH_LARGE_FILE = 'b2_finish_large_file';
 	public const GET_DOWNLOAD_AUTHORIZATION = 'b2_get_download_authorization';
 	public const GET_FILE_INFO = 'b2_get_file_info';

src/Http/Middleware/ApplyAuthorizationMiddleware.php

@@ -46,7 +46,7 @@ public function __invoke(callable $next): callable
 	protected function applyToken(RequestInterface $request): RequestInterface
 	{
 		$request = Psr7Utils::modifyRequest($request, [
-			'uri' => new Uri(Utils::joinPaths($this->client->accountAuthorization()->apiUrl(), (string)$request->getUri())),
+			'uri' => new Uri(Utils::joinPaths($request->getUri()->getHost() ? '' : $this->client->accountAuthorization()->apiUrl(), (string)$request->getUri())),
 			'set_headers' => [
 				'Authorization' => $this->client->accountAuthorization()->authorizationToken(),
 			],

src/Object/File.php

@@ -144,7 +144,7 @@ class File implements B2ObjectInterface
 	 * @param int    $partNumber 
 	 */
 	public function __construct(
-		string $id,
+		?string $id = null,
 		?string $name = null,
 		?string $bucketId = null,
 		?string $action = null,
@@ -183,7 +183,7 @@ public function __construct(
 	/**
 	 * Get the file account ID.
 	 */
-	public function accountId(): string
+	public function accountId(): ?string
 	{
 		return $this->accountId;
 	}
@@ -203,7 +203,7 @@ public function setAccountId(string $accountId): File
 	/**
 	 * Get the file ID.
 	 */
-	public function id(): string
+	public function id(): ?string
 	{
 		return $this->id;
 	}
@@ -223,7 +223,7 @@ public function setId(string $id): File
 	/**
 	 * Get the file name (path).
 	 */
-	public function name(): string
+	public function name(): ?string
 	{
 		return $this->name;
 	}
@@ -241,7 +241,7 @@ public function setName($name): File
 	/**
 	 * Get the file bucket ID.
 	 */
-	public function bucketId(): string
+	public function bucketId(): ?string
 	{
 		return $this->bucketId;
 	}
@@ -261,7 +261,7 @@ public function setBucketId($bucketId)
 	/**
 	 * Get the file action (type).
 	 */
-	public function action(): FileActionType
+	public function action(): ?FileActionType
 	{
 		return $this->action;
 	}
@@ -281,7 +281,7 @@ public function setAction(string $action): File
 	/**
 	 * Get the file info.
 	 */
-	public function info(): FileInfo
+	public function info(): ?FileInfo
 	{
 		return $this->info;
 	}
@@ -301,7 +301,7 @@ public function setInfo($info): File
 	/**
 	 * Get the file size.
 	 */
-	public function contentLength(): int
+	public function contentLength(): ?int
 	{
 		return $this->contentLength;
 	}
@@ -321,7 +321,7 @@ public function setContentLength(int $contentLength): File
 	/**
 	 * Get the file type.
 	 */
-	public function contentType(): string
+	public function contentType(): ?string
 	{
 		return $this->contentType;
 	}
@@ -341,7 +341,7 @@ public function setContentType(string $contentType): File
 	/**
 	 * Get the file SHA1 checksum.
 	 */
-	public function contentSha1(): string
+	public function contentSha1(): ?string
 	{
 		return $this->contentSha1;
 	}
@@ -361,7 +361,7 @@ public function setContentSha1(string $contentSha1): File
 	/**
 	 * Get the file MD5 hash.
 	 */
-	public function contentMd5(): string
+	public function contentMd5(): ?string
 	{
 		return $this->contentMd5;
 	}
@@ -381,7 +381,7 @@ public function setContentMd5(string $contentMd5): File
 	/**
 	 * Get the UTC timestamp when the file was uploaded. Always `0` if the action is `folder`.
 	 */
-	public function uploadTimestamp(): int
+	public function uploadTimestamp(): ?int
 	{
 		return $this->action->isFolder() ? 0 : $this->uploadTimestamp;
 	}
@@ -399,7 +399,7 @@ public function setUploadTimestamp(int $uploadTimestamp): File
 	/**
 	 * Get the value of retention.
 	 */
-	public function retention(): array
+	public function retention(): ?array
 	{
 		return $this->retention;
 	}
@@ -419,7 +419,7 @@ public function setRetention(string $retention): File
 	/**
 	 * Get the value of legalHold.
 	 */
-	public function legalHold(): array
+	public function legalHold(): ?array
 	{
 		return $this->legalHold;
 	}
@@ -503,7 +503,7 @@ public function pathInfo(): FilePathInfo
 	public static function fromArray(array $data): File
 	{
 		return new File(
-			$data[static::ATTRIBUTE_FILE_ID],
+			$data[static::ATTRIBUTE_FILE_ID] ?? null,
 			$data[static::ATTRIBUTE_FILE_NAME] ?? null,
 			$data[static::ATTRIBUTE_BUCKET_ID] ?? null,
 			$data[static::ATTRIBUTE_ACTION] ?? null,

src/Object/File/DownloadOptions.php

@@ -337,8 +337,8 @@ public function toArray() {
 	 * 
 	 * @return string The query string.
 	 */
-	public function toQueryString() {
-		return http_build_query([
+	public function getDownloadQueryOptions() {
+		return array_filter([
 			static::OPTION_AUTHORIZATION => $this->authorization,
 			static::OPTION_CONTENT_DISPOSITION => $this->contentDisposition,
 			static::OPTION_CONTENT_ENCODING => $this->contentEncoding,

src/Object/File/ServerSideEncryption.php

@@ -194,8 +194,8 @@ public static function fromArray(array $data, bool $rawKeys = false): ServerSide
 		$customerKeyMd5 = $data[static::ATTRIBUTE_CUSTOMER_KEY_MD5] ?? null;
 
 		return new ServerSideEncryption(
-			$data[static::ATTRIBUTE_MODE] ?? static::MODE_CUSTOMER,
-			$data[static::ATTRIBUTE_ALGORITHM] ?? static::ALGORITHM_AES256,
+			$data[static::ATTRIBUTE_MODE] ?? null,
+			$data[static::ATTRIBUTE_ALGORITHM] ?? null,
 			$customerKey ? ($rawKeys ? base64_encode($customerKey) : $customerKey) : null,
 			$customerKeyMd5 ? ($rawKeys ? base64_encode($customerKeyMd5) : $customerKeyMd5) : null
 		);

src/Operations/BucketOperationsTrait.php

@@ -4,7 +4,7 @@
 
 namespace Zaxbux\BackblazeB2\Operations;
 
-use Zaxbux\BackblazeB2\Exceptions\NotFoundException;
+use Zaxbux\BackblazeB2\Exceptions\NoResultsException;
 use Zaxbux\BackblazeB2\Http\Endpoint;
 use Zaxbux\BackblazeB2\Object\AccountAuthorization;
 use Zaxbux\BackblazeB2\Object\Bucket;
@@ -182,7 +182,7 @@ public function updateBucket(
 	 * @param string $bucketId        The ID of the bucket to fetch. Defaults to the authorized bucket, if any.
 	 * @param array|null $bucketTypes Filter for bucket types returned in the list buckets response.
 	 * 
-	 * @throws NotFoundException 
+	 * @throws NoResultsException 
 	 */
 	public function getBucketById(
 		?string $bucketId = null,
@@ -193,7 +193,7 @@ public function getBucketById(
 		$buckets = $response->getArrayCopy();
 
 		if (count($buckets) !== 1) {
-			throw new NotFoundException(sprintf('Bucket "%s" not found.', $bucketId));
+			throw new NoResultsException(sprintf('Bucket "%s" not found.', $bucketId));
 		}
 
 		return $buckets[0];
@@ -205,7 +205,7 @@ public function getBucketById(
 	 * @param string $bucketName      The name of the bucket to fetch.
 	 * @param array|null $bucketTypes Filter for bucket types returned in the list buckets response.
 	 * 
-	 * @throws NotFoundException 
+	 * @throws NoResultsException 
 	 */
 	public function getBucketByName(string $bucketName, array $bucketTypes = null): Bucket
 	{
@@ -214,7 +214,7 @@ public function getBucketByName(string $bucketName, array $bucketTypes = null):
 		//$buckets = $response->getArrayCopy();
 
 		if (!$response->valid()) {
-			throw new NotFoundException(sprintf('Bucket "%s" not found.', $bucketName));
+			throw new NoResultsException(sprintf('Bucket "%s" not found.', $bucketName));
 		}
 
 		return $response->current();

src/Operations/DownloadOperationsTrait.php

@@ -77,11 +77,7 @@ public function downloadFileById(
 		?bool $headersOnly = false
 	): FileDownload {
 		return DownloadHelper::instance($this)->download(
-			Utils::joinPaths(
-				$this->accountAuthorization()->downloadUrl(),
-				Client::B2_API_VERSION,
-				Endpoint::DOWNLOAD_FILE_BY_ID
-			),
+			Client::B2_API_VERSION .Endpoint::DOWNLOAD_FILE_BY_ID,
 			[File::ATTRIBUTE_FILE_ID => $fileId],
 			$options,
 			$sink,
@@ -114,8 +110,7 @@ public function downloadFileByName(
 	): FileDownload {
 		return DownloadHelper::instance($this)->download(
 			Utils::joinPaths(
-				$this->accountAuthorization()->apiUrl(),
-				'file',
+				Endpoint::DOWNLOAD_FILE_BY_NAME,
 				$bucketName ?? $this->allowedBucketName(),
 				$fileName
 			),