Fix $this/self:: errors
Merge pull request #1 from skuridin/fix/fix-static-errors

Fix $this/self:: errors