Commit6c11207

committed

attempts to fix tests on Travis

1 parent2ff1870 commit6c11207Copy full SHA for 6c11207

File tree

+24

-3

lines changed

+24

-3

lines changed

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,27 @@ class Process`
`120`	`120`	`159 =>'Bad syscall',`
`121`	`121`	`);`
`122`	`122`
	`123`	`+/**`
	`124`	`+ * Returns whether PTY is supported on the current operating system.`
	`125`	`+ *`
	`126`	`+ * @return Boolean`
	`127`	`+ */`
	`128`	`+publicstaticfunctionisPtySupported()`
	`129`	`+ {`
	`130`	`+if (defined('PHP_WINDOWS_VERSION_BUILD')) {`
	`131`	`+returnfalse;`
	`132`	`+ }`
	`133`	`+`
	`134`	`+$proc = @proc_open('echo 1',array(array('pty'),array('pty'),array('pty')),$pipes);`
	`135`	`+if (is_resource($proc)) {`
	`136`	`+proc_close($proc);`
	`137`	`+`
	`138`	`+returntrue;`
	`139`	`+ }`
	`140`	`+`
	`141`	`+returnfalse;`
	`142`	`+ }`
	`143`	`+`
`123`	`144`	`/**`
`124`	`145`	`* Constructor.`
`125`	`146`	`*`
`@@ -1183,7 +1204,7 @@ private function getDescriptors()`
`1183`	`1204`	`array('file','/dev/tty','w'),`
`1184`	`1205`	`array('file','/dev/tty','w'),`
`1185`	`1206`	`);`
`1186`		`- }elseif ($this->pty) {`
	`1207`	`+ }elseif ($this->pty &&self::isPtySupported()) {`
`1187`	`1208`	`$descriptors =array(`
`1188`	`1209`	`array('pty'),`
`1189`	`1210`	`array('pty'),`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,8 @@ public function testTTYCommand()`
`205`	`205`	`*/`
`206`	`206`	`publicfunctiontestPTYCommand()`
`207`	`207`	`{`
`208`		`-if (defined('PHP_WINDOWS_VERSION_BUILD')) {`
`209`		`-$this->markTestSkipped('Windows does nothave PTY support.');`
	`208`	`+if ( ! Process::isPtySupported()) {`
	`209`	`+$this->markTestSkipped('PTY is notsupported on this operating system.');`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`$process =$this->getProcess('echo "foo"');`

Comments

(0)