Calling throw() with both type and message only checks the message?

[ezzatron]

When you specify the exception message in a throw() assertion, the type check is currently bypassed.

Code to reproduce:

<?php

describe('Bug with throw()', function () {
    it('should assert type', function () {
        $actual = function () {
            $throws = function () { throw new Exception(); };

            expect($throws)->to->throw('RuntimeException');
        };

        expect($actual)->to->throw('Peridot\Leo\Responder\Exception\AssertionException');
    });

    it('should assert type even when message is specified', function () {
        $actual = function () {
            $throws = function () { throw new Exception('foobar'); };

            expect($throws)->to->throw('RuntimeException', 'foobar');
        };

        expect($actual)->to->throw('Peridot\Leo\Responder\Exception\AssertionException');
    });
});

The first test passes because Exception is not a RuntimeException. The second test fails because the message argument bypasses the type check.

This section of the code seems to be the offender, in ExceptionMatcher::doMatch():

            $message = $e->getMessage();
            if ($this->expectedMessage) {
                $this->setMessage($message);
                return $this->expectedMessage == $message;
            }
            if (!$e instanceof $this->expected) {
                return false;
            }

I tried fixing it myself but couldn't figure out how to get it to produce the correct error message in all cases.