Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More insight fixes #8

Merged
merged 2 commits into from
Sep 20, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 4 additions & 6 deletions src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions src/Kunstmaan/AdminBundle/Command/CreateGroupCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
*/
Expand Down
6 changes: 2 additions & 4 deletions src/Kunstmaan/AdminBundle/Command/CreateRoleCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/AdminBundle/Command/CreateUserCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/Kunstmaan/AdminBundle/Command/FixAdminLocaleCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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>');
}
}
}
3 changes: 1 addition & 2 deletions src/Kunstmaan/AdminBundle/Command/FixGuestCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -100,4 +99,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
$output->writeln('<error>ROLE_GUEST not found : you\'re on your own!</error>');
}
}
}
}
6 changes: 2 additions & 4 deletions src/Kunstmaan/AdminBundle/Controller/DefaultController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
3 changes: 0 additions & 3 deletions src/Kunstmaan/AdminBundle/Controller/ModulesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 0 additions & 2 deletions src/Kunstmaan/AdminBundle/Controller/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
4 changes: 1 addition & 3 deletions src/Kunstmaan/AdminBundle/DataFixtures/ORM/GroupFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/Kunstmaan/AdminBundle/DataFixtures/ORM/RoleFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
12 changes: 5 additions & 7 deletions src/Kunstmaan/AdminBundle/Entity/Group.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/Kunstmaan/AdminBundle/Entity/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/AdminBundle/EventListener/CloneListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Kunstmaan/AdminBundle/Form/GroupType.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Kunstmaan\AdminBundle\Form;

use Doctrine\ORM\EntityRepository;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;

Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/AdminBundle/Form/UserType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 2 additions & 4 deletions src/Kunstmaan/AdminBundle/Helper/CloneHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -109,4 +109,4 @@ public function initByMap($object, $map, $force = false)
$this->init($object, $aces, $force);
}

}
}
2 changes: 1 addition & 1 deletion src/Kunstmaan/AdminBundle/Helper/FormHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
6 changes: 3 additions & 3 deletions src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
6 changes: 3 additions & 3 deletions src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/TabPane.php
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Loading