self review feedback

Author: lsochaSopamo

src/Uploads/AzureBlockBlobChunkWriteHandler.php

@@ -41,9 +41,9 @@ public function store(ChunkUploadRequest $chunkUploadRequest, string $content):
             return;
         }
 
-        $contentType = $manifest->contentType() ?? 'application/octet-stream';
+        $fileContentType = $manifest->fileContentType() ?? 'application/octet-stream';
         $options = new CommitBlockListOptions(
-            new BlobHttpHeaders(contentType: $contentType)
+            new BlobHttpHeaders(contentType: $fileContentType)
         );
         $blockBlobClient->commitBlockList($chunkCollection->orderedReferences(), $options);
 

src/Uploads/AzureChunkManifest.php

@@ -10,17 +10,17 @@ final class AzureChunkManifest
     private function __construct(
         private int $uploadLength,
         private array $partsByOffset,
-        private readonly ?string $contentType
+        private readonly ?string $fileContentType
     ) {
     }
 
     /**
      * Null means that initialization did not supply a file MIME type.
      * Older manifests also omit it; Azure then uses application/octet-stream.
      */
-    public static function empty(?string $contentType = null): self
+    public static function empty(?string $fileContentType = null): self
     {
-        return new self(0, [], $contentType);
+        return new self(0, [], $fileContentType);
     }
 
     public static function fromJson(string $json): self
@@ -37,11 +37,11 @@ public static function fromJson(string $json): self
             throw new \RuntimeException('Invalid Azure block blob chunk upload manifest.');
         }
 
-        $contentType = $decoded['content_type'] ?? null;
-        if ($contentType !== null && !is_string($contentType)) {
+        $fileContentType = $decoded['content_type'] ?? null;
+        if ($fileContentType !== null && !is_string($fileContentType)) {
             throw new \RuntimeException('Invalid Azure block blob content type.');
         }
-        $manifest = new self($uploadLength, [], $contentType);
+        $manifest = new self($uploadLength, [], $fileContentType);
 
         foreach ($chunks as $chunk) {
             if (!is_array($chunk)) {
@@ -87,9 +87,9 @@ public function uploadLength(): int
         return $this->uploadLength;
     }
 
-    public function contentType(): ?string
+    public function fileContentType(): ?string
     {
-        return $this->contentType;
+        return $this->fileContentType;
     }
 
     /**
@@ -118,8 +118,8 @@ public function toJson(): string
                 $this->parts()
             ),
         ];
-        if ($this->contentType !== null) {
-            $payload['content_type'] = $this->contentType;
+        if ($this->fileContentType !== null) {
+            $payload['content_type'] = $this->fileContentType;
         }
 
         $json = json_encode($payload);

src/Uploads/TemporaryUploadService.php

@@ -43,12 +43,12 @@ public function storeUploadedFile(UploadedFile $file): ?string
     public function initializeChunkUpload(array|string|null $uploadName, ?string $fileContentType = null): string
     {
         $fileLocation = $this->uploadPathResolver->buildChunkInitializationPath($uploadName);
-        $this->storeAzureContentType($fileLocation, $fileContentType);
+        $this->storeAzureFileContentType($fileLocation, $fileContentType);
 
         return $this->serverIdCodec->encode($fileLocation);
     }
 
-    private function storeAzureContentType(string $filePath, ?string $fileContentType): void
+    private function storeAzureFileContentType(string $filePath, ?string $fileContentType): void
     {
         if ($fileContentType === null) {
             return;

tests/Feature/AzureOssChunkUploadTest.php

@@ -64,22 +64,22 @@ public static function contentTypes(): array
     }
 
     #[DataProvider('contentTypes')]
-    public function test_azure_commit_uses_the_file_mime_type_or_binary_default(?string $contentType, ?string $expectedContentType): void
+    public function test_azure_commit_uses_the_file_mime_type_or_binary_default(?string $requestContentType, ?string $expectedFileContentType): void
     {
         $headers = ['Upload-Name' => 'manual.pdf'];
-        if ($contentType !== null) {
-            $headers['Content-Type'] = $contentType;
+        if ($requestContentType !== null) {
+            $headers['Content-Type'] = $requestContentType;
         }
         $response = $this->post('/filepond/api/process', ['file' => ['{}']], $headers)->assertOk();
         $id = $response->getContent();
         $path = app(Filepond::class)->getPathFromServerId($id);
         $manifestPath = config('filepond.chunks_path').'/'.sha1($path).'/manifest.json';
-        $this->assertSame($expectedContentType !== null, $this->storage->exists($manifestPath));
+        $this->assertSame($expectedFileContentType !== null, $this->storage->exists($manifestPath));
 
         $this->sendChunk($id, '%PDF', 0, 4)->assertNoContent();
         $requests = $this->azureRequests();
         $headers = array_change_key_case($requests[1]['headers']);
-        $this->assertSame($expectedContentType ?? 'application/octet-stream', $headers['x-ms-blob-content-type'] ?? null);
+        $this->assertSame($expectedFileContentType ?? 'application/octet-stream', $headers['x-ms-blob-content-type'] ?? null);
         $this->assertSame([], $this->storage->allFiles(config('filepond.chunks_path')));
     }