[5.1] Backport #21320

[mcordingley]

As mentioned here, this fix should be back-ported to 5.1. This brings both the final changes and the added tests to ensure their correctness.

[themsaid]

@mcordingley tests failing

[mcordingley]

I saw that. It looks like HHVM doesn't like something to do with something mocking PDO statements. I'm not sure what to make of that, since I'm using the same mocking calls as the pre-existing tests and this shouldn't even be touching PDO.

[themsaid]

@mcordingley I think it's ok to exclude the problematic test. 5.1 is closed for changes anyways.

[mcordingley]

Looks like test 247 (where the job fails) is DatabaseConnectionTest::testSelectProperlyCallsPDO

[mcordingley]

From my phpunit --debug output:

Starting test 'DatabaseConnectionTest::testSettingDefaultCallsGetDefaultGrammar'. W 244 / 1757 ( 13%) Starting test 'DatabaseConnectionTest::testSettingDefaultCallsGetDefaultPostProcessor'. W Starting test 'DatabaseConnectionTest::testSelectOneCallsSelectAndReturnsSingleResult'. W Starting test 'DatabaseConnectionTest::testSelectProperlyCallsPDO'. 

[taylorotwell]

This took about 17 PRs to actually get right the first time. I don't want to go through that again on an existing stable release.

[mcordingley]

That is perfectly fine by me. Just felt a responsibility to backport it to the old LTS, per the updates policy. Otherwise, I'm also happy to be done with this issue for the same reason as you.

[taylorotwell]

I'll just hold off on this. The requirement to actually have cracked the AES-256 encryption key of the entire application before this is useful I think makes it less plausible as an attack.