Commit 23ceab2

committed

update some for exec command

1 parent 7527a94 commit 23ceab2Copy full SHA for 23ceab2

File tree

+21

-4

lines changed

+21

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,15 +51,20 @@ public static function exec(string $command, string $workDir = '', bool $outAsSt`
`51`	`51`	`*`
`52`	`52`	`* @return array`
`53`	`53`	`*/`
`54`		`- public static function system(string $command, string $workDir = ''): array`
	`54`	`+ public static function system(string $command, string $workDir = '', bool$allReturn = false): array`
`55`	`55`	`{`
`56`	`56`	`if ($workDir) {`
`57`	`57`	`chdir($workDir);`
`58`	`58`	`}`
`59`	`59`
`60`		`- ob_start();`
`61`		`- system($command, $status);`
`62`		`- $output = ob_get_clean();`
	`60`	`+ if ($allReturn) {`
	`61`	`+ ob_start();`
	`62`	`+ system($command, $status);`
	`63`	`+ $output = ob_get_clean();`
	`64`	`+ } else {`
	`65`	`+ // only last line message`
	`66`	`+ $output = system($command, $status);`
	`67`	`+ }`
`63`	`68`
`64`	`69`	`return [$status, $output];`
`65`	`70`	`}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,18 @@ public function setCommand(string $command): self`
`408`	`408`	`return $this;`
`409`	`409`	`}`
`410`	`410`
	`411`	`+ /**`
	`412`	`+ * @param index $index`
	`413`	`+ * @param array $spec`
	`414`	`+ *`
	`415`	`+ * @return ProcWrapper`
	`416`	`+ */`
	`417`	`+ public function setDescriptor(int $index, array $spec): self`
	`418`	`+ {`
	`419`	`+ $this->descriptors[$index] = $spec;`
	`420`	`+ return $this;`
	`421`	`+ }`
	`422`	`+`
`411`	`423`	`/**`
`412`	`424`	`* @param array $descriptors`
`413`	`425`	`*`

Comments

(0)