Commit 891a4bcb authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Renommages et déplacements.

parent 6ee35ac1

config/module.config.php

+4 −4
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ namespace UnicaenLeocarte; 


use UnicaenLeocarte\Controller\IndexControllerFactory;

use UnicaenLeocarte\Options\ModuleOptionsFactory;

use UnicaenLeocarte\Service\LeocarteServiceFactory;

use UnicaenLeocarte\Service\Soap\LeocarteSoapClientFactory;

use UnicaenLeocarte\Service\Photo\PhotoServiceFactory;

use UnicaenLeocarte\Service\Soap\SoapClientFactory;



return [

    'bjyauthorize'    => [
@@ -52,9 +52,9 @@ return [ 
    ],

    'service_manager' => [

        'factories' => [

            'UnicaenLeocarte\Service'     => LeocarteServiceFactory::class,

            'UnicaenLeocarte\Service'     => PhotoServiceFactory::class,

            'UnicaenLeocarte\Options'     => ModuleOptionsFactory::class,

            'UnicaenLeocarte\Soap\Client' => LeocarteSoapClientFactory::class,

            'UnicaenLeocarte\Soap\Client' => SoapClientFactory::class,

        ],

    ],

src/UnicaenLeocarte/Controller/IndexController.php

+7 −7
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ namespace UnicaenLeocarte\Controller; 


use UnicaenLeocarte\Exception\ExtensionNotLoadedException;

use UnicaenLeocarte\Exception\NotFoundException;

use UnicaenLeocarte\Service\LeocarteServiceAwareInterface;

use UnicaenLeocarte\Service\LeocarteServiceAwareTrait;

use UnicaenLeocarte\Service\Photo\PhotoServiceAwareInterface;

use UnicaenLeocarte\Service\Photo\PhotoServiceAwareTrait;

use Zend\Http\PhpEnvironment\Response;

use Zend\Mvc\Controller\AbstractActionController;



class IndexController extends AbstractActionController implements LeocarteServiceAwareInterface

class IndexController extends AbstractActionController implements PhotoServiceAwareInterface

{

    use LeocarteServiceAwareTrait;

    use PhotoServiceAwareTrait;



    /**

     * @var bool Témoin indiquant si le droit d'utilisation de la photo doit être pris en considération ou non.
@@ -34,11 +34,11 @@ class IndexController extends AbstractActionController implements LeocarteServic 
        try {

            $autorise = true;

            if ($this->checkDroitUtilisationPhoto) {

                $autorise = $this->leocarteService->getDroitUtilisationPhoto($id);

                $autorise = $this->photoService->getDroitUtilisationPhoto($id);

            }

            $content = $autorise ?

                $this->leocarteService->getPhoto($id) :

                $this->leocarteService->createPhotoNonAutorisee();

                $this->photoService->getPhoto($id) :

                $this->photoService->createPhotoNonAutorisee();

        }

        catch (NotFoundException $e) {

            // Requête infructueuse

src/UnicaenLeocarte/Controller/IndexControllerFactory.php

+8 −3
Original line number Diff line number Diff line
@@ -2,18 +2,23 @@ 


namespace UnicaenLeocarte\Controller;



use UnicaenLeocarte\Service\LeocarteService;

use UnicaenLeocarte\Options\ModuleOptions;

use UnicaenLeocarte\Service\Photo\PhotoService;

use Zend\Mvc\Controller\ControllerManager;



class IndexControllerFactory

{

    function __invoke(ControllerManager $controllerManager)

    {

        /** @var LeocarteService $leocarteService */

        /** @var ModuleOptions $options */

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



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

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



        $controller = new IndexController();

        $controller->setLeocarteService($service);

        $controller->setPhotoService($service);

        $controller->setCheckDroitUtilisationPhoto($options->getCheckDroitUtilisationPhoto());



        return $controller;

    }

src/UnicaenLeocarte/Service/LeocarteServiceAwareInterface.php

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
<?php



namespace UnicaenLeocarte\Service;



interface LeocarteServiceAwareInterface

{

    public function setLeocarteService(LeocarteService $service);

}
 
 No newline at end of file

src/UnicaenLeocarte/Service/LeocarteServiceAwareTrait.php

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
<?php



namespace UnicaenLeocarte\Service;



trait LeocarteServiceAwareTrait

{

    /**

     * @var LeocarteService

     */

    protected $leocarteService;



    /**

     * @param LeocarteService $service

     */

    public function setLeocarteService(LeocarteService $service)

    {

        $this->leocarteService = $service;

    }

}
 
 No newline at end of file