Remove unused action argument from progress callback

Author: phit

app/Services/SftpService.php

@@ -135,7 +135,7 @@ public function syncServerDirectory(Server $server, string $localPath, string $r
                 $serverConfig,
                 $localPath,
                 $remotePath,
-                Cache::pull($chunkKey) ?? [],
+                app(self::class)->pullChunkFromCache($chunkKey),
                 $worker,
                 $releaseId,
             );
@@ -195,7 +195,7 @@ public function syncDirectory(SFTP $sftp, string $localPath, string $remotePath,
             }
 
             if ($onProgress) {
-                $onProgress('upload', $relative);
+                $onProgress($relative);
             }
         }
 
@@ -244,7 +244,7 @@ protected function deleteRemovedFiles(SFTP $sftp, string $localPath, string $rem
 
             if (! $disk->exists($localItem)) {
                 if ($onProgress) {
-                    $onProgress('delete', $currentRelative);
+                    $onProgress($currentRelative);
                 }
                 $sftp->delete($remoteItem, true);
             } elseif ($type === 2) { // NET_SFTP_TYPE_DIRECTORY
@@ -284,6 +284,20 @@ protected function ensureLocalDir(string $dir): void
         }
     }
 
+    /**
+     * @return array<int, string>
+     */
+    public function pullChunkFromCache(string $key): array
+    {
+        $chunk = Cache::pull($key);
+
+        if (! is_array($chunk)) {
+            return [];
+        }
+
+        return array_values(array_filter($chunk, 'is_string'));
+    }
+
     private function normalizeLocalPath(string $path, string $diskRoot): string
     {
         $normalized = str_replace('\\', '/', $path);
@@ -388,7 +402,7 @@ protected function buildProgressLogger(?int $releaseId, int $worker, array $rela
         $logEveryFiles = max(1, $this->requireInt(config('services.sftp.progress_every_files', 100), 'SFTP progress file interval'));
         $logEverySeconds = max(0.0, $this->requireFloat(config('services.sftp.progress_every_seconds', 3), 'SFTP progress time interval'));
 
-        return static function (string $action, string $relativePath) use ($releaseId, $worker, $totalFiles, &$completedFiles, &$lastLoggedAt, $logEveryFiles, $logEverySeconds): void {
+        return static function (string $relativePath) use ($releaseId, $worker, $totalFiles, &$completedFiles, &$lastLoggedAt, $logEveryFiles, $logEverySeconds): void {
             $completedFiles++;
             $now = microtime(true);
 

tests/Unit/Services/SftpServiceTest.php

@@ -549,9 +549,9 @@ public function test_upload_relative_file_batch_logs_throttled_progress(): void
             ->once()
             ->with($sftp, 'sync', 'remote/path', [], Mockery::type('callable'), ['alpha.txt', 'beta.txt', 'gamma.txt'])
             ->andReturnUsing(function ($sftp, string $localPath, string $remotePath, array $skipPatterns, callable $onProgress, array $relativeFiles): int {
-                $onProgress('upload', 'alpha.txt');
-                $onProgress('upload', 'beta.txt');
-                $onProgress('upload', 'gamma.txt');
+                $onProgress('alpha.txt');
+                $onProgress('beta.txt');
+                $onProgress('gamma.txt');
 
                 return 3;
             });