Commit 5c1d5f7f authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branches 'master' and 'zf-3.x' of https://git.unicaen.fr/lib/unicaen/import

parents cca7cd5d d2efbf09

composer.json

+3 −3
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ 
        }

    ],

    "require"     : {

        "unicaen/auth":   "^1.2 || dev-master",

        "unicaen/oracle": "^1.1 || dev-master"

        "unicaen/auth":   "dev-zf-3.x || ^3.0",

        "unicaen/oracle": "^1.2"

    },

    "require-dev" : {

        "phpunit/PHPUnit": "^5.7"

        "phpunit/phpunit": "^5.7"

    },

    "autoload"    : {

        "psr-0"   : {

src/UnicaenImport/Controller/Factory/DifferentielControllerFactory.php

+1 −6
Original line number Diff line number Diff line
@@ -2,13 +2,11 @@ 


namespace UnicaenImport\Controller\Factory;



use Interop\Container\ContainerInterface;

use UnicaenImport\Controller\DifferentielController;

use UnicaenImport\Service\DifferentielService;

use UnicaenImport\Service\QueryGeneratorService;

use UnicaenImport\Service\SchemaService;

use Zend\Mvc\Controller\ControllerManager as ContainerInterface;







/**

 * Description of DifferentielControllerFactory
@@ -27,9 +25,6 @@ class DifferentielControllerFactory 
     */

    public function __invoke(ContainerInterface $container, $requestedName, $options = null)

    {

        /* On quitte le ControllerManager */

        $container = $container->getServiceLocator();



        $controller = new DifferentielController();

        $controller->setServiceSchema($container->get(SchemaService::class));

        $controller->setServiceQueryGenerator($container->get(QueryGeneratorService::class));

src/UnicaenImport/Controller/Factory/ImportControllerFactory.php

+1 −4
Original line number Diff line number Diff line
@@ -2,11 +2,10 @@ 


namespace UnicaenImport\Controller\Factory;



use Interop\Container\ContainerInterface;

use UnicaenImport\Controller\ImportController;

use UnicaenImport\Processus\ImportProcessus;

use UnicaenImport\Service\SchemaService;

use Zend\Mvc\Controller\ControllerManager as ContainerInterface;





/**

 * Description of ImportControllerFactory
@@ -25,8 +24,6 @@ class ImportControllerFactory 
     */

    public function __invoke(ContainerInterface $container, $requestedName, $options = null)

    {

        $container = $container->getServiceLocator();



        $controller = new ImportController();

        $controller->setServiceSchema($container->get(SchemaService::class));

        $controller->setProcessusImport($container->get(ImportProcessus::class));

src/UnicaenImport/Controller/Factory/SourceControllerFactory.php

+1 −6
Original line number Diff line number Diff line
@@ -2,13 +2,11 @@ 


namespace UnicaenImport\Controller\Factory;



use Interop\Container\ContainerInterface;

use UnicaenImport\Form\SourceForm;

use UnicaenImport\Service\SourceService;

use Zend\Mvc\Controller\ControllerManager as ContainerInterface;

use UnicaenImport\Controller\SourceController;







/**

 * Description of SourceControllerFactory

 *
@@ -26,9 +24,6 @@ class SourceControllerFactory 
     */

    public function __invoke(ContainerInterface $container, $requestedName, $options = null)

    {

        /* On quitte le ControllerManager */

        $container = $container->getServiceLocator();



        $controller = new SourceController;

        $controller->setServiceSource($container->get(SourceService::class));

        $controller->setFormSource($container->get('FormElementManager')->get(SourceForm::class));

src/UnicaenImport/Controller/Factory/TableControllerFactory.php

+2 −6
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ 


namespace UnicaenImport\Controller\Factory;



use Interop\Container\ContainerInterface;

use UnicaenImport\Controller\TableController;

use UnicaenImport\Form\TableForm;

use UnicaenImport\Service\SchemaService;

use UnicaenImport\Service\TableService;

use Zend\Mvc\Controller\ControllerManager as ContainerInterface;

use UnicaenImport\Controller\TableController;







/**
@@ -27,9 +26,6 @@ class TableControllerFactory 
     */

    public function __invoke(ContainerInterface $container, $requestedName, $options = null)

    {

        /* On quitte le ControllerManager */

        $container = $container->getServiceLocator();



        $controller = new TableController;

        $controller->setServiceTable($container->get(TableService::class));

        $controller->setServiceSchema($container->get(SchemaService::class));