@@ -399,9 +399,11 @@ public function testShellBlankCommand($sf)
399399
400400 try {
401401 $ res = self ::doShell ($ sf , $ opts );
402- } catch (\PHPUnit \Framework \Error \Warning | \ ValueError $ w ) {
402+ } catch (\PHPUnit \Framework \Error \Warning $ v ) {
403403 // ignore warning
404404 $ res = false ;
405+ } catch (\ValueError $ v ) {
406+ $ res = false ;
405407 }
406408 $ this ->assertEquals ('' , $ res );
407409 });
@@ -423,9 +425,11 @@ public function testShellCommandWithNul($sf)
423425
424426 try {
425427 $ res = self ::doShell ($ sf , $ opts );
426- } catch (\PHPUnit \Framework \Error \Warning | \ ValueError $ w ) {
428+ } catch (\PHPUnit \Framework \Error \Warning $ v ) {
427429 // ignore warning
428430 $ res = false ;
431+ } catch (\ValueError $ v ) {
432+ $ res = false ;
429433 }
430434 $ this ->assertEquals ('' , $ res );
431435 });
@@ -461,9 +465,11 @@ public function testShellOtherBadArguments($sf)
461465
462466 try {
463467 $ res = self ::doShell ($ sf , $ opts );
464- } catch (\PHPUnit \Framework \Error \Warning | \ ArgumentCountError $ w ) {
468+ } catch (\PHPUnit \Framework \Error \Warning $ v ) {
465469 // ignore warning
466470 $ res = false ;
471+ } catch (\ArgumentCountError $ v ) {
472+ $ res = false ;
467473 }
468474 $ this ->assertEquals ('' , $ res );
469475 });
@@ -607,7 +613,7 @@ public function testProcOpenInjectsSessionIds()
607613 fclose ($ pipes [1 ]);
608614 proc_close ($ h );
609615
610- [ $ childParent , $ childRoot] = explode ("\n" , $ output , 2 );
616+ list ( $ childParent , $ childRoot) = explode ("\n" , $ output , 2 );
611617 $ this ->assertSame ($ expectedParent , $ childParent );
612618 $ this ->assertSame ($ expectedRoot , $ childRoot );
613619 }
@@ -625,7 +631,7 @@ public function testShellExecInheritsSessionIds()
625631 // without ddtrace overwriting _DD_PARENT_PHP_SESSION_ID with the child's own UUID.
626632 $ output = (string )shell_exec ('printf "%s\n%s" "$_DD_PARENT_PHP_SESSION_ID" "$_DD_ROOT_PHP_SESSION_ID" ' );
627633
628- [ $ childParent , $ childRoot] = explode ("\n" , $ output , 2 );
634+ list ( $ childParent , $ childRoot) = explode ("\n" , $ output , 2 );
629635 $ this ->assertSame ($ expectedParent , $ childParent );
630636 $ this ->assertSame ($ expectedRoot , $ childRoot );
631637 }
0 commit comments