[php-phpunit-environment/f21] update to 1.2.0 + upstream patch

[Remi Collet]

Summary of changes:

  1b7a781... update to 1.2.0 + upstream patch (*)

(*) This commit already existed in another branch; no separate mail sent