Further refactorings to PHPUnit namespaces

Author: peterrehm

Tests/FinderTest.php

@@ -689,6 +689,10 @@ public function testAccessDeniedException()
                     $this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, 'PHPUnit_Framework_ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
                 }
 
+                if ($e instanceof \PHPUnit\Framework\ExpectationFailedException) {
+                    $this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, '\PHPUnit\Framework\ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
+                }
+
                 $this->assertInstanceOf($expectedExceptionClass, $e);
             }
         }

Tests/Shell/CommandTest.php

@@ -103,7 +103,7 @@ public function testInsDuplicateLabelException()
         $cmd = Command::create()->add('--force');
 
         $cmd->ins('label');
-        $this->setExpectedException('RuntimeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('RuntimeException');
         $cmd->ins('label');
     }
 
@@ -119,15 +119,15 @@ public function testEndNoParentException()
     {
         $cmd = Command::create();
 
-        $this->setExpectedException('RuntimeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('RuntimeException');
         $cmd->end();
     }
 
     public function testGetMissingLabelException()
     {
         $cmd = Command::create();
 
-        $this->setExpectedException('RuntimeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('RuntimeException');
         $cmd->get('invalid');
     }