update

recca0120 · Apr 30, 2023 · ebe966d · ebe966d
1 parent 5c0886d
commit ebe966d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "illuminate/http": "^8.0|^9.0|^10.0"
     },
     "require-dev": {
+        "roave/security-advisories": "dev-latest",
         "illuminate/config": "^8.0|^9.0|^10.0",
         "illuminate/container": "^8.0|^9.0|^10.0",
         "mikey179/vfsstream": "^1.6",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    backupGlobals="false" bootstrap="tests/bootstrap.php"
+    backupGlobals="false"
+    bootstrap="tests/bootstrap.php"
     colors="true"
     processIsolation="false"
     stopOnError="false"
     stopOnFailure="false"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
 >
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+    <coverage/>
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Api.php b/src/Api.php
@@ -54,7 +54,7 @@ public function path(): string
         return rtrim($this->config['path'], '/').'/';
     }
 
-    public function makeDirectory(string $path): Api
+    public function makeDirectory(string $path): ApiContract
     {
         if ($this->files->isDirectory($path) === false) {
             $this->files->makeDirectory($path, 0777, true, true);
@@ -63,7 +63,7 @@ public function makeDirectory(string $path): Api
         return $this;
     }
 
-    public function cleanDirectory(string $path): Api
+    public function cleanDirectory(string $path): ApiContract
     {
         $time = time();
         $maxFileAge = 3600;
@@ -90,7 +90,7 @@ public function receive(string $name)
             : $this->request->file($name);
     }
 
-    public function deleteUploadedFile($uploadedFile)
+    public function deleteUploadedFile($uploadedFile): ApiContract
     {
         $file = $uploadedFile->getPathname();
         if ($this->files->isFile($file) === true) {

diff --git a/src/Contracts/Api.php b/src/Contracts/Api.php
@@ -13,15 +13,9 @@ public function domain(): string;
 
     public function path(): string;
 
-    /**
-     * @return self
-     */
-    public function makeDirectory(string $path);
+    public function makeDirectory(string $path): Api;
 
-    /**
-     * @return self
-     */
-    public function cleanDirectory(string $path);
+    public function cleanDirectory(string $path): Api;
 
     /**
      * @return UploadedFile|SymfonyUploadedFile
@@ -32,9 +26,8 @@ public function receive(string $name);
 
     /**
      * @param  UploadedFile|SymfonyUploadedFile  $uploadedFile
-     * @return self
      */
-    public function deleteUploadedFile($uploadedFile);
+    public function deleteUploadedFile($uploadedFile): Api;
 
     public function completedResponse(JsonResponse $response): JsonResponse;
 }
diff --git a/tests/ReceiverTest.php b/tests/ReceiverTest.php
@@ -32,15 +32,14 @@ public function testReceive(): void
         $uploadedFile->allows('getBasename')->once()->andReturn($basename = 'foo');
         $uploadedFile->allows('getMimeType')->once()->andReturn($mimeType = 'foo');
         $uploadedFile->allows('getSize')->once()->andReturn($size = 1000);
-        $uploadedFile->allows('move')->once()->with($path,
-            $filename = md5($basename).'.'.strtolower($clientOriginalExtension));
+        $uploadedFile->allows('move')->once()
+            ->with($path, $filename = md5($basename).'.'.strtolower($clientOriginalExtension));
 
         $api->allows('deleteUploadedFile')->once()->with($uploadedFile)->andReturnSelf();
-        $api->allows('completedResponse')->once()->with(m::type(JsonResponse::class))->andReturnUsing(function (
-            $response
-        ) {
-            return $response;
-        });
+        $api->allows('completedResponse')->once()
+            ->with(m::type(JsonResponse::class))->andReturnUsing(function ($response) {
+                return $response;
+            });
 
         $response = $receiver->receive($inputName);
         $this->assertSame([
@@ -63,12 +62,11 @@ public function testReceiveCustomCallback(): void
         $api->allows('deleteUploadedFile')->once()->with($uploadedFile)->andReturnSelf();
         $api->allows('completedResponse')->once()->with($response)->andReturn($response);
 
-        $this->assertSame(
-            $response,
-            $receiver->receive($inputName, function () use ($response) {
-                return $response;
-            })
-        );
+        $callback = function () use ($response) {
+            return $response;
+        };
+
+        $this->assertSame($response, $receiver->receive($inputName, $callback));
     }
 
     public function testReceiveAndThrowChunkedResponseException(): void
@@ -77,6 +75,7 @@ public function testReceiveAndThrowChunkedResponseException(): void
         $inputName = 'foo';
         $api->allows('receive')->once()->with($inputName)->andThrow(new ChunkedResponseException());
         $callback = function () {
+            return new Response();
         };
 
         $this->assertInstanceOf(Response::class, $receiver->receive($inputName, $callback));