Merge branch 'master' into 6.0

Author: sebastianfeldmann

composer.json

@@ -48,7 +48,7 @@
     "ext-dom": "*",
     "ext-json": "*",
     "ext-spl": "*",
-    "sebastian/environment": "^3.0|^4.0",
+    "sebastian/environment": "^3.0|^4.0|^5.0",
     "sebastianfeldmann/cli": "^3.1",
     "phpmailer/phpmailer": "^6.0"
   },

src/Backup/Sync/BackblazeS3.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace phpbu\App\Backup\Sync;
+
+use Aws\S3\S3Client;
+
+/**
+ * Backblaze Sync
+ *
+ * Docs example
+ * https://help.backblaze.com/hc/en-us/articles/360046980814-Using-the-AWS-SDK-for-PHP-with-Backblaze-B2-Cloud-Storage
+ *
+ * @package    phpbu
+ * @subpackage Backup
+ * @author     Vladimir Konchakovsky <vk@etradeua.com>
+ * @copyright  Vladimir Konchakovsky <vk@etradeua.com>
+ * @license    https://opensource.org/licenses/MIT The MIT License (MIT)
+ * @link       http://phpbu.de/
+ */
+class BackblazeS3 extends AmazonS3v3
+{
+    /**
+     * Create the Backblaze AWS client.
+     *
+     * @return \Aws\S3\S3Client
+     */
+    protected function createClient() : S3Client
+    {
+        $endpoint = $this->createEndpoint();
+
+        return new S3Client([
+            'endpoint'    => $endpoint,
+            'region'      => $this->region,
+            'version'     => 'latest',
+            'credentials' => [
+                'key'    => $this->key,
+                'secret' => $this->secret,
+            ]
+        ]);
+    }
+
+    /**
+     * Generate Backblaze enpoint
+     *
+     * @return string
+     */
+    private function createEndpoint()
+    {
+        return strtr('https://s3.{region}.backblazeb2.com', '{region}', $this->region);
+    }
+}

src/Factory.php

@@ -69,6 +69,7 @@ class Factory
             'amazons3'    => '\\phpbu\\App\\Backup\\Sync\\AmazonS3v3',
             'amazons3-v3' => '\\phpbu\\App\\Backup\\Sync\\AmazonS3v3',
             'amazons3-v2' => '\\phpbu\\App\\Backup\\Sync\\AmazonS3v2',
+            'backblazes3' => '\\phpbu\\App\\Backup\\Sync\\BackblazeS3',
             'azureblob'   => '\\phpbu\\App\\Backup\\Sync\\AzureBlob',
             'dropbox'     => '\\phpbu\\App\\Backup\\Sync\\Dropbox',
             'ftp'         => '\\phpbu\\App\\Backup\\Sync\\Ftp',

src/Runner/Backup.php

@@ -5,7 +5,7 @@
 use phpbu\App\Backup\Source;
 use phpbu\App\Exception;
 use phpbu\App\Backup\Cleaner;
-use phpbu\App\Backup\Collector\Local;
+use phpbu\App\Backup\Collector;
 use phpbu\App\Backup\Crypter;
 use phpbu\App\Backup\Sync;
 use phpbu\App\Backup\Target;
@@ -60,7 +60,6 @@ public function run(Configuration $configuration) : Result
             // setup target and collector, reset failure state
             $target        = $this->factory->createTarget($backup->getTarget());
             $source        = $this->factory->createSource($backup->getSource()->type, $backup->getSource()->options);
-            $collector     = new Local($target);
             $this->failure = false;
 
             try {
@@ -76,7 +75,7 @@ public function run(Configuration $configuration) : Result
                  *   / /__/ _  / _// /__/ ,< _\ \
                  *   \___/_//_/___/\___/_/|_/___/
                  */
-                $this->executeChecks($backup, $target, $collector);
+                $this->executeChecks($backup, $target, new Collector\Local($target));
 
                 /*     __________  _____  ______
                  *    / ___/ _ \ \/ / _ \/_  __/
@@ -97,7 +96,7 @@ public function run(Configuration $configuration) : Result
                  *   / /__/ /__/ _// __ |/    / /_/ / ___/
                  *   \___/____/___/_/ |_/_/|_/\____/_/
                  */
-                $this->executeCleanup($backup, $target, $collector);
+                $this->executeCleanup($backup, $target, new Collector\Local($target));
             } catch (\Exception $e) {
                 $this->result->debug('exception: ' . $e->getMessage());
                 $this->result->addError($e);
@@ -136,7 +135,7 @@ protected function executeSource(Configuration\Backup $conf, Target $target, Sou
      * @param  \phpbu\App\Backup\Collector\Local $collector
      * @throws \Exception
      */
-    protected function executeChecks(Configuration\Backup $backup, Target $target, Local $collector)
+    protected function executeChecks(Configuration\Backup $backup, Target $target, Collector\Local $collector)
     {
         foreach ($backup->getChecks() as $config) {
             try {
@@ -221,7 +220,7 @@ protected function executeSyncs(Configuration\Backup $backup, Target $target)
      * @param  \phpbu\App\Backup\Collector\Local $collector
      * @throws \phpbu\App\Exception
      */
-    protected function executeCleanup(Configuration\Backup $backup, Target $target, Local $collector)
+    protected function executeCleanup(Configuration\Backup $backup, Target $target, Collector\Local $collector)
     {
         if ($backup->hasCleanup()) {
             /* @var \phpbu\App\Configuration\Backup\Cleanup $config */

tests/phpbu/Backup/Sync/BackblazeS3Test.php

@@ -0,0 +1,39 @@
+<?php
+namespace phpbu\App\Backup\Sync;
+
+use phpbu\App\BaseMockery;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * BackblazeS3Test
+ *
+ * @package    phpbu
+ * @subpackage tests
+ * @author     Vladimir Konchakovsaky <vk@etradeua.com>
+ * @copyright  Vladimir Konchakovsaky <vk@etradeua.com>
+ * @license    https://opensource.org/licenses/MIT The MIT License (MIT)
+ * @link       http://www.phpbu.de/
+ */
+class BackblazeS3Test extends TestCase
+{
+
+    use BaseMockery;
+
+    /**
+     * Tests AmazonS3::setUp
+     */
+    public function testSetUpOk()
+    {
+        $amazonS3 = new BackblazeS3();
+        $amazonS3->setup([
+            'key'    => 'dummy-key',
+            'secret' => 'dummy-secret',
+            'bucket' => 'dummy-bucket',
+            'region' => 'dummy-region',
+            'path'   => '/'
+        ]);
+
+        $this->assertTrue(true, 'no exception should occur');
+    }
+
+}