User form is created by factory now.

ikovalyov · ikovalyov · commit acd4e9ab5cd5 · 2017-07-19T16:07:37.000+02:00
diff --git a/config/module.config.php b/config/module.config.php
@@ -2,6 +2,8 @@
 namespace ProspectOne\UserModule;
 
 use ProspectOne\UserModule\Factory\BcryptFactory;
+use ProspectOne\UserModule\Form\Factory\UserFormFactory;
+use ProspectOne\UserModule\Form\UserForm;
 use ProspectOne\UserModule\Service\Factory\CurrentUserFactory;
 use Zend\Router\Http\Literal;
 use Zend\Router\Http\Segment;
@@ -88,6 +90,7 @@
             Service\UserManager::class => Service\Factory\UserManagerFactory::class,
             'ProspectOne\UserModule\Bcrypt' => BcryptFactory::class,
             'ProspectOne\UserModule\CurrentUser' => CurrentUserFactory::class,
+            UserForm::class => UserFormFactory::class,
         ],
     ],
     'view_manager' => [
diff --git a/src/Controller/Factory/UserControllerFactory.php b/src/Controller/Factory/UserControllerFactory.php
@@ -18,6 +18,6 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $userManager = $container->get(UserManager::class);
         
         // Instantiate the controller and inject dependencies
-        return new UserController($entityManager, $userManager);
+        return new UserController($entityManager, $userManager, $container);
     }
 }
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
@@ -6,6 +6,7 @@
 use ProspectOne\UserModule\Service\UserManager;
 use Zend\Hydrator\ClassMethods;
 use Zend\Mvc\Controller\AbstractActionController;
+use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View\Model\ViewModel;
 use ProspectOne\UserModule\Entity\User;
 use ProspectOne\UserModule\Form\UserForm;
@@ -32,15 +33,22 @@ class UserController extends AbstractActionController
      */
     private $userManager;
 
+    /**
+     * @var ServiceLocatorInterface
+     */
+    private $container;
+
     /**
      * Constructor.
      * @param EntityManager $entityManager
      * @param UserManager $userManager
+     * @param ServiceLocatorInterface $container
      */
-    public function __construct(EntityManager $entityManager, UserManager $userManager)
+    public function __construct(EntityManager $entityManager, UserManager $userManager, ServiceLocatorInterface $container)
     {
         $this->entityManager = $entityManager;
         $this->userManager = $userManager;
+        $this->container = $container;
     }
 
     /**
@@ -65,7 +73,7 @@ public function addAction()
         $rolesselector = $this->getRolesSelector();
 
         // Create user form
-        $form = new UserForm('create', $this->entityManager, null, $rolesselector, self::GUEST_ROLE_ID);
+        $form = $this->container->build(UserForm::class, ['create', $this->entityManager, null, $rolesselector, self::GUEST_ROLE_ID]);
 
         // Check if user has submitted the form
         if ($this->getRequest()->isPost()) {
@@ -144,7 +152,7 @@ public function editAction()
         $rolecurrent = $this->getUserRole($user);
 
         // Create user form
-        $form = new UserForm('update', $this->entityManager, $user, $rolesselector, $rolecurrent);
+        $form = $this->container->build(UserForm::class, ['update', $this->entityManager, $user, $rolesselector, $rolecurrent]);
 
         // Check if user has submitted the form
         if ($this->getRequest()->isPost()) {
diff --git a/src/Form/Factory/UserFormFactory.php b/src/Form/Factory/UserFormFactory.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace ProspectOne\UserModule\Form\Factory;
+
+use Doctrine\ORM\EntityManager;
+use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use ProspectOne\UserModule\Entity\User;
+use ProspectOne\UserModule\Form\UserForm;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+/**
+ * Class UserFormFactory
+ * @package ProspectOne\UserModule\Form\Factory
+ */
+class UserFormFactory implements FactoryInterface
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    /**
+     * UserFormFactory constructor.
+     * @param ContainerInterface|null $container
+     */
+    public function __construct(?ContainerInterface $container = null)
+    {
+        if (!empty($container)) {
+            $this->container = $container;
+        }
+    }
+
+    /**
+     * Create an object
+     *
+     * @param  ContainerInterface $container
+     * @param  string $requestedName
+     * @param  null|array $options
+     * @return object
+     * @throws ServiceNotFoundException if unable to resolve the service.
+     * @throws ServiceNotCreatedException if an exception is raised when
+     *     creating a service.
+     * @throws ContainerException if any other error occurs
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        if(empty($options)) {
+            return new UserForm();
+        }
+
+        return new UserForm(...$options);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o`
`18`	`18`	`$userManager = $container->get(UserManager::class);`
`19`	`19`
`20`	`20`	`// Instantiate the controller and inject dependencies`
`21`		`- return new UserController($entityManager, $userManager);`
	`21`	`+ return new UserController($entityManager, $userManager, $container);`
`22`	`22`	`}`
`23`	`23`	`}`