fixed minor issues failing test on master

Author: jrushlow

src/Maker/MakeForgottenPassword.php

@@ -15,23 +15,23 @@
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Doctrine\ORMDependencyBuilder;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
+use Symfony\Bundle\MakerBundle\FileManager;
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
+use Symfony\Bundle\MakerBundle\Renderer\FormTypeRenderer;
 use Symfony\Bundle\MakerBundle\Security\InteractiveSecurityHelper;
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
+use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Bundle\MakerBundle\FileManager;
-use Symfony\Bundle\MakerBundle\Renderer\FormTypeRenderer;
 use Symfony\Component\Validator\Validation;
-use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
 
 /**
  * @author Romaric Drigon <[email protected]>

src/Renderer/FormTypeRenderer.php

@@ -42,14 +42,17 @@ public function render(ClassNameDetails $formClassDetails, array $formFields, Cl
             $fields[$name] = $fieldTypeOptions;
         }
 
+        $mergedTypeUseStatements = array_merge($fieldTypeUseStatements, $extraUseClasses);
+        sort($mergedTypeUseStatements);
+
         $this->generator->generateClass(
             $formClassDetails->getFullName(),
             'form/Type.tpl.php',
             [
                 'bounded_full_class_name' => $boundClassDetails ? $boundClassDetails->getFullName() : null,
                 'bounded_class_name' => $boundClassDetails ? $boundClassDetails->getShortName() : null,
                 'form_fields' => $fields,
-                'field_type_use_statements' => array_merge($fieldTypeUseStatements, $extraUseClasses),
+                'field_type_use_statements' => $mergedTypeUseStatements,
                 'constraint_use_statements' => $constraintClasses,
             ]
         );

tests/Maker/MakeForgottenPasswordTest.php

@@ -21,6 +21,7 @@ public function getTestDetails()
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeForgottenPassword')
             ->configureDatabase()
             ->updateSchemaAfterCommand()
+            ->addExtraDependencies('symfony/swiftmailer-bundle')
         ];
     }
 }