Commit 3c1892b0 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Retrait des interfaces car déplacé dans le module UnicaenUtilisateurOctopusAdapter

parent b848a105

config/module.config.php

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ use Octopus\Service\OffreDeFormation\OffreDeFormationServiceFactory; 
use Octopus\Service\Structure\StructureService;

use Octopus\Service\Structure\StructureServiceFactory;

//use UnicaenAuth\Guard\PrivilegeController;

use UnicaenAutorisation\Guard\PrivilegeController;

use UnicaenPrivilege\Guard\PrivilegeController;

use Zend\Router\Http\Literal;



return [

src/Octopus/Entity/Db/Individu.php

+1 −26
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ namespace Octopus\Entity\Db; 
// TODO prendre les overwrites, normalisés, phonétiques

use DateTime;

use Doctrine\Common\Collections\ArrayCollection;

use UnicaenUtilisateur\Service\RechercheIndividu\SearchIndividuResultInterface;



class Individu implements SearchIndividuResultInterface {

class Individu {

    /** @var integer */

    private $cIndividuChaine;

    /** @var Source */
@@ -248,28 +247,4 @@ class Individu implements SearchIndividuResultInterface { 
        }

        return $texte;

    }



    /** Fonction de l'interface SearchIndividuResultInterface */



    public function getId() {

        return $this->getCIndividuChaine();

    }



    /** TODO changer lorsque le compte sera lié dans octopus */

    public function getUsername()

    {

        return $this->getCIndividuChaine();

    }



    public function getDisplayname()

    {

        return $this->__toString();

    }



    /** TODO changer lorsque le compte sera lié dans octopus */

    public function getEmail()

    {

        return "ne-pas-repondre@unicaen.fr";

    }



}
 
 No newline at end of file

src/Octopus/Service/Individu/IndividuService.php

+2 −21
Original line number Diff line number Diff line
@@ -8,29 +8,10 @@ use Octopus\Entity\Db\Source; 
use UnicaenApp\Exception\RuntimeException;

use UnicaenApp\Service\EntityManagerAwareTrait;

use UnicaenUtilisateur\Entity\Db\User;

use UnicaenUtilisateur\Service\RechercheIndividu\SearchIndividuServiceInterface;



class IndividuService implements SearchIndividuServiceInterface {

class IndividuService {

    use EntityManagerAwareTrait;

    

    /** Fonctions associées à l'interface SearchIndividuServiceInterface */



    /**

     * @param $id

     * @return \UnicaenUtilisateur\Service\RechercheIndividu\SearchIndividuResultInterface|void

     */

    public function findById($id)

    {

        $individu = $this->getIndividu($id);

        return $individu;

    }



    public function findByTerm($term)

    {

        $individus = $this->getIndividusByTerm($term);

        return $individus;

    }



    /**

     * @param string $order

     * @return Individu[]