fix #63 and part of #18

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2 jobs for better-choice in 3 minutes and 9 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #43238
test_php7.0

00:01:27

passed #43239
test_php7.1

00:01:42