Passage à ZF3

Bertrand Gauthierrequested to merge
release-3.0.0 into master

Merge request reports

src/UnicaenLeocarte/Controller/IndexControllerFactory.php

+4 −4
Changes for src/UnicaenLeocarte/Controller/IndexControllerFactory.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


namespace UnicaenLeocarte\Controller;



use Interop\Container\ContainerInterface;

use UnicaenLeocarte\Options\ModuleOptions;

use Zend\Mvc\Controller\ControllerManager;



/**

 * IndexController factory.
@@ -12,13 +12,13 @@ use Zend\Mvc\Controller\ControllerManager; 
 */

class IndexControllerFactory

{

    function __invoke(ControllerManager $controllerManager)

    function __invoke(ContainerInterface $container)

    {

        /** @var ModuleOptions $options */

        $options = $controllerManager->getServiceLocator()->get('UnicaenLeocarte\Options');

        $options = $container->get('UnicaenLeocarte\Options');



        /** @var \UnicaenLeocarte\Service\Photo\PhotoService $photoService */

        $photoService = $controllerManager->getServiceLocator()->get('UnicaenLeocarte\Service\Photo');

        $photoService = $container->get('UnicaenLeocarte\Service\Photo');



        $controller = new IndexController();

        $controller->setPhotoService($photoService);

src/UnicaenLeocarte/Options/ModuleOptionsFactory.php

+4 −11
Changes for src/UnicaenLeocarte/Options/ModuleOptionsFactory.php: 4 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -2,26 +2,19 @@ 


namespace UnicaenLeocarte\Options;



use Interop\Container\ContainerInterface;

use Zend\ServiceManager\Exception\InvalidArgumentException;

use Zend\ServiceManager\FactoryInterface;

use Zend\ServiceManager\ServiceLocatorInterface;



/**

 * Module options factory.

 *

 * @author Unicaen

 */

class ModuleOptionsFactory implements FactoryInterface

class ModuleOptionsFactory

{

    /**

     * Create service

     *

     * @param ServiceLocatorInterface $serviceLocator

     * @return mixed

     */

    public function createService(ServiceLocatorInterface $serviceLocator)

    public function __invoke(ContainerInterface $container)

    {

        $config = $serviceLocator->get('Configuration');

        $config = $container->get('Configuration');



        $key = 'unicaen-leocarte';

src/UnicaenLeocarte/Service/Photo/PhotoServiceFactory.php

+5 −6
Changes for src/UnicaenLeocarte/Service/Photo/PhotoServiceFactory.php: 5 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -2,25 +2,24 @@ 


namespace UnicaenLeocarte\Service\Photo;



use Interop\Container\ContainerInterface;

use UnicaenLeocarte\Options\ModuleOptions;

use UnicaenLeocarte\Service\Soap\SoapClient;

use Zend\ServiceManager\FactoryInterface;

use Zend\ServiceManager\ServiceLocatorInterface;



/**

 * Leocarte Service factory.

 *

 * @author Unicaen

 */

class PhotoServiceFactory implements FactoryInterface

class PhotoServiceFactory

{

    public function createService(ServiceLocatorInterface $serviceLocator)

    public function __invoke(ContainerInterface $container)

    {

        /** @var ModuleOptions $options */

        $options = $serviceLocator->get('UnicaenLeocarte\Options');

        $options = $container->get('UnicaenLeocarte\Options');



        /** @var SoapClient $soapClient */

        $soapClient = $serviceLocator->get('UnicaenLeocarte\Soap\Client');

        $soapClient = $container->get('UnicaenLeocarte\Soap\Client');



        $service = new PhotoService();

        $service->setSoapClient($soapClient);

src/UnicaenLeocarte/Service/Soap/SoapClientFactory.php

+3 −4
Changes for src/UnicaenLeocarte/Service/Soap/SoapClientFactory.php: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -2,18 +2,17 @@ 


namespace UnicaenLeocarte\Service\Soap;



use Interop\Container\ContainerInterface;

use UnicaenLeocarte\Options\ModuleOptions;

use Zend\ServiceManager\FactoryInterface;

use Zend\ServiceManager\ServiceLocatorInterface;



/**

 * Leocarte Soap Client factory.

 *

 * @author Unicaen

 */

class SoapClientFactory implements FactoryInterface

class SoapClientFactory

{

    public function createService(ServiceLocatorInterface $serviceLocator)

    public function __invoke(ContainerInterface $serviceLocator)

    {

        /** @var ModuleOptions $options */

        $options = $serviceLocator->get('UnicaenLeocarte\Options');

.gitignore

0 → 100644
+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
vendor/
 
 No newline at end of file