Merge "createNoOpMock() method for PHPUnit tests"