Merge branch 'main' into 6.0

sebastianfeldmann · sebastianfeldmann · commit 40563d4cb9b3 · 2024-11-27T19:34:29.000+01:00
diff --git a/phive.xml b/phive.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="captainhook" version="^5.10" location="./tools/captainhook" copy="true" installed="5.23.0"/>
-  <phar name="phpunit" version="^9.4.3" location="./tools/phpunit" copy="true" installed="9.6.19"/>
-  <phar name="phpab" version="^1.20.0" location="./tools/phpab" copy="true" installed="1.29.1"/>
-  <phar name="phpcs" version="^3.5.2" location="./tools/phpcs" copy="true" installed="3.10.1"/>
-  <phar name="phpstan" version="^1.0" location="./tools/phpstan" copy="true" installed="1.11.2"/>
+  <phar name="captainhook" version="^5.10" location="./tools/captainhook" copy="true" installed="5.24.1"/>
+  <phar name="phpunit" version="^9.4.3" location="./tools/phpunit" copy="true" installed="9.6.21"/>
+  <phar name="phpab" version="^1.20.0" location="./tools/phpab" copy="true" installed="1.29.2"/>
+  <phar name="phpcs" version="^3.5.2" location="./tools/phpcs" copy="true" installed="3.11.1"/>
+  <phar name="phpstan" version="^1.0" location="./tools/phpstan" copy="true" installed="1.12.11"/>
 </phive>
diff --git a/src/Backup/Cli.php b/src/Backup/Cli.php
@@ -46,9 +46,9 @@ abstract class Cli
      * Cli constructor.
      *
      * @param \SebastianFeldmann\Cli\Command\Runner $runner
-     * @param int                                   $time
+     * @param int|null                              $time
      */
-    public function __construct(Runner $runner = null, $time = null)
+    public function __construct(Runner $runner = null, ?int $time = null)
     {
         $this->runner = $runner ? : new Runner\Simple(new Symfony());
         $this->time   = $time   ? : time();
diff --git a/src/Backup/Target/Compression/Abstraction.php b/src/Backup/Target/Compression/Abstraction.php
@@ -120,4 +120,12 @@ public function getMimeType() : string
     {
         return $this->mimeType;
     }
+
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->cmd;
+    }
 }
diff --git a/src/Cli/Executable/Abstraction.php b/src/Cli/Executable/Abstraction.php
@@ -1,6 +1,7 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
+use phpbu\App\Cli\Executable;
 use phpbu\App\Util\Cli;
 use SebastianFeldmann\Cli\CommandLine;
 
@@ -15,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.0
  */
-abstract class Abstraction
+abstract class Abstraction implements Executable
 {
     /**
      * Command name.
@@ -106,4 +107,12 @@ public function getCommandPrintable() : string
     {
         return $this->getCommand();
     }
+
+    /**
+     * @return string
+     */
+    public function __toString() : string
+    {
+        return $this->getCommand();
+    }
 }
diff --git a/src/Cli/Executable/Arangodump.php b/src/Cli/Executable/Arangodump.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -18,7 +17,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.0.0
  */
-class Arangodump extends Abstraction implements Executable
+class Arangodump extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Compressor.php b/src/Cli/Executable/Compressor.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 1.0.0
  */
-class Compressor extends Abstraction implements Executable
+class Compressor extends Abstraction
 {
     /**
      * File to compress.
diff --git a/src/Cli/Executable/Elasticdump.php b/src/Cli/Executable/Elasticdump.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use phpbu\App\Util;
 use SebastianFeldmann\Cli\CommandLine;
@@ -19,7 +18,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.0
  */
-class Elasticdump extends Abstraction implements Executable
+class Elasticdump extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Gpg.php b/src/Cli/Executable/Gpg.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       https://phpbu.de/
  * @since      Class available since Release 6.0.1
  */
-class Gpg extends Abstraction implements Executable
+class Gpg extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Influxdump.php b/src/Cli/Executable/Influxdump.php
@@ -2,7 +2,6 @@
 
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
 
@@ -18,7 +17,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.12
  */
-class Influxdump extends Abstraction implements Executable
+class Influxdump extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Innobackupex.php b/src/Cli/Executable/Innobackupex.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -18,7 +17,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.0
  */
-class Innobackupex extends Abstraction implements Executable
+class Innobackupex extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Ldapdump.php b/src/Cli/Executable/Ldapdump.php
@@ -3,7 +3,6 @@
 namespace phpbu\App\Cli\Executable;
 
 use phpbu\App\Backup\Target\Compression;
-use phpbu\App\Cli\Executable;
 use phpbu\App\Util\Cli;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -20,7 +19,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.12
  */
-class Ldapdump extends Abstraction implements Executable
+class Ldapdump extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Mcrypt.php b/src/Cli/Executable/Mcrypt.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.0
  */
-class Mcrypt extends Abstraction implements Executable
+class Mcrypt extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Mongodump.php b/src/Cli/Executable/Mongodump.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.0
  */
-class Mongodump extends Abstraction implements Executable
+class Mongodump extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Mysql.php b/src/Cli/Executable/Mysql.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
 
@@ -16,7 +15,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 6.0-dev
  */
-class Mysql extends Abstraction implements Executable
+class Mysql extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Mysqldump.php b/src/Cli/Executable/Mysqldump.php
@@ -2,10 +2,8 @@
 namespace phpbu\App\Cli\Executable;
 
 use phpbu\App\Backup\Target\Compression;
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use phpbu\App\Util\Cli;
-use phpbu\App\Util\Str;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
 
@@ -20,7 +18,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 1.0.0
  */
-class Mysqldump extends Abstraction implements Executable
+class Mysqldump extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Mysqlimport.php b/src/Cli/Executable/Mysqlimport.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
 use SebastianFeldmann\Cli\CommandLine;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 6.0-dev
  */
-class Mysqlimport extends Abstraction implements Executable
+class Mysqlimport extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/OpenSSL.php b/src/Cli/Executable/OpenSSL.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.6
  */
-class OpenSSL extends Abstraction implements Executable
+class OpenSSL extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Pgdump.php b/src/Cli/Executable/Pgdump.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 1.0.0
  */
-class Pgdump extends Abstraction implements Executable
+class Pgdump extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/RedisCli.php b/src/Cli/Executable/RedisCli.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.12
  */
-class RedisCli extends Abstraction implements Executable
+class RedisCli extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Rsync.php b/src/Cli/Executable/Rsync.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 2.1.0
  */
-class Rsync extends Abstraction implements Executable
+class Rsync extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Cli/Executable/Tar.php b/src/Cli/Executable/Tar.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 1.0.0
  */
-class Tar extends Abstraction implements Executable
+class Tar extends Abstraction
 {
     /**
      * Path to compress
diff --git a/src/Cli/Executable/Xtrabackup8.php b/src/Cli/Executable/Xtrabackup8.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpbu\App\Cli\Executable;
 
-use phpbu\App\Cli\Executable;
 use phpbu\App\Exception;
 use SebastianFeldmann\Cli\CommandLine;
 use SebastianFeldmann\Cli\Command\Executable as Cmd;
@@ -17,7 +16,7 @@
  * @link       http://phpbu.de/
  * @since      Class available since Release 6.0.10
  */
-class Xtrabackup8 extends Abstraction implements Executable
+class Xtrabackup8 extends Abstraction
 {
     use OptionMasker;
 
diff --git a/src/Configuration/Loader/Factory.php b/src/Configuration/Loader/Factory.php
@@ -40,7 +40,7 @@ abstract class Factory
      * @param  \phpbu\App\Configuration\Bootstrapper $bootstrapper
      * @return \phpbu\App\Configuration\Loader
      */
-    public static function createLoader(string $filename, Bootstrapper $bootstrapper = null)
+    public static function createLoader(string $filename, ?Bootstrapper $bootstrapper = null)
     {
         $bs    = $bootstrapper ?? new Bootstrapper();
         $ext   = pathinfo($filename, PATHINFO_EXTENSION);

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ abstract class Cli`
`46`	`46`	`* Cli constructor.`
`47`	`47`	`*`
`48`	`48`	`* @param \SebastianFeldmann\Cli\Command\Runner $runner`
`49`		`- * @param int $time`
	`49`	`+ * @param int\|null $time`
`50`	`50`	`*/`
`51`		`- public function __construct(Runner $runner = null, $time = null)`
	`51`	`+ public function __construct(Runner $runner = null, ?int $time = null)`
`52`	`52`	`{`
`53`	`53`	`$this->runner = $runner ? : new Runner\Simple(new Symfony());`
`54`	`54`	`$this->time = $time ? : time();`
Original file line number	Diff line number	Diff line change
`@@ -120,4 +120,12 @@ public function getMimeType() : string`
`120`	`120`	`{`
`121`	`121`	`return $this->mimeType;`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ /**`
	`125`	`+ * @return string`
	`126`	`+ */`
	`127`	`+ public function __toString(): string`
	`128`	`+ {`
	`129`	`+ return $this->cmd;`
	`130`	`+ }`
`123`	`131`	`}`