Refactored other PHPUnit method calls to work with namespaced PHPUnit 6

Author: peterrehm

Tests/DependencyInjection/Compiler/FormPassTest.php

@@ -227,7 +227,12 @@ public function testPrivateTaggedServices($id, $tagName, $expectedExceptionMessa
         $container->setDefinition('form.extension', $extDefinition);
         $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName);
 
-        $this->setExpectedException('\InvalidArgumentException', $expectedExceptionMessage);
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('\InvalidArgumentException');
+            $this->expectExceptionMessage($expectedExceptionMessage);
+        } else {
+            $this->setExpectedException('\InvalidArgumentException', $expectedExceptionMessage);
+        }
 
         $container->compile();
     }