PHP aspectmock prep
Merge branch 'master' of github.com:daccfml/scratch