Merge branch 'master' into 5.1

Author: sebastianfeldmann

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 before_script:
   - composer self-update

doc/config/log/mail.smtp.xml

@@ -18,7 +18,7 @@
   <!-- mandatory -->
   <option name="transport" value="smtp" />
 
-  <!-- optional default=587 -->
+  <!-- optional default=25 -->
   <option name="smtp.port" value="587" />
 
   <!-- mandatory -->

doc/config/source/tar.json

@@ -7,6 +7,7 @@
     "compressProgram": "lbzip2",
     "removeSourceDir": false,
     "throttle": "5m",
-    "pathToTar": "/path/to/custom/bin"
+    "pathToTar": "/path/to/custom/bin",
+    "dereference": false
   }
 }

doc/config/source/tar.xml

@@ -23,4 +23,7 @@
 
   <!-- define your custom tar executable location -->
   <option name="pathToTar" value="/path/to/custom/bin" />
+
+  <!-- optional, default false -->
+  <option name="dereference" value="false" />
 </source>

src/Backup/Source/Tar.php

@@ -104,6 +104,13 @@ class Tar extends SimulatorExecutable implements Simulator
      */
     private $pathToArchive;
 
+    /**
+     * Instead of archiving symbolic links, archive the files they link to
+     *
+     * @var bool
+     */
+    private $dereference;
+
     /**
      * Setup.
      *
@@ -121,6 +128,7 @@ public function setup(array $conf = [])
         $this->forceLocal       = Util\Str::toBoolean(Util\Arr::getValue($conf, 'forceLocal', ''), false);
         $this->ignoreFailedRead = Util\Str::toBoolean(Util\Arr::getValue($conf, 'ignoreFailedRead', ''), false);
         $this->removeSourceDir  = Util\Str::toBoolean(Util\Arr::getValue($conf, 'removeSourceDir', ''), false);
+        $this->dereference      = Util\Str::toBoolean(Util\Arr::getValue($conf, 'dereference', ''), false);
     }
 
     /**
@@ -192,7 +200,8 @@ protected function createExecutable(Target $target) : Executable
                    ->ignoreFailedRead($this->ignoreFailedRead)
                    ->removeSourceDirectory($this->removeSourceDir)
                    ->throttle($this->throttle)
-                   ->archiveTo($this->pathToArchive);
+                   ->archiveTo($this->pathToArchive)
+                   ->dereference($this->dereference);
         // add paths to exclude
         foreach ($this->excludes as $path) {
             $executable->addExclude($path);

src/Cli/Executable/Tar.php

@@ -98,6 +98,13 @@ class Tar extends Abstraction implements Executable
         'xz'    => 'J'
     ];
 
+    /**
+     * Instead of archiving symbolic links, archive the files they link to
+     *
+     * @var bool
+     */
+    private $dereference = false;
+
     /**
      * Constructor.
      *
@@ -241,6 +248,18 @@ public function removeSourceDirectory(bool $bool) : Tar
         return $this;
     }
 
+    /**
+     * Instead of archiving symbolic links, archive the files they link
+     *
+     * @param bool $bool
+     * @return \phpbu\App\Cli\Executable\Tar
+     */
+    public function dereference(bool $bool) : Tar
+    {
+        $this->dereference = $bool;
+        return $this;
+    }
+
     /**
      * Tar CommandLine generator.
      *
@@ -259,6 +278,7 @@ protected function createCommandLine() : CommandLine
         $this->setExcludeOptions($tar);
         $this->handleWarnings($tar);
 
+        $tar->addOptionIfNotEmpty('-h', $this->dereference, false);
         $tar->addOptionIfNotEmpty('--force-local', $this->local, false);
         $tar->addOptionIfNotEmpty('--use-compress-program', $this->compressProgram);
         $tar->addOption('-' . (empty($this->compressProgram) ? $this->compression : '') . $create);

src/Cmd/Args.php

@@ -13,8 +13,9 @@
  * @license    https://opensource.org/licenses/MIT The MIT License (MIT)
  * @link       http://phpbu.de/
  * @since      Class available since Release 1.0.0
+ * @internal
  */
-class Args
+final class Args
 {
 
     /**

src/Runner/Backup.php

@@ -20,6 +20,7 @@
  * @license    https://opensource.org/licenses/MIT The MIT License (MIT)
  * @link       https://phpbu.de/
  * @since      Class available since Release 5.1.0
+ * @internal
  */
 class Backup extends Compression
 {

src/Runner/Compression.php

@@ -15,6 +15,7 @@
  * @license    https://opensource.org/licenses/MIT The MIT License (MIT)
  * @link       https://phpbu.de/
  * @since      Class available since Release 5.1.0
+ * @internal
  */
 abstract class Compression extends Process
 {

src/Runner/Process.php

@@ -15,6 +15,7 @@
  * @license    https://opensource.org/licenses/MIT The MIT License (MIT)
  * @link       https://phpbu.de/
  * @since      Class available since Release 5.1.0
+ * @internal
  */
 abstract class Process
 {