Merge branch 'master' into 6.0

Author: sebastianfeldmann

doc/config/source/mysqldump.json

@@ -13,7 +13,7 @@
     "lockTables": true,
     "singleTransaction": true,
     "compress": true,
-    "extendedInsert": true,
+    "skipExtendedInsert": false,
     "hexBlob": true,
     "skipTriggers": false,
     "routines": true,

doc/config/source/mysqldump.xml

@@ -37,7 +37,7 @@
   <option name="compress" value="true" />
 
   <!-- optional, default=false -->
-  <option name="extendedInsert" value="true" />
+  <option name="skipExtendedInsert" value="false" />
 
   <!-- optional, default=false -->
   <option name="hexBlob" value="true" />

src/Cli/Executable/OpenSSL.php

@@ -336,7 +336,7 @@ protected function setOptions(Cmd $cmd): void
     protected function setCertOptions(Cmd $cmd): void
     {
         $cmd->addOption('smime');
-        $cmd->addOption('-' . $this->action);
+        $cmd->addOption('-' . ($this->action === 'e' ? 'encrypt' : 'decrypt'));
         $cmd->addOption('-' . $this->algorithm);
         $cmd->addOption('-binary');
         $cmd->addOption('-in', $this->sourceFile, ' ');

tests/phpbu/Backup/Crypter/OpenSSLTest.php

@@ -83,7 +83,7 @@ public function testCertFile()
         $openSSL->setup(['pathToOpenSSL' => PHPBU_TEST_BIN, 'certFile' => '/foo/my.pem', 'algorithm' => 'aes256']);
 
         $executable = $openSSL->getExecutable($target);
-        $expected = '(' . PHPBU_TEST_BIN . '/openssl smime -e -aes256 -binary -in \'/foo/bar.txt\' '
+        $expected = '(' . PHPBU_TEST_BIN . '/openssl smime -encrypt -aes256 -binary -in \'/foo/bar.txt\' '
                   . '-out \'/foo/bar.txt.enc\' -outform DER \'/foo/my.pem\' '
                   . '&& rm \'/foo/bar.txt\')';
 

tests/phpbu/Cli/Executable/OpenSSLTest.php

@@ -101,7 +101,7 @@ public function testDoNotDeleteUncrypted()
      */
     public function testCert()
     {
-        $expected = 'openssl smime -e -aes256 -binary -in \'/foo/bar.txt\' '
+        $expected = 'openssl smime -encrypt -aes256 -binary -in \'/foo/bar.txt\' '
                   . '-out \'/foo/bar.txt.enc\' -outform DER \'/foo/my.pem\' '
                   . '&& rm \'/foo/bar.txt\'';
         $openSSL  = new OpenSSL(PHPBU_TEST_BIN);