Test
Fix
Fix for PSR-2 standard
Proper use of empty() for PHP < 5.5
Enhance testing that parameter is correct
Merge pull request #5936 from god107/zf4267

Fix for issue #4267
Merge branch 'hotfix/5936' into develop

Close #5936
Fixes #4267