Commit db1f6aa0 authored by David Surville's avatar David Surville
Browse files

Merge branch 'release_3.1.0'

parents d18c23bf f57d05b0

.gitlab-ci.yml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
image: registre.unicaen.fr:5000/unicaen-dev-php7.3-apache



stages:

  - publish

  - tests



cache:

  key: ${CI_COMMIT_REF_SLUG}

  paths:

    - vendor/



#unit-tests:

#  stage: tests

#  script:

#    - composer install --no-interaction --no-suggest --no-progress

#    - php vendor/bin/phpunit --coverage-text=coverage.txt --colors=never

#  artifacts:

#    paths:

#      - coverage.txt



update-satis:

  stage: publish

  script:

    - curl https://gest.unicaen.fr/packagist/update
 
 No newline at end of file

CHANGELOG.md

+6 −1
Original line number Diff line number Diff line
@@ -86,3 +86,8 @@ et "supannEtuTypeDiplome" 


- Ajout de l'attribut "unicaenRefProfil"

- Suppression des attributs "ucbnOrganisme" et "unicaenMonEtupass"



3.1.18 (16/03/2022)

-------------------



- Suppression de l'attribut "ucbnSquidHash"
 
 No newline at end of file

src/UnicaenLdap/Entity/Base/People.php

+0 −19
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ class People extends Entity 
        'ucbnServiceWIFI',

        'ucbnSiteLocalisation',

        'ucbnSousStructure',

        'ucbnSquidHash',

        'ucbnStatus',

        'ucbnStructureRecherche',

        'uidNumber',
@@ -215,7 +214,6 @@ class People extends Entity 
        'telephoneNumber',

        'ucbnServiceADE',

        'ucbnServicePapercut',

        'ucbnSquidHash',

        'uidNumber',

        'unicaenLeocarteCSN',

        'unicaenMailPrincipal',
@@ -2249,23 +2247,6 @@ class People extends Entity 
        return $this;

    }



    /**

     * Attribut Ldap "ucbnSquidHash"

     *

     * @param string $value

     * @param bool $append

     * @return $this

     * @throws Exception

     * @throws LdapException

     */

    public function setUcbnSquidHash(string $value)

    {

        $value = "Unicaen:" . md5(sprintf('%s:Unicaen:%s', $this->supannAliasLogin, $value));

        $this->appendOrNot('ucbnSquidHash', $value, false);



        return $this;

    }



    /**

     * Attribut Ldap "campusPassword"

     *

src/UnicaenLdap/Entity/Base/Structure.php

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ class Structure extends Entity 
        'top',

        'organizationalUnit',

        'supannEntite',

        'ucbnEntite',

    ];



    /**

src/UnicaenLdap/Entity/People.php

+0 −1
Original line number Diff line number Diff line
@@ -718,7 +718,6 @@ class People extends BasePeople 
        parent::setUserPassword($value);

        parent::setNtPassword($value);

        parent::setSambaNTPassword($value);

        parent::setUcbnSquidHash($value);

        parent::setCampusPassword($value);



        return $this;