Allow PHP fixtures to include files as well
Add tests
Merge branch 'Darhazer-1.x' into 1.x