Commit 65f9d6b3 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix Tests unitaires

parent 7d6245c3

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config/autoload/local.php 
config/autoload/oscar-editable.yml

config/autoload/unicaen-app.local.php

config/autoload/unicaen-auth.local.php

config/autoload/unicaen-signature.local.php

config/oscarworker.service

trash

config/autoload/unicaen-signature.local.php

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

return [

    'unicaen-signature' => [

        'letterfiles' => [

            [

                'label'     => 'ESUP signature',

                'name'      => 'esup',

                'default'   => true,

                'class'     => \UnicaenSignature\Strategy\Letterfile\EsupLetterfileStrategy::class,

                'levels'    => [

                    'visa_visuel' => 'visa_visuel_in_esup',

                    'sign_visuel' => 'sign_visuel_in_esup',

                    'sign_certif' => 'sign_certif_in_esup',

                    'sign_eidas' => 'sign_eidas_in_esup',

                ],

                'config'    => [

                    // ESUP configuration

                    'url' => "https://esup.unicaen.fr/"

                ]

            ],

            [

                'label'     => 'OSCAR visa',

                'name'      => 'oscar',

                'default'   => false,

                'class'     => \UnicaenSignature\Strategy\Letterfile\OscarLetterfileStrategy::class,

                'levels'    => [

                    'visa_hidden' => 'visa_hidden',

                ],

                'config'    => [



                ]

            ]

        ]

    ]

];
 
 No newline at end of file

module/Oscar/src/Oscar/Factory/JsonToOrganization.php

+6 −3
Original line number Diff line number Diff line
@@ -74,19 +74,22 @@ class JsonToOrganization extends JsonToObject implements IJsonToOrganisation 
            ->setUrl($this->getFieldValue($jsonData, 'url'))

            ->setSiret($this->getFieldValue($jsonData, 'siret'))

            ->setType($this->getFieldValue($jsonData, 'type'))

            ->setTypeObj($this->getTypeObj($this->getFieldValue($jsonData, 'type')))



            // Ajout de champs

            ->setDuns($this->getFieldValue($jsonData, 'duns'))

            ->setTvaintra($this->getFieldValue($jsonData, 'tvaintra'))

            ->setRnsr($this->getFieldValue($jsonData, 'rnsr'));









        if (property_exists($jsonData, 'parent')) {

            echo $jsonData->code . " a un parent '" . $jsonData->parent . "'\n";

            $object->updateParentCycleCode($jsonData->parent);

            //$object->setParent()

        }



        if (property_exists($jsonData, 'type')) {

            $object->setTypeObj($this->getTypeObj($this->getFieldValue($jsonData, 'type')));

        }



        if (property_exists($jsonData, 'address')) {

            $address = $jsonData->address;

module/Oscar/src/Oscar/Utils/ArrayUtils.php

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ namespace Oscar\Utils; 
 */

class ArrayUtils

{

    public static function implode(string $separator, ?array $array) :string

    public static function implode(string $separator, ?array $array = null) :string

    {

        if( $array === null ) {

            return "";
@@ -18,7 +18,7 @@ class ArrayUtils 
    }





    public static function explodeFromString( ?string $from, string $separator, bool $throw = true ) :array

    public static function explodeFromString( ?string $from = null, string $separator = ',', bool $throw = true ) :array

    {

        if( $from == null ){

            return [];

module/Oscar/src/Oscar/Utils/DateTimeUtils.php

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ class DateTimeUtils 
     * @param mixed ...$bounds

     * @return array

     */

    public function allPeriodsFromDates(...$bounds)

    static public function allPeriodsFromDates(...$bounds)

    {

        $out = [];

        foreach ($bounds as $bound) {