Merge branch 'develop'

Jelle-S · Jelle-S · commit bee12f917668 · 2023-04-13T11:39:15.000+02:00
Merge details: commit 7cf826c Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Thu Apr 13 11:02:27 2023 Remove stackspace adapter commit f4bad67 Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Thu Apr 13 10:20:22 2023 Update to our own fork of backup-manager The backup-manager/backup-manager package seems abandoned. commit 33166b8 Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Tue Nov 8 15:18:40 2022 Add documentation for the db config event
diff --git a/README.md b/README.md
@@ -274,6 +274,35 @@ class RoboFile extends \Robo\Tasks
 
 `vendor/bin/robo digipolis:database-backup [DATABASE] [OPTIONS]`
 
+#### Use events for default configuration
+
+Implement an [on-event hook](https://github.com/consolidation/annotated-command#on-event-hook)
+for the digipolis-db-config event to return the datbase config
+[as specified above](#database-configuration-options) used by this command. For
+example:
+
+```php
+/**
+ * @hook on-event digipolis-db-config
+ */
+public function defaultDbConfig()
+{
+    $dbConfig = [];
+    $dbConfig['default'] = [
+        'type' => 'mysql',
+        'host' => 'localhost',
+        'port' => '3306',
+        'user' => 'root',
+        'pass' => '$up3r$3cr3tP@$$w0rD',
+        'database' => 'my_database',
+        'structureTables' => [],
+        'extra' => '--skip-add-locks --no-tablespaces',
+    ];
+
+    return $dbConfig;
+}
+```
+
 #### Arguments
 
 ##### DATABASE
@@ -313,6 +342,35 @@ The destination type (e.g. `local`, `dropbox`, `ftp`). Defaults to `local`.
 
 `vendor/bin/robo digipolis:database-restore [DATABASE] [OPTIONS]`
 
+#### Use events for default configuration
+
+Implement an [on-event hook](https://github.com/consolidation/annotated-command#on-event-hook)
+for the digipolis-db-config event to return the datbase config
+[as specified above](#database-configuration-options) used by this command. For
+example:
+
+```php
+/**
+ * @hook on-event digipolis-db-config
+ */
+public function defaultDbConfig()
+{
+    $dbConfig = [];
+    $dbConfig['default'] = [
+        'type' => 'mysql',
+        'host' => 'localhost',
+        'port' => '3306',
+        'user' => 'root',
+        'pass' => '$up3r$3cr3tP@$$w0rD',
+        'database' => 'my_database',
+        'structureTables' => [],
+        'extra' => '--skip-add-locks --no-tablespaces',
+    ];
+
+    return $dbConfig;
+}
+```
+
 #### Arguments
 
 ##### DATABASE
diff --git a/composer.json b/composer.json
@@ -7,8 +7,7 @@
     "require": {
         "consolidation/robo": "^3.0",
         "phpseclib/phpseclib": "^3.0",
-        "backup-manager/backup-manager": "^3",
-        "league/flysystem": "^1",
+        "district09/backup-manager": "^4.0",
         "gordalina/cachetool": "^8",
         "digipolisgent/command-builder": "^1.2",
         "digipolisgent/robo-digipolis-general": "^2.0.0"
diff --git a/src/BackupManager/Adapter/BackupManagerAdapter.php b/src/BackupManager/Adapter/BackupManagerAdapter.php
@@ -2,14 +2,14 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Adapter;
 
-use BackupManager\Manager;
+use District09\BackupManager\Manager;
 
 class BackupManagerAdapter implements BackupManagerAdapterInterface
 {
     /**
      * The backup manager.
      *
-     * @var \BackupManager\Manager
+     * @var \District09\BackupManager\Manager
      */
     protected $manager;
 
diff --git a/src/BackupManager/Adapter/BackupProcedureAdapter.php b/src/BackupManager/Adapter/BackupProcedureAdapter.php
@@ -2,7 +2,7 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Adapter;
 
-use BackupManager\Procedures\BackupProcedure;
+use District09\BackupManager\Procedures\BackupProcedure;
 
 class BackupProcedureAdapter implements BackupProcedureAdapterInterface
 {
diff --git a/src/BackupManager/Adapter/BackupProcedureAdapterInterface.php b/src/BackupManager/Adapter/BackupProcedureAdapterInterface.php
@@ -10,7 +10,7 @@ interface BackupProcedureAdapterInterface
      *
      * @param string $database
      *   The database name to backup.
-     * @param \BackupManager\Filesystems\Destination[] $destinations
+     * @param \District09\BackupManager\Filesystems\Destination[] $destinations
      *   The destinations to backup to.
      * @param string $compression
      *   The compression to use for the backup.
diff --git a/src/BackupManager/Adapter/RestoreProcedureAdapter.php b/src/BackupManager/Adapter/RestoreProcedureAdapter.php
@@ -2,7 +2,7 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Adapter;
 
-use BackupManager\Procedures\RestoreProcedure;
+use District09\BackupManager\Procedures\RestoreProcedure;
 
 class RestoreProcedureAdapter implements RestoreProcedureAdapterInterface
 {
diff --git a/src/BackupManager/Compressors/TarCompressor.php b/src/BackupManager/Compressors/TarCompressor.php
@@ -2,7 +2,7 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Compressors;
 
-use BackupManager\Compressors\Compressor;
+use District09\BackupManager\Compressors\Compressor;
 
 class TarCompressor implements Compressor
 {
diff --git a/src/BackupManager/Databases/MysqlDatabase.php b/src/BackupManager/Databases/MysqlDatabase.php
@@ -2,7 +2,7 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Databases;
 
-use BackupManager\Databases\MysqlDatabase as Mysql;
+use District09\BackupManager\Databases\MysqlDatabase as Mysql;
 
 class MysqlDatabase extends Mysql
 {
diff --git a/src/BackupManager/Factory/BackupManagerFactory.php b/src/BackupManager/Factory/BackupManagerFactory.php
@@ -2,7 +2,7 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Factory;
 
-use BackupManager\Manager;
+use District09\BackupManager\Manager;
 use DigipolisGent\Robo\Task\Deploy\BackupManager\Adapter\BackupManagerAdapter;
 
 class BackupManagerFactory implements BackupManagerFactoryInterface
diff --git a/src/BackupManager/Factory/CompressorProviderFactory.php b/src/BackupManager/Factory/CompressorProviderFactory.php
@@ -2,9 +2,9 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Factory;
 
-use BackupManager\Compressors\CompressorProvider;
-use BackupManager\Compressors\GzipCompressor;
-use BackupManager\Compressors\NullCompressor;
+use District09\BackupManager\Compressors\CompressorProvider;
+use District09\BackupManager\Compressors\GzipCompressor;
+use District09\BackupManager\Compressors\NullCompressor;
 use DigipolisGent\Robo\Task\Deploy\BackupManager\Compressors\TarCompressor;
 
 class CompressorProviderFactory implements CompressorProviderFactoryInterface
diff --git a/src/BackupManager/Factory/CompressorProviderFactoryInterface.php b/src/BackupManager/Factory/CompressorProviderFactoryInterface.php
@@ -7,7 +7,7 @@ interface CompressorProviderFactoryInterface
     /**
      * Creates a CompressorProvider.
      *
-     * @return \BackupManager\Compressors\CompressorProvider
+     * @return \District09\BackupManager\Compressors\CompressorProvider
      */
     public static function create();
 }
diff --git a/src/BackupManager/Factory/DatabaseProviderFactory.php b/src/BackupManager/Factory/DatabaseProviderFactory.php
@@ -2,9 +2,9 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Factory;
 
-use BackupManager\Config\Config;
-use BackupManager\Databases\DatabaseProvider;
-use BackupManager\Databases\PostgresqlDatabase;
+use District09\BackupManager\Config\Config;
+use District09\BackupManager\Databases\DatabaseProvider;
+use District09\BackupManager\Databases\PostgresqlDatabase;
 use DigipolisGent\Robo\Task\Deploy\BackupManager\Databases\MysqlDatabase;
 
 class DatabaseProviderFactory implements DatabaseProviderFactoryInterface
diff --git a/src/BackupManager/Factory/DatabaseProviderFactoryInterface.php b/src/BackupManager/Factory/DatabaseProviderFactoryInterface.php
@@ -10,7 +10,7 @@ interface DatabaseProviderFactoryInterface
      * @param string|array $dbConfig
      *   Config for the DatabaseProvider. A path to a PHP file or an array.
      *
-     * @return \BackupManager\Databases\DatabaseProvider
+     * @return \District09\BackupManager\Databases\DatabaseProvider
      */
     public static function create($dbConfig);
 }
diff --git a/src/BackupManager/Factory/FilesystemProviderFactory.php b/src/BackupManager/Factory/FilesystemProviderFactory.php
@@ -2,15 +2,14 @@
 
 namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Factory;
 
-use BackupManager\Config\Config;
-use BackupManager\Filesystems\Awss3Filesystem;
-use BackupManager\Filesystems\DropboxFilesystem;
-use BackupManager\Filesystems\FilesystemProvider;
-use BackupManager\Filesystems\FtpFilesystem;
-use BackupManager\Filesystems\GcsFilesystem;
-use BackupManager\Filesystems\LocalFilesystem;
-use BackupManager\Filesystems\RackspaceFilesystem;
-use BackupManager\Filesystems\SftpFilesystem;
+use District09\BackupManager\Config\Config;
+use District09\BackupManager\Filesystems\Awss3Filesystem;
+use District09\BackupManager\Filesystems\DropboxFilesystem;
+use District09\BackupManager\Filesystems\FilesystemProvider;
+use District09\BackupManager\Filesystems\FtpFilesystem;
+use District09\BackupManager\Filesystems\GcsFilesystem;
+use District09\BackupManager\Filesystems\LocalFilesystem;
+use District09\BackupManager\Filesystems\SftpFilesystem;
 
 class FilesystemProviderFactory implements FilesystemProviderFactoryInterface
 {
@@ -32,7 +31,6 @@ public static function create($filesystemConfig)
         $filesystemProvider->add(new DropboxFilesystem());
         $filesystemProvider->add(new FtpFilesystem());
         $filesystemProvider->add(new LocalFilesystem());
-        $filesystemProvider->add(new RackspaceFilesystem());
         $filesystemProvider->add(new SftpFilesystem());
 
         return $filesystemProvider;
diff --git a/src/BackupManager/Factory/FilesystemProviderFactoryInterface.php b/src/BackupManager/Factory/FilesystemProviderFactoryInterface.php
@@ -10,7 +10,7 @@ interface FilesystemProviderFactoryInterface
      * @param string|array $filesystemConfig
      *   Config for the FilesystemProvider. A path to a PHP file or an array.
      *
-     * @return \BackupManager\Filesystems\FilesystemProvider
+     * @return \District09\BackupManager\Filesystems\FilesystemProvider
      */
     public static function create($filesystemConfig);
 }
diff --git a/src/DatabaseBackup.php b/src/DatabaseBackup.php
@@ -2,7 +2,7 @@
 
 namespace DigipolisGent\Robo\Task\Deploy;
 
-use BackupManager\Filesystems\Destination;
+use District09\BackupManager\Filesystems\Destination;
 use DigipolisGent\Robo\Task\Deploy\BackupManager\Factory\BackupManagerFactory;
 use DigipolisGent\Robo\Task\Deploy\BackupManager\Factory\BackupManagerFactoryInterface;
 use Robo\Result;
@@ -34,7 +34,7 @@ class DatabaseBackup extends BaseTask
     /**
      * The destinations to backup to.
      *
-     * @var \BackupManager\Filesystems\Destination[]
+     * @var \District09\BackupManager\Filesystems\Destination[]
      */
     protected $destinations;
 

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Adapter;`
`4`	`4`
`5`		`-use BackupManager\Manager;`
	`5`	`+use District09\BackupManager\Manager;`
`6`	`6`
`7`	`7`	`class BackupManagerAdapter implements BackupManagerAdapterInterface`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* The backup manager.`
`11`	`11`	`*`
`12`		`- * @var \BackupManager\Manager`
	`12`	`+ * @var \District09\BackupManager\Manager`
`13`	`13`	`*/`
`14`	`14`	`protected $manager;`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Adapter;`
`4`	`4`
`5`		`-use BackupManager\Procedures\BackupProcedure;`
	`5`	`+use District09\BackupManager\Procedures\BackupProcedure;`
`6`	`6`
`7`	`7`	`class BackupProcedureAdapter implements BackupProcedureAdapterInterface`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ interface BackupProcedureAdapterInterface`
`10`	`10`	`*`
`11`	`11`	`* @param string $database`
`12`	`12`	`* The database name to backup.`
`13`		`- * @param \BackupManager\Filesystems\Destination[] $destinations`
	`13`	`+ * @param \District09\BackupManager\Filesystems\Destination[] $destinations`
`14`	`14`	`* The destinations to backup to.`
`15`	`15`	`* @param string $compression`
`16`	`16`	`* The compression to use for the backup.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Adapter;`
`4`	`4`
`5`		`-use BackupManager\Procedures\RestoreProcedure;`
	`5`	`+use District09\BackupManager\Procedures\RestoreProcedure;`
`6`	`6`
`7`	`7`	`class RestoreProcedureAdapter implements RestoreProcedureAdapterInterface`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Compressors;`
`4`	`4`
`5`		`-use BackupManager\Compressors\Compressor;`
	`5`	`+use District09\BackupManager\Compressors\Compressor;`
`6`	`6`
`7`	`7`	`class TarCompressor implements Compressor`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DigipolisGent\Robo\Task\Deploy\BackupManager\Databases;`
`4`	`4`
`5`		`-use BackupManager\Databases\MysqlDatabase as Mysql;`
	`5`	`+use District09\BackupManager\Databases\MysqlDatabase as Mysql;`
`6`	`6`
`7`	`7`	`class MysqlDatabase extends Mysql`
`8`	`8`	`{`