Commit 454a17b0 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'laminas' into test

parents 2f72ed59 097a487c

module/ImportData/src/V2/Rest/Version/VersionEntity.php

+27 −11
Changes for module/ImportData/src/V2/Rest/Version/VersionEntity.php: 27 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -4,28 +4,44 @@ namespace ImportData\V2\Rest\Version; 


class VersionEntity

{

    /**

     * @var string Version number, ex: "1.1.0"

     */

    private $id;

    private string $id;

    private string $number;

    private string $date;



    /**

     * VersionEntity constructor.

     *

     * @param string $id Version number, ex: "1.1.0"

     * @param string $versionNumber Version number, ex: "1.1.0"

     * @param string $versionDate Version date, ex : "11/07/2022"

     */

    public function __construct($id)

    public function __construct(string $versionNumber, string $versionDate)

    {

        $this->id = $id;

        $this->id = $versionNumber;

        $this->number = $versionNumber;

        $this->date = $versionDate;

    }



    /**

     * Returns the version number, ex: "1.1.0".

     *

     * @return string

     * @return string Ex : "1.1.0".

     */

    public function getId()

    public function getId(): string

    {

        return $this->id;

    }



    /**

     * @return string Ex : "1.1.0".

     */

    public function getNumber(): string

    {

        return $this->number;

    }



    /**

     * @return string Ex : "11/07/2022"

     */

    public function getDate(): string

    {

        return $this->date;

    }

}

module/ImportData/src/V2/Rest/Version/VersionResource.php

+10 −11
Changes for module/ImportData/src/V2/Rest/Version/VersionResource.php: 10 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -2,26 +2,22 @@ 


namespace ImportData\V2\Rest\Version;



use Laminas\ApiTools\ApiProblem\ApiProblem;

use Laminas\ApiTools\Rest\AbstractResourceListener;



class VersionResource extends AbstractResourceListener

{

    const VERSION_INCONNUE = 'Inconnue';

    const INCONNUE = 'Inconnue';



    /**

     * @var string

     */

    private $version;

    private array $appInfos;



    /**

     * VersionResource constructor.

     *

     * @param string $version

     * @param array $appInfos

     */

    public function __construct($version = null)

    public function __construct(array $appInfos)

    {

        $this->version = $version ?: self::VERSION_INCONNUE;

        $this->appInfos = $appInfos;

    }



    /**
@@ -30,8 +26,11 @@ class VersionResource extends AbstractResourceListener 
     * @param  string $id

     * @return VersionEntity

     */

    public function fetch($id)

    public function fetch($id): VersionEntity

    {

        return new VersionEntity($this->version);

        return new VersionEntity(

            $this->appInfos['version'] ?: self::INCONNUE,

            $this->appInfos['date'] ?: self::INCONNUE

        );

    }

}

module/ImportData/src/V2/Rest/Version/VersionResourceFactory.php

+6 −5
Changes for module/ImportData/src/V2/Rest/Version/VersionResourceFactory.php: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -9,14 +9,15 @@ class VersionResourceFactory 
    /**

     * @param ContainerInterface $container

     * @return VersionResource

     * @throws \Psr\Container\ContainerExceptionInterface

     * @throws \Psr\Container\NotFoundExceptionInterface

     */

    public function __invoke(ContainerInterface $container)

    public function __invoke(ContainerInterface $container): VersionResource

    {

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

        $version = isset($config['unicaen-app']['app_infos']['version']) ?

            $config['unicaen-app']['app_infos']['version'] :

            null;



        return new VersionResource($version);

        $appInfos = $config['unicaen-app']['app_infos'] ?? [];



        return new VersionResource($appInfos);

    }

}