betatesting correctif

Controller/Reminder/ReminderAdminController.php

@@ -3,8 +3,6 @@
 namespace Lc\SovBundle\Controller\Reminder;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Lc\CaracoleBundle\Resolver\MerchantResolver;
-use Lc\CaracoleBundle\Resolver\SectionResolver;
 use Lc\SovBundle\Factory\Reminder\ReminderFactoryInterface;
 use Lc\SovBundle\Form\Reminder\ReminderAdminFormType;
 use Lc\SovBundle\Repository\Reminder\ReminderRepositoryQueryInterface;
@@ -35,8 +33,6 @@ class ReminderAdminController extends AbstractController
             ReminderRepositoryQueryInterface $reminderRepositoryQuery,
             FormFactoryInterface $formFactory,
             UrlGeneratorInterface $urlGenerator,
-            MerchantResolver $merchantResolver,
-            SectionResolver $sectionResolver,
             ParameterBagInterface $parameterBag
     ) {
         $this->entityManager = $entityManager;
@@ -44,8 +40,6 @@ class ReminderAdminController extends AbstractController
         $this->reminderRepositoryQuery = $reminderRepositoryQuery;
         $this->formFactory = $formFactory;
         $this->urlGenerator = $urlGenerator;
-        $this->merchantResolver = $merchantResolver;
-        $this->sectionResolver = $sectionResolver;
         $this->parameterBag = $parameterBag;
     }
 

Controller/User/UserAdminController.php

@@ -23,7 +23,6 @@ abstract class UserAdminController extends AbstractAdminController
             TranslatorAdmin $translatorAdmin,
             RolesDefinitionInterface $rolesDefinition
     ) {
-        parent::__construct($session, $request, $em, $translatorAdmin);
         $this->rolesDefinition = $rolesDefinition;
     }
 

Form/Setting/SiteSettingsFormType.php

@@ -3,7 +3,6 @@
 namespace Lc\SovBundle\Form\Setting;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Lc\CaracoleBundle\Model\Merchant\MerchantInterface;
 use Lc\SovBundle\Model\Site\SiteInterface;
 use Lc\SovBundle\Translation\TranslatorAdmin;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;

Model/Site/PageModel.php

@@ -3,10 +3,6 @@
 namespace Lc\SovBundle\Model\Site;
 
 use Doctrine\ORM\Mapping as ORM;
-use Lc\CaracoleBundle\Doctrine\Extension\FilterMerchantInterface;
-use Lc\CaracoleBundle\Doctrine\Extension\FilterSectionInterface;
-use Lc\CaracoleBundle\Model\Merchant\MerchantInterface;
-use Lc\CaracoleBundle\Model\Section\SectionInterface;
 use Lc\SovBundle\Doctrine\Pattern\AbstractFullEntity;
 
 /**

Model/Site/SiteModel.php

@@ -5,7 +5,7 @@ namespace Lc\SovBundle\Model\Site;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Lc\CaracoleBundle\Model\Setting\EntitySettingTrait;
+//use Lc\CaracoleBundle\Model\Setting\EntitySettingTrait;
 use Lc\SovBundle\Model\Setting\SiteSettingInterface;
 use Lc\SovBundle\Doctrine\EntityInterface;
 use Lc\SovBundle\Doctrine\Extension\DevAliasInterface;
@@ -13,7 +13,7 @@ use Lc\SovBundle\Doctrine\Extension\DevAliasTrait;
 
 abstract class SiteModel implements SiteInterface, EntityInterface, DevAliasInterface
 {
-    use EntitySettingTrait;
+//    use EntitySettingTrait;
     use DevAliasTrait;
 
     /**