This reverts commit aa4d483f.

Can't use short array in php < 5.4

Add a unit-test to verify that when statements throw exceptions, the logger still has stopQuery called.

fixed typo