Commit 23d1f6c5 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Cleaning

parent b545d1d5

Module.php

+10 −3
Original line number Diff line number Diff line
@@ -2,15 +2,22 @@ 


namespace UnicaenParametre;



use Laminas\Config\Config;

use Laminas\Config\Factory as ConfigFactory;

use Laminas\Mvc\ModuleRouteListener;

use Laminas\Mvc\MvcEvent;

use Laminas\Stdlib\ArrayUtils;

use Laminas\Stdlib\Glob;

use Psr\Container\ContainerExceptionInterface;

use Psr\Container\NotFoundExceptionInterface;



class Module

{

    public function onBootstrap(MvcEvent $e)

    /**

     * @throws ContainerExceptionInterface

     * @throws NotFoundExceptionInterface

     */

    public function onBootstrap(MvcEvent $e): void

    {

        $e->getApplication()->getServiceManager()->get('translator');

        $eventManager = $e->getApplication()->getEventManager();
@@ -18,7 +25,7 @@ class Module 
        $moduleRouteListener->attach($eventManager);

    }



    public function getConfig()

    public function getConfig(): array|Config

    {

        $configInit = [

            __DIR__ . '/config/module.config.php'
@@ -32,7 +39,7 @@ class Module 
    }





    public function getAutoloaderConfig()

    public function getAutoloaderConfig(): array

    {

        return array(

            'Laminas\Loader\StandardAutoloader' => array(

src/UnicaenParametre/Form/Categorie/CategorieForm.php

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ use Laminas\Validator\Callback; 
class CategorieForm extends Form {

    use CategorieServiceAwareTrait;



    public function init()

    public function init(): void

    {

        //code

        $this->add([

src/UnicaenParametre/Form/Categorie/CategorieHydrator.php

+2 −9
Original line number Diff line number Diff line
@@ -7,12 +7,9 @@ use Laminas\Hydrator\HydratorInterface; 


class CategorieHydrator implements HydratorInterface {



    /**

     * @param Categorie $object

     * @return array|void

     */

    public function extract(object $object) : array

    {

        /** @var Categorie $object */

        $data = [

            'code' => $object->getCode(),

            'libelle' => $object->getLibelle(),
@@ -22,11 +19,6 @@ class CategorieHydrator implements HydratorInterface { 
        return $data;

    }



    /**

     * @param array $data

     * @param Categorie $object

     * @return Categorie

     */

    public function hydrate(array $data, $object) : object

    {

        $code = (isset($data['code']) and trim($data['code']) !== '')?trim($data['code']):null;
@@ -34,6 +26,7 @@ class CategorieHydrator implements HydratorInterface { 
        $description = (isset($data['description']) and trim($data['description']) !== '')?trim($data['description']):null;

        $ordre = (isset($data['ordre']) and trim($data['ordre']) !== '')?trim($data['ordre']):null;



        /** @var Categorie $object */

        $object->setCode($code);

        $object->setLibelle($libelle);

        $object->setDescription($description);

src/UnicaenParametre/Form/Parametre/ParametreForm.php

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ use Laminas\Validator\Callback; 
class ParametreForm extends Form {

    use ParametreServiceAwareTrait;



    public function init() {

    public function init(): void

    {

        //code

        $this->add([

            'type' => Text::class,
@@ -135,14 +136,13 @@ class ParametreForm extends Form { 
        ]));

    }



    public function setOldCode($value){

    public function setOldCode($value): void

    {

        $this->get('old-code')->setValue($value);

    }



    /**

     * @param Categorie|null $categorie

     */

    public function setCategorie(?Categorie $categorie){

    public function setCategorie(?Categorie $categorie): void

    {

        if ($categorie !== null) {

            $this->get('categorie-code')->setValue($categorie->getCode());

        }

src/UnicaenParametre/Form/Parametre/ParametreHydrator.php

+2 −9
Original line number Diff line number Diff line
@@ -7,12 +7,9 @@ use Laminas\Hydrator\HydratorInterface; 


class ParametreHydrator implements HydratorInterface {



    /**

     * @param Parametre $object

     * @return array

     */

    public function extract($object) : array

    {

        /** @var Parametre $object */

        $data = [

            'code' => $object->getCode(),

            'libelle' => $object->getLibelle(),
@@ -23,11 +20,6 @@ class ParametreHydrator implements HydratorInterface { 
        return $data;

    }



    /**

     * @param array $data

     * @param Parametre $object

     * @return Parametre

     */

    public function hydrate(array $data, $object) : object

    {

        $code = (isset($data['code']) and trim($data['code']) !== '')?trim($data['code']):null;
@@ -36,6 +28,7 @@ class ParametreHydrator implements HydratorInterface { 
        $valeurs = (isset($data['possibles']) and trim($data['possibles']) !== '')?trim($data['possibles']):null;

        $ordre = (isset($data['ordre']) and trim($data['ordre']) !== '')?trim($data['ordre']):null;



        /** @var Parametre $object */

        $object->setCode($code);

        $object->setLibelle($libelle);

        $object->setDescription($description);