Merge pull request #265 from wowkaster/

B2 sync fix bug

Author: sebastianfeldmann

src/Backup/Sync/BackblazeS3.php

@@ -19,6 +19,7 @@
  */
 class BackblazeS3 extends AmazonS3v3
 {
+
     /**
      * Create the Backblaze AWS client.
      *
@@ -44,8 +45,8 @@ protected function createClient() : S3Client
      *
      * @return string
      */
-    private function createEndpoint()
+    protected function createEndpoint()
     {
-        return strtr('https://s3.{region}.backblazeb2.com', '{region}', $this->region);
+        return str_replace('{region}', $this->region, 'https://s3.{region}.backblazeb2.com');
     }
 }

tests/phpbu/Backup/Sync/BackblazeS3Test.php

@@ -24,8 +24,8 @@ class BackblazeS3Test extends TestCase
      */
     public function testSetUpOk()
     {
-        $amazonS3 = new BackblazeS3();
-        $amazonS3->setup([
+        $b2 = new BackblazeS3();
+        $b2->setup([
             'key'    => 'dummy-key',
             'secret' => 'dummy-secret',
             'bucket' => 'dummy-bucket',
@@ -36,4 +36,23 @@ public function testSetUpOk()
         $this->assertTrue(true, 'no exception should occur');
     }
 
-}
+    public function testEndpoint()
+    {
+        $b2 = new BackblazeS3();
+        $b2->setup([
+            'key'    => 'dummy-key',
+            'secret' => 'dummy-secret',
+            'bucket' => 'dummy-bucket',
+            'region' => 'dummy-region',
+            'path'   => '/'
+        ]);
+
+        $createEndpointPrivateMethod = function () {
+            return $this->createEndpoint();
+        };
+
+        $createEndpointClosure = $createEndpointPrivateMethod->bindTo($b2, $b2);
+
+        $this->assertEquals($createEndpointClosure(), 'https://s3.dummy-region.backblazeb2.com');
+    }
+}