chore: apply changes

storipress · Dec 20, 2023 · 1a23dbc · 1a23dbc
1 parent 55f8a96
commit 1a23dbc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 35 deletions.
diff --git a/src/Requests/Media.php b/src/Requests/Media.php
@@ -40,19 +40,9 @@ public function list(): array
      */
     public function create(UploadedFile $file, array $arguments): MediaObject
     {
-        $uri = sprintf('/media?%s', http_build_query($arguments));
-
-        $data = $this->request(
-            method: 'post',
-            path: $uri,
-            options: [
-                'file' => [
-                    'name' => $file->getFilename(),
-                    'resource' => $file->getContent(),
-                    'mime' => $file->getMimeType(),
-                ],
-            ],
-        );
+        $arguments['file'] = $file;
+
+        $data = $this->request('post', '/media', $arguments);
 
         if (is_array($data)) {
             throw $this->unexpectedValueException();

diff --git a/src/Requests/Request.php b/src/Requests/Request.php
@@ -5,6 +5,7 @@
 namespace Storipress\WordPress\Requests;
 
 use Illuminate\Http\Client\Response;
+use Illuminate\Http\UploadedFile;
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Validator;
 use stdClass;
@@ -18,7 +19,6 @@
 use Storipress\WordPress\Exceptions\NotFoundException;
 use Storipress\WordPress\Exceptions\TermExistsException;
 use Storipress\WordPress\Exceptions\UnauthorizedException;
-use Storipress\WordPress\Exceptions\UnexpectedResourceException;
 use Storipress\WordPress\Exceptions\UnexpectedValueException;
 use Storipress\WordPress\Exceptions\UnknownException;
 use Storipress\WordPress\Exceptions\WordPressException;
@@ -57,27 +57,8 @@ protected function request(
             $http->withUserAgent($this->app->userAgent());
         }
 
-        if (isset($options['file'])) {
-            $filename = data_get($options, 'file.name');
-
-            $resource = data_get($options, 'file.resource');
-
-            $mime = data_get($options, 'file.mime');
-
-            if (!is_string($filename) || !is_string($resource) || !is_string($mime)) {
-                throw new UnexpectedResourceException(WordPressError::from((object) [
-                    'code' => '400',
-                    'message' => 'Unexpected resource value.',
-                    'data' => (object) [
-                        'file' => $options['file'],
-                    ],
-                ]), 400);
-            }
-
-            $contentDisposition = sprintf('attachment; filename="%s"', $filename);
-
-            $http->withHeader('Content-Disposition', $contentDisposition)
-                ->withBody($resource, $mime);
+        if (isset($options['file']) && $options['file'] instanceof UploadedFile) {
+            $http->attach('file', $options['file']->getContent(), $options['file']->getClientOriginalName());
 
             unset($options['file']);
         }