Fix unit tests with latest PHP versions
Merge pull request #340 from romainneutron/fix-unit-tests

Fix unit tests with latest PHP versions
Merge branch 'master' into develop