Commit 412fd597 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Retrait des appels à UnicaenRenderer

parent 3a6bf864
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
    "require": {
        "php": "^8.0",
        "unicaen/privilege": "^5.0",
        "laminas/laminas-dependency-plugin": "^2.1"
        "laminas/laminas-dependency-plugin": "^2.1",
    },
    "autoload": {
        "psr-0": [],
+6 −29
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace UnicaenRenderer\Form\Macro;

use Doctrine\ORM\EntityManager;
use DoctrineModule\Persistence\ProvidesObjectManager;
use Laminas\Form\Element\Button;
use Laminas\Form\Element\Hidden;
use Laminas\Form\Element\Text;
@@ -12,36 +13,12 @@ use Laminas\InputFilter\Factory;
use Laminas\Validator\Callback;
use UnicaenRenderer\Entity\Db\Macro;

class MacroForm extends Form
{

    /**
     * @var EntityManager
     */
    protected $entityManager;

    /**
     * Spécifie le gestionnaire d'entité.
     *
     * @param EntityManager $entityManager
     * @return self
     */
    public function setEntityManager(EntityManager $entityManager)
    {
        $this->entityManager = $entityManager;

        return $this;
    }

/**
     * Retourne le gestionnaire d'entité.
     *
     * @return EntityManager
 * @property EntityManager $objectManager
 */
    public function getEntityManager()
class MacroForm extends Form
{
        return $this->entityManager;
    }
    use ProvidesObjectManager;

    public function init()
    {
@@ -124,7 +101,7 @@ class MacroForm extends Form
                        ],
                        'callback' => function ($value, $context = []) {
                            if ($value == $context['old-code']) return true;
                            return ($this->getEntityManager()->getRepository(Macro::class)->findOneBy(['code' => $value], []) == null);
                            return ($this->objectManager->getRepository(Macro::class)->findOneBy(['code' => $value], []) == null);
                        },
                        //'break_chain_on_failure' => true,
                    ],
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class MacroFormFactory {
        $hydrator = $container->get('HydratorManager')->get(MacroHydrator::class);

        $form = new MacroForm();
        $form->setEntityManager($entityManager);
        $form->setObjectManager($entityManager);
        $form->setHydrator($hydrator);
        return $form;
    }
+7 −29
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace UnicaenRenderer\Form\Template;

use Doctrine\ORM\EntityManager;
use DoctrineModule\Persistence\ProvidesObjectManager;
use Laminas\Form\Element\Button;
use Laminas\Form\Element\Hidden;
use Laminas\Form\Element\Select;
@@ -13,37 +14,14 @@ use Laminas\Validator\Callback;
use UnicaenRenderer\Entity\Db\Template;
use UnicaenRenderer\Service\Macro\MacroServiceAwareTrait;

class TemplateForm extends Form
{
    use MacroServiceAwareTrait;

/**
     * @var EntityManager
 * @property EntityManager $objectManager
 */
    protected $entityManager;

    /**
     * Spécifie le gestionnaire d'entité.
     *
     * @param EntityManager $entityManager
     * @return self
     */
    public function setEntityManager(EntityManager $entityManager)
class TemplateForm extends Form
{
        $this->entityManager = $entityManager;

        return $this;
    }
    use MacroServiceAwareTrait;
    use ProvidesObjectManager;
    
    /**
     * Retourne le gestionnaire d'entité.
     *
     * @return EntityManager
     */
    public function getEntityManager()
    {
        return $this->entityManager;
    }

    public function getMacros() : string
    {
@@ -171,7 +149,7 @@ class TemplateForm extends Form
                        ],
                        'callback' => function ($value, $context = []) {
                            if ($value == $context['old-code']) return true;
                            return ($this->getEntityManager()->getRepository(Template::class)->findOneBy(['code' => $value], []) == null);
                            return ($this->objectManager->getRepository(Template::class)->findOneBy(['code' => $value], []) == null);
                        },
                        //'break_chain_on_failure' => true,
                    ],
+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class TemplateFormFactory {
        $hydrator = $container->get('HydratorManager')->get(TemplateHydrator::class);

        $form = new TemplateForm();
        $form->setEntityManager($entityManager);
        $form->setObjectManager($entityManager);
        $form->setMacroService($macroService);
        $form->setHydrator($hydrator);
        return $form;
Loading