PSR-2
Fix json_encode/json_decode parameters
PSR-2
Merge pull request #1073 from mlocati/fix-json

Fix json