.github/ISSUE_TEMPLATE/BUG.yml

@@ -18,9 +18,6 @@ body:
       label: Version
       description: What version of Spaces-API is this occuring on? Versions below 3 will not be fixed. Please upgrade.
       options:
-        - 3.5.0
-        - 3.4.0
-        - 3.3.0
         - 3.2.0
         - 3.1.0
         - 3.0.0

README.md

@@ -1,7 +1,6 @@
-# This library is deprecated
-We recommend using the [official SDK](https://github.com/DigitalOceanPHP/Client) or the [Laravel package](https://github.com/GrahamCampbell/Laravel-DigitalOcean)
+![Spaces-API](https://imgur.com/NYNsQyl.png "Devang Srivastava's Spaces-API")
 
-All issues will be closed and new PRs will not be accepted
+PHP library for accessing Digital Ocean spaces
 
 ## Installation
 Install via composer
@@ -33,9 +32,6 @@ $file2url = $file2->getSignedURL("2 hours");
 // Make a copy
 $file3 = $file2->copy('remote-file-3.txt');
 
-// Move or rename a file
-$file2->move('new-filename.txt')
-
 // Make a file public and get the URL
 $file3->makePublic();
 $file3url = $file3->getURL();

SpacesAPI/Space.php

@@ -303,19 +303,15 @@ class Space
      *
      * @param string $filepath The path to the file, including the filename. Relative and absolute paths are accepted.
      * @param string|null $filename The remote filename. If `null`, the local filename will be used.
-     * @param string|null $mimeType The file mime type to pass as ContentType for the file (e.g. 'image/jpeg').
-     * @param bool $private True for the file to be private, false to allow public access.
      *
      * @return \SpacesAPI\File
      */
-    public function uploadFile(string $filepath, ?string $filename = null, ?string $mimeType = null, bool $private = true): File
+    public function uploadFile(string $filepath, ?string $filename = null): File
     {
         $this->s3->putObject([
                                  'Bucket' => $this->name,
                                  'Key' => ($filename) ?: basename($filepath),
                                  'SourceFile' => $filepath,
-                                 'ContentType' => $mimeType,
-                                 'ACL' => ($private) ? 'private' : 'public-read'
                              ]);
 
         return new File($this, ($filename) ?: basename($filepath), [], false);
@@ -325,14 +321,13 @@ class Space
      * Get an instance of \SpacesAPI\File for a given filename
      *
      * @param string $filename
-     * @package bool $validate
      *
      * @return \SpacesAPI\File
      * @throws \SpacesAPI\Exceptions\FileDoesntExistException Thrown if the file doesn't exist
      */
-    public function file(string $filename, bool $validate = true): File
+    public function file(string $filename): File
     {
-        return new File($this, $filename, [], $validate);
+        return new File($this, $filename);
     }
 
     /**

SpacesAPI/Spaces.php

@@ -36,7 +36,7 @@ class Spaces
     {
         $this->s3 = new S3Client([
                                      "version" => "latest",
-                                     "region" => $region,
+                                     "region" => "us-east-1",
                                      "endpoint" => "https://$region.$host",
                                      "credentials" => ["key" => $accessKey, "secret" => $secretKey],
                                      "ua_append" => "SociallyDev-Spaces-API/2",

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "sociallydev/spaces-api",
   "description": "Library for accessing Digital Ocean spaces",
-  "version":"3.6.1",
+  "version":"3.4.0",
   "type": "library",
   "license": "MIT",
   "authors": [

docs/Space.md

@@ -180,7 +180,7 @@ Recursively download an entire directory.
 **Description**
 
 ```php
-public file (string $filename, bool $validate = true)
+public file (string $filename)
 ```
 
 Get an instance of \SpacesAPI\File for a given filename
@@ -190,8 +190,6 @@ Get an instance of \SpacesAPI\File for a given filename
 **Parameters**
 
 * `(string) $filename`
-* `(bool) $validate`
-: Whether to validate the file exits. Defaults to `true`
 
 **Return Values**
 
@@ -465,7 +463,7 @@ Recursively upload an entire directory
 **Description**
 
 ```php
-public uploadFile (string $filepath, string|null $filename = null, string|null $mimeType = null, bool $private = true)
+public uploadFile (string $filepath, string|null $filename = null)
 ```
 
 Upload a file
@@ -478,10 +476,6 @@ Upload a file
 : The path to the file, including the filename. Relative and absolute paths are accepted.
 * `(string|null) $filename`
 : The remote filename. If `null`, the local filename will be used. Default `null`
-* `(string|null) $mimeType`
-: The files mimeType. If `null` the mimeType is inferred from the file by DigitalOcean Spaces. Default `null`
-* `(bool)` $private
-: If `true` then the file is private, if `false` the file is publicly available. Default `true`
 
 **Return Values**
 

tests/SpaceTest.php

@@ -86,14 +86,6 @@ class SpaceTest extends TestCase
         $this->assertInstanceOf(File::class, $file);
     }
 
-    public function testCanUploadFileWithMimeType()
-    {
-        $tmpFile = tempnam(sys_get_temp_dir(), 'spaces-test');
-        $file = self::$space->uploadFile($tmpFile, 'upload-test.txt', 'text/plain');
-        $this->assertInstanceOf(File::class, $file);
-        $this->assertEquals('text/plain', $file->content_type);
-    }
-
     /**
      * @depends testCanUploadText
      * @depends testCanUploadFile