Some minor refactoring (#129)

ankitpokhrel · Jan 15, 2019 · caf4da8 · caf4da8
1 parent c049008
commit caf4da8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/src/Cache/FileStore.php b/src/Cache/FileStore.php
@@ -216,7 +216,7 @@ public function keys() : array
         $contents = $this->getCacheContents();
 
         if (is_array($contents)) {
-            return array_keys($this->getCacheContents());
+            return array_keys($contents);
         }
 
         return [];

diff --git a/src/Commands/ExpirationCommand.php b/src/Commands/ExpirationCommand.php
@@ -55,7 +55,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             Config::set($config);
         }
 
-        $this->server = new TusServer(CacheFactory::make($input->getArgument('cache-adapter')));
+        $cacheAdapter = $input->getArgument('cache-adapter') ?? 'file';
+
+        $this->server = new TusServer(CacheFactory::make($cacheAdapter));
 
         $deleted = $this->server->handleExpiration();
 

diff --git a/src/Request.php b/src/Request.php
@@ -70,8 +70,8 @@ public function allowedHttpVerbs() : array
     /**
      * Retrieve a header from the request.
      *
-     * @param  string            $key
-     * @param  string|array|null $default
+     * @param  string               $key
+     * @param  string|string[]|null $default
      *
      * @return string|null
      */

diff --git a/src/Tus/Server.php b/src/Tus/Server.php
@@ -420,12 +420,12 @@ protected function handleConcatenation(string $fileName, string $filePath) : Htt
 
         // Verify checksum.
         $checksum = $this->getServerChecksum($filePath);
-        $file->setChecksum($checksum);
 
         if ($checksum !== $this->getClientChecksum()) {
             return $this->response->send(null, self::HTTP_CHECKSUM_MISMATCH);
         }
 
+        $file->setChecksum($checksum);
         $this->cache->set($uploadKey, $file->details() + ['upload_type' => self::UPLOAD_TYPE_FINAL]);
 
         // Cleanup.

diff --git a/tests/Tus/ServerTest.php b/tests/Tus/ServerTest.php
@@ -1350,12 +1350,6 @@ public function it_throws_460_for_checksum_mismatch_in_concatenation_request()
             ->once()
             ->with($key)
             ->andReturnSelf();
-
-        $fileMock
-            ->shouldReceive('setChecksum')
-            ->once()
-            ->with($checksum)
-            ->andReturnSelf();
 
         $response = $this->tusServerMock->handleConcatenation($fileName, $filePath . $fileName);