Fixed PIM-3192
CS fixes
Fixes phpDoc
Merge pull request #1533 from akeneo/fix/PIM-3192

Fixed PIM-3192