Merge pull request #8 from roderik/master

More insight fixes

src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php

@@ -3,15 +3,13 @@
 namespace Kunstmaan\AdminBundle\Command;
 
 use Doctrine\ORM\EntityManager;
-
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
 use Kunstmaan\AdminBundle\Entity\AclChangeset;
-use Kunstmaan\AdminBundle\Repository\AclChangesetRepository;
 use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionAdmin;
+use Kunstmaan\AdminBundle\Repository\AclChangesetRepository;
 use Kunstmaan\UtilitiesBundle\Helper\Shell\Shell;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Symfony CLI command to apply the {@link AclChangeSet} with status {@link AclChangeSet::STATUS_NEW} to their entities

src/Kunstmaan/AdminBundle/Command/CreateGroupCommand.php

@@ -2,17 +2,15 @@
 
 namespace Kunstmaan\AdminBundle\Command;
 
+use Doctrine\ORM\EntityManager;
+use Kunstmaan\AdminBundle\Entity\Group;
+use Kunstmaan\AdminBundle\Entity\Role;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Doctrine\ORM\EntityManager;
-
-use Kunstmaan\AdminBundle\Entity\Group;
-use Kunstmaan\AdminBundle\Entity\Role;
-
 /**
  * Symfony CLI command to create a group using app/console kuma:group:create <name_of_the_group>
  */

src/Kunstmaan/AdminBundle/Command/CreateRoleCommand.php

@@ -2,15 +2,13 @@
 
 namespace Kunstmaan\AdminBundle\Command;
 
+use Doctrine\ORM\EntityManager;
+use Kunstmaan\AdminBundle\Entity\Role;
 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 Doctrine\ORM\EntityManager;
-
-use Kunstmaan\AdminBundle\Entity\Role;
-
 /**
  * Symfony CLI command to create a group using app/console kuma:role:create <NAME_OF_THE_ROLE>
  */

src/Kunstmaan/AdminBundle/Command/CreateUserCommand.php

@@ -4,10 +4,10 @@
 
 use Doctrine\ORM\EntityManager;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

src/Kunstmaan/AdminBundle/Command/FixAdminLocaleCommand.php

@@ -3,7 +3,6 @@
 namespace Kunstmaan\AdminBundle\Command;
 
 use Doctrine\ORM\EntityManager;
-
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -47,4 +46,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $em->flush();
         $output->writeln('<info>The default admin locale was successfully set for all users.</info>');
     }
-}
+}

src/Kunstmaan/AdminBundle/Command/FixGuestCommand.php

@@ -3,7 +3,6 @@
 namespace Kunstmaan\AdminBundle\Command;
 
 use Doctrine\ORM\EntityManager;
-
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\Console\Input\InputInterface;
@@ -100,4 +99,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln('<error>ROLE_GUEST not found : you\'re on your own!</error>');
         }
     }
-}
+}

src/Kunstmaan/AdminBundle/Controller/DefaultController.php

@@ -2,12 +2,10 @@
 
 namespace Kunstmaan\AdminBundle\Controller;
 
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Kunstmaan\AdminBundle\Form\DashboardConfigurationType;
 use Kunstmaan\AdminBundle\Entity\DashboardConfiguration;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Kunstmaan\AdminBundle\Form\DashboardConfigurationType;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Kunstmaan/AdminBundle/Controller/ModulesController.php

@@ -4,9 +4,6 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-
 /**
  * The modules home controller
  */

src/Kunstmaan/AdminBundle/Controller/SettingsController.php

@@ -2,8 +2,6 @@
 
 namespace Kunstmaan\AdminBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 /**

src/Kunstmaan/AdminBundle/DataFixtures/ORM/GroupFixtures.php

@@ -2,11 +2,9 @@
 
 namespace Kunstmaan\AdminBundle\DataFixtures\ORM;
 
-use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\ORM\EntityManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-
+use Doctrine\Common\Persistence\ObjectManager;
 use Kunstmaan\AdminBundle\Entity\Group;
 
 /**

src/Kunstmaan/AdminBundle/DataFixtures/ORM/RoleFixtures.php

@@ -2,11 +2,10 @@
 
 namespace Kunstmaan\AdminBundle\DataFixtures\ORM;
 
-use Kunstmaan\AdminBundle\Entity\Role;
-
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
+use Kunstmaan\AdminBundle\Entity\Role;
 
 /**
  * Fixture for creation the basic roles

src/Kunstmaan/AdminBundle/DataFixtures/ORM/UserFixtures.php

@@ -4,8 +4,8 @@
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Kunstmaan\AdminBundle\Entity\User;
 use Doctrine\Common\Persistence\ObjectManager;
+use Kunstmaan\AdminBundle\Entity\User;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/AddLogProcessorsCompilerPass.php

@@ -2,9 +2,9 @@
 
 namespace Kunstmaan\AdminBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * This compiler pass makes it possible to add processors for the Kunstmaan logger

src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/MenuCompilerPass.php

@@ -2,8 +2,8 @@
 
 namespace Kunstmaan\AdminBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**

src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php

@@ -3,12 +3,11 @@
 namespace Kunstmaan\AdminBundle\DependencyInjection;
 
 use InvalidArgumentException;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 
 /**

src/Kunstmaan/AdminBundle/Entity/Group.php

@@ -2,16 +2,14 @@
 
 namespace Kunstmaan\AdminBundle\Entity;
 
-use InvalidArgumentException;
-
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\ExecutionContext;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Security\Core\Role\RoleInterface;
-use FOS\UserBundle\Model\GroupInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use FOS\UserBundle\Model\GroupInterface;
+use InvalidArgumentException;
+use Symfony\Component\Security\Core\Role\RoleInterface;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\ExecutionContext;
 
 /**
  * Group

src/Kunstmaan/AdminBundle/Entity/Role.php

@@ -3,9 +3,8 @@
 namespace Kunstmaan\AdminBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Security\Core\Role\RoleInterface;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Role Entity

src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php

@@ -2,12 +2,12 @@
 
 namespace Kunstmaan\AdminBundle\EventListener;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Security\Core\SecurityContext;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * AdminLocaleListener to override default locale if user-specific locale is set in database

src/Kunstmaan/AdminBundle/EventListener/CloneListener.php

@@ -2,9 +2,9 @@
 
 namespace Kunstmaan\AdminBundle\EventListener;
 
+use Kunstmaan\AdminBundle\Entity\AbstractEntity;
 use Kunstmaan\AdminBundle\Entity\DeepCloneInterface;
 use Kunstmaan\AdminBundle\Event\DeepCloneAndSaveEvent;
-use Kunstmaan\AdminBundle\Entity\AbstractEntity;
 
 /**
  * This listener will make sure the id isn't copied for AbstractEntities

src/Kunstmaan/AdminBundle/Form/GroupType.php

@@ -3,7 +3,6 @@
 namespace Kunstmaan\AdminBundle\Form;
 
 use Doctrine\ORM\EntityRepository;
-
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 

src/Kunstmaan/AdminBundle/Form/UserType.php

@@ -4,8 +4,8 @@
 
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * UserType defines the form used for {@link User}

src/Kunstmaan/AdminBundle/Helper/CloneHelper.php

@@ -3,11 +3,9 @@
 namespace Kunstmaan\AdminBundle\Helper;
 
 use Doctrine\ORM\EntityManager;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-use Kunstmaan\AdminBundle\Event\Events;
 use Kunstmaan\AdminBundle\Event\DeepCloneAndSaveEvent;
+use Kunstmaan\AdminBundle\Event\Events;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * This helper will help you to clone Entities

src/Kunstmaan/AdminBundle/Helper/Creators/ACLPermissionCreator.php

@@ -2,8 +2,8 @@
 
 namespace Kunstmaan\AdminBundle\Helper\Creators;
 
-use Symfony\Component\Security\Acl\Exception\AclNotFoundException;
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
+use Symfony\Component\Security\Acl\Exception\AclNotFoundException;
 use Symfony\Component\Security\Acl\Model\EntryInterface;
 use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface;
 use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface;
@@ -109,4 +109,4 @@ public function initByMap($object, $map, $force = false)
         $this->init($object, $aces, $force);
     }
 
-}
+}

src/Kunstmaan/AdminBundle/Helper/FormHelper.php

@@ -2,8 +2,8 @@
 
 namespace Kunstmaan\AdminBundle\Helper;
 
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\FormView;
 
 /**
  * Helper class for forms

src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php

@@ -4,10 +4,9 @@
 
 use Doctrine\ORM\EntityManager;
 use Kunstmaan\AdminBundle\Helper\FormHelper;
-
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php

@@ -2,8 +2,8 @@
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets;
 
 use Doctrine\ORM\EntityManager;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Kunstmaan/AdminBundle/Helper/FormWidgets/ListWidget.php

@@ -2,8 +2,8 @@
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets;
 
 use Doctrine\ORM\EntityManager;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php

@@ -1,11 +1,11 @@
 <?php
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs;
 
-use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget;
-use Kunstmaan\AdminBundle\Helper\FormHelper;
 use Doctrine\ORM\EntityManager;
-use Symfony\Component\Form\FormView;
+use Kunstmaan\AdminBundle\Helper\FormHelper;
+use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/TabPane.php

@@ -1,12 +1,12 @@
 <?php
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs;
 
-use Kunstmaan\UtilitiesBundle\Helper\Slugifier;
 use Doctrine\ORM\EntityManager;
+use Kunstmaan\UtilitiesBundle\Helper\Slugifier;
 use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

src/Kunstmaan/AdminBundle/Helper/Menu/MenuAdaptorInterface.php

@@ -2,9 +2,6 @@
 
 namespace Kunstmaan\AdminBundle\Helper\Menu;
 
-use Kunstmaan\AdminBundle\Helper\Menu\MenuBuilder;
-use Kunstmaan\AdminBundle\Helper\Menu\MenuItem;
-
 use Symfony\Component\HttpFoundation\Request;
 
 /**