Nettoyage de code mal placé, car lié à OSE

src/UnicaenImport/Form/Factory/SourceFormFactory.php

@@ -12,7 +12,7 @@ use UnicaenImport\Form\SourceForm;
  */
 class SourceFormFactory
 {
-    public function __invoke(ContainerInterface $container)
+    public function __invoke(ContainerInterface $container, $requestedName, $options = null)
     {
         return new SourceForm;
     }

src/UnicaenImport/Form/Factory/TableFormFactory.php

@@ -12,7 +12,7 @@ use UnicaenImport\Form\TableForm;
  */
 class TableFormFactory
 {
-    public function __invoke(ContainerInterface $container)
+    public function __invoke(ContainerInterface $container, $requestedName, $options = null)
     {
         return new TableForm();
     }

src/UnicaenImport/Form/Traits/SourceFormAwareTrait.php

@@ -23,7 +23,7 @@ trait SourceFormAwareTrait
      *
      * @return self
      */
-    public function setFormSource( SourceForm $formSource )
+    public function setFormSource(SourceForm $formSource)
     {
         $this->formSource = $formSource;
 
@@ -38,12 +38,8 @@ trait SourceFormAwareTrait
      * @return SourceForm
      * @throws RuntimeException
      */
-    public function getFormSource() : SourceForm
+    public function getFormSource(): SourceForm
     {
-        if ($this->formSource){
-            return $this->formSource;
-        }else{
-            return \Application::$container->get('FormElementManager')->get(SourceForm::class);
-        }
+        return $this->formSource;
     }
 }
\ No newline at end of file

src/UnicaenImport/Form/Traits/TableFormAwareTrait.php

@@ -23,7 +23,7 @@ trait TableFormAwareTrait
      *
      * @return self
      */
-    public function setFormTable( TableForm $formTable )
+    public function setFormTable(TableForm $formTable)
     {
         $this->formTable = $formTable;
 
@@ -38,12 +38,8 @@ trait TableFormAwareTrait
      * @return TableForm
      * @throws RuntimeException
      */
-    public function getFormTable() : TableForm
+    public function getFormTable(): TableForm
     {
-        if ($this->formTable){
-            return $this->formTable;
-        }else{
-            return \Application::$container->get('FormElementManager')->get(TableForm::class);
-        }
+        return $this->formTable;
     }
 }
\ No newline at end of file

src/UnicaenImport/Processus/Factory/ImportProcessusFactory.php

@@ -6,7 +6,7 @@ use UnicaenImport\Processus\ImportProcessus;
 use UnicaenImport\Service\DifferentielService;
 use UnicaenImport\Service\QueryGeneratorService;
 use UnicaenImport\Service\TableService;
-use Zend\ServiceManager\ServiceLocatorInterface as ContainerInterface;
+use Interop\Container\ContainerInterface;
 
 
 /**