Merge branch '8.5' into 9.6

Author: sebastianbergmann

build.xml

@@ -378,7 +378,6 @@
             <arg value="--config" />
             <arg path="${basedir}/build/config/php-scoper.php" />
             <arg value="--no-interaction" />
-            <arg value="--stop-on-failure" />
             <arg value="--output-dir" />
             <arg path="${basedir}/build/tmp/phar-scoped" />
             <arg value="--prefix" />