Commit cef3f49b authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-3.0.0' into 'master' 

Passage à ZF3

See merge request !1
parents 5f10ae32 836cc572

.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
vendor/
 
 No newline at end of file

composer.json

+3 −3
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
    "require": {

        "ext-soap":                                 "*",

        "ext-gd":                                   "*",

        "zendframework/zend-servicemanager":		"^2",

        "zendframework/zend-mvc":		            "^2",

        "zendframework/zend-servicemanager":		"^3",

        "zendframework/zend-mvc":		            "^3",

        "zendframework/zend-http":		            "^2",

        "zendframework/zend-soap":		            "^2",

        "zendframework/zend-stdlib":		        "^2"

        "zendframework/zend-stdlib":		        "^3"

    },

    "autoload": {

        "psr-0": {

composer.lock

+479 −487

File changed.

Preview size limit exceeded, changes collapsed.

src/UnicaenLeocarte/Controller/IndexControllerFactory.php

+4 −4
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
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';