Skip to content

Commit dc837b6

Browse files
Merge branch 'master' into 5.2
2 parents afe82e3 + d035b99 commit dc837b6

File tree

6 files changed

+7
-13
lines changed

6 files changed

+7
-13
lines changed

src/Cli/Executable/Abstraction.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ protected function setup(string $cmd, string $path = '')
6464
*/
6565
public function getCommandLine() : CommandLine
6666
{
67-
$process = $this->createCommandLine();
68-
$process->pipeFail(true);
69-
70-
return $process;
67+
return $this->createCommandLine();
7168
}
7269

7370
/**

src/Cli/Executable/Mysqldump.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ public function dumpTo(string $path) : Mysqldump
423423
* Mysqldump CommandLine generator.
424424
*
425425
* @return \SebastianFeldmann\Cli\CommandLine
426+
* @throws \phpbu\App\Exception
426427
*/
427428
protected function createCommandLine() : CommandLine
428429
{

tests/phpbu/Backup/Source/MysqldumpTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ public function testPipeCompression()
6565
$executable = $mysqldump->getExecutable($target);
6666

6767
$this->assertEquals(
68-
'set -o pipefail; '
69-
. PHPBU_TEST_BIN . '/mysqldump --all-databases | '
68+
PHPBU_TEST_BIN . '/mysqldump --all-databases | '
7069
. PHPBU_TEST_BIN . '/gzip > /tmp/foo.sql.gz',
7170
$executable->getCommand()
7271
);

tests/phpbu/Backup/Source/TarTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ public function testThrottle()
182182
$exec = $tar->getExecutable($target);
183183

184184
$this->assertEquals(
185-
'set -o pipefail; '
186-
. PHPBU_TEST_BIN . '/tar -c -C \''
185+
PHPBU_TEST_BIN . '/tar -c -C \''
187186
. dirname(__DIR__) . '\' \''
188187
. basename(__DIR__) . '\''
189188
. ' | pv -qL \'1m\' > /tmp/backup.tar',

tests/phpbu/Cli/Executable/MysqldumpTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public function testCompressor()
252252
$mysqldump->compressOutput($compression)->dumpTo('/tmp/foo.mysql');
253253

254254
$this->assertEquals(
255-
'set -o pipefail; ' . $path . '/mysqldump --all-databases | ' . $path . '/gzip > /tmp/foo.mysql.gz',
255+
$path . '/mysqldump --all-databases | ' . $path . '/gzip > /tmp/foo.mysql.gz',
256256
$mysqldump->getCommand()
257257
);
258258
}

tests/phpbu/Cli/Executable/TarTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ public function testThrottle()
169169
->throttle('1m');
170170

171171
$this->assertEquals(
172-
'set -o pipefail; '
173-
. PHPBU_TEST_BIN . '/tar -jc -C \'' . $tarC . '\' \'' . $tarD . '\''
172+
PHPBU_TEST_BIN . '/tar -jc -C \'' . $tarC . '\' \'' . $tarD . '\''
174173
. ' | pv -qL \'1m\' > /tmp/foo.tar.bzip2',
175174
$tar->getCommand()
176175
);
@@ -192,8 +191,7 @@ public function testThrottleAndRemoveSourceDir()
192191
->throttle('1m');
193192

194193
$this->assertEquals(
195-
'set -o pipefail; '
196-
. '(' . PHPBU_TEST_BIN . '/tar -jc -C \'' . $tarC . '\' \'' . $tarD . '\''
194+
'(' . PHPBU_TEST_BIN . '/tar -jc -C \'' . $tarC . '\' \'' . $tarD . '\''
197195
. ' && rm -rf \'' . $dir . '\')'
198196
. ' | pv -qL \'1m\' > /tmp/foo.tar.bzip2',
199197
$tar->getCommand()

0 commit comments

Comments
 (0)