Preliminary work on building with Mock
php: apparently I reverted all the fixes