bug #1700 Fixer - resolve import conflict (keradus)
bug #1700 Fixer - resolve import conflict (keradus)

This PR was merged into the 1.12 branch.

Discussion
----------

Fixer - resolve import conflict

Closes #1698

cc @GrahamCampbell

Commits
-------

c83f582 Fixer - resolve import conflict

Soullivaneuh/PHP-CS-Fixer,FriendsOfPHP/PHP-CS-Fixer,Soullivaneuh/PHP-CS-Fixer,felixgomez/PHP-CS-Fixer,SpacePossum/PHP-CS-Fixer,GrahamCampbell/PHP-CS-Fixer,gharlan/PHP-CS-Fixer,kubawerlos/PHP-CS-Fixer,kubawerlos/PHP-CS-Fixer,GrahamCampbell/PHP-CS-Fixer,keradus/PHP-CS-Fixer,lucasmichot/PHP-CS-Fixer,gharlan/PHP-CS-Fixer,felixgomez/PHP-CS-Fixer,FriendsOfPHP/PHP-CS-Fixer,Slamdunk/PHP-CS-Fixer,lucasmichot/PHP-CS-Fixer,keradus/PHP-CS-Fixer,Slamdunk/PHP-CS-Fixer,SpacePossum/PHP-CS-Fixer