sort use statements. Rename controllers

application/src/MagicWordBundle/Command/DeleteGridCommand.php

@@ -2,24 +2,23 @@
 
 namespace MagicWordBundle\Command;
 
-use LexiconBundle\Manager\ImportManager;
 use LexiconBundle\Entity\Language;
 use LexiconBundle\Entity\Root;
 use LexiconBundle\Entity\Word;
 use LexiconBundle\Entity\WordStart;
-use MagicWordBundle\Entity\Grid;
+use LexiconBundle\Manager\ImportManager;
+use MagicWordBundle\Entity\FoundableForm;
 use MagicWordBundle\Entity\Game;
+use MagicWordBundle\Entity\Grid;
+use MagicWordBundle\Entity\Objective;
 use MagicWordBundle\Entity\Round;
 use MagicWordBundle\Entity\Score;
 use MagicWordBundle\Entity\WrongForm;
-use MagicWordBundle\Entity\FoundableForm;
-use MagicWordBundle\Entity\Objective;
-
-use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Filesystem\Filesystem;
 
 class DeleteGridCommand extends ContainerAwareCommand
 {

application/src/MagicWordBundle/Command/FixturesCommand.php

@@ -2,14 +2,14 @@
 
 namespace MagicWordBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use MagicWordBundle\Entity\AccessType;
 use MagicWordBundle\Entity\GeneralParameters;
 use MagicWordBundle\Entity\LanguageUI;
-use MagicWordBundle\Entity\Wordbox\AcquisitionType;
 use MagicWordBundle\Entity\RoundType\RoundType;
+use MagicWordBundle\Entity\Wordbox\AcquisitionType;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class FixturesCommand extends ContainerAwareCommand
 {

application/src/MagicWordBundle/Command/GenerateGridCommand.php

@@ -3,9 +3,9 @@
 namespace MagicWordBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 class GenerateGridCommand extends ContainerAwareCommand
 {

application/src/MagicWordBundle/Command/GetMassiveJSONCommand.php

@@ -3,10 +3,10 @@
 namespace MagicWordBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class GetMassiveJSONCommand extends ContainerAwareCommand
 {

application/src/MagicWordBundle/Controller/ActivityController.php

@@ -2,17 +2,17 @@
 
 namespace MagicWordBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use MagicWordBundle\Entity\Round;
-use MagicWordBundle\Entity\Objective;
+use MagicWordBundle\Entity\Activity;
 use MagicWordBundle\Entity\FoundableForm;
+use MagicWordBundle\Entity\Objective;
+use MagicWordBundle\Entity\Round;
 use MagicWordBundle\Entity\Rules\ComboPoints;
-use MagicWordBundle\Entity\Activity;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
 
 class ActivityController extends Controller
 {

application/src/MagicWordBundle/Controller/ApiController.php

@@ -2,12 +2,12 @@
 
 namespace MagicWordBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use LexiconBundle\Entity\Language;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use LexiconBundle\Entity\Language;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 class ApiController extends Controller
 {

application/src/MagicWordBundle/Controller/DefaultController.php

@@ -2,9 +2,9 @@
 
 namespace MagicWordBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Michelf\Markdown;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 class DefaultController extends Controller
 {

application/src/MagicWordBundle/Controller/FoundableFormController.php

@@ -2,11 +2,11 @@
 
 namespace MagicWordBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use LexiconBundle\Entity\Language;
 use MagicWordBundle\Entity\FoundableForm;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 class FoundableFormController extends Controller
 {

application/src/MagicWordBundle/Controller/GameController.php

@@ -2,12 +2,12 @@
 
 namespace MagicWordBundle\Controller;
 
+use MagicWordBundle\Entity\Game;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use MagicWordBundle\Entity\Game;
 
 class GameController extends Controller
 {

application/src/MagicWordBundle/Controller/GameType/ChallengeController.php

@@ -2,12 +2,12 @@
 
 namespace MagicWordBundle\Controller\GameType;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Symfony\Component\HttpFoundation\Request;
 use MagicWordBundle\Entity\GameType\Challenge;
 use MagicWordBundle\Entity\Player;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
 
 class ChallengeController extends Controller
 {

application/src/MagicWordBundle/Controller/GameType/MassiveController.php

@@ -2,14 +2,14 @@
 
 namespace MagicWordBundle\Controller\GameType;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use MagicWordBundle\Entity\GameType\Massive;
 use MagicWordBundle\Entity\Round;
 use MagicWordBundle\Form\Type\MassiveType;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
 
 class MassiveController extends Controller
 {

application/src/MagicWordBundle/Controller/GameType/TrainingController.php

@@ -2,10 +2,10 @@
 
 namespace MagicWordBundle\Controller\GameType;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use LexiconBundle\Entity\Language;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 class TrainingController extends Controller
 {

application/src/MagicWordBundle/Controller/GridController.php

@@ -2,11 +2,11 @@
 
 namespace MagicWordBundle\Controller;
 
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 class GridController extends Controller
 {

application/src/MagicWordBundle/Controller/GridPatternController.php

@@ -2,13 +2,13 @@
 
 namespace MagicWordBundle\Controller;
 
+use MagicWordBundle\Entity\GridPattern;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use MagicWordBundle\Entity\GridPattern;
 
 class GridPatternController extends Controller
 {

application/src/MagicWordBundle/Controller/LetterController.php

@@ -2,11 +2,11 @@
 
 namespace MagicWordBundle\Controller;
 
+use LexiconBundle\Entity\Language;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use LexiconBundle\Entity\Language;
 
 class LetterController extends Controller
 {

application/src/MagicWordBundle/Controller/Lexicon/LemmaController.php → application/src/MagicWordBundle/Controller/Lexicon/RootController.php

@@ -2,12 +2,12 @@
 
 namespace MagicWordBundle\Controller\Lexicon;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use LexiconBundle\Entity\Root;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-class LemmaController extends Controller
+class RootController extends Controller
 {
     /**
      * @Route("/root/{id}", name="root")

application/src/MagicWordBundle/Controller/Lexicon/InflectionController.php → application/src/MagicWordBundle/Controller/Lexicon/WordController.php

@@ -2,20 +2,20 @@
 
 namespace MagicWordBundle\Controller\Lexicon;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use LexiconBundle\Entity\Language;
+use MagicWordBundle\Entity\Lexicon\Word;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Component\HttpFoundation\Request;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use MagicWordBundle\Entity\Lexicon\Word;
-use LexiconBundle\Entity\Language;
+use Symfony\Component\HttpFoundation\Request;
 
-class InflectionController extends Controller
+class WordController extends Controller
 {
     /**
      * @Route("/word/{id}", name="word", requirements={
-     *     "page": "\d+"
+     *     "id": "\d+"
      * })
      * @ParamConverter("inflexion", class="MagicWordBundle:Lexicon\Word")
      */

application/src/MagicWordBundle/Controller/PlayerController.php

@@ -2,12 +2,12 @@
 
 namespace MagicWordBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use MagicWordBundle\Entity\Player;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use MagicWordBundle\Entity\Player;
 
 class PlayerController extends Controller
 {

application/src/MagicWordBundle/Controller/RoundController.php

@@ -2,12 +2,12 @@
 
 namespace MagicWordBundle\Controller;
 
+use MagicWordBundle\Entity\Round;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use MagicWordBundle\Entity\Round;
+use Symfony\Component\HttpFoundation\Request;
 
 class RoundController extends Controller
 {

application/src/MagicWordBundle/Controller/RoundType/ConquerController.php

@@ -2,14 +2,14 @@
 
 namespace MagicWordBundle\Controller\RoundType;
 
+use MagicWordBundle\Entity\RoundType\Conquer;
+use MagicWordBundle\Form\Type\RoundType;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use MagicWordBundle\Entity\RoundType\Conquer;
-use MagicWordBundle\Form\Type\RoundType;
 
 class ConquerController extends Controller
 {
@@ -21,7 +21,8 @@ class ConquerController extends Controller
     {
         $form = $this->createForm(RoundType::class, $conquer)->createView();
 
-        return $this->render('MagicWordBundle:Round/Conquer:edit.html.twig',
+        return $this->render(
+            'MagicWordBundle:Round/Conquer:edit.html.twig',
             [
                 'conquer' => $conquer,
                 'form' => $form,