diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..8a5a03684b769d103ead21d73d692ce19a77129e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,24 @@ +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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 86135e8472831c96485cf7d1517432099749f571..9b406b220b64dc7a7080fd949382230722a271cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,4 +85,9 @@ et "supannEtuTypeDiplome" ------------------- - Ajout de l'attribut "unicaenRefProfil" -- Suppression des attributs "ucbnOrganisme" et "unicaenMonEtupass" \ No newline at end of file +- Suppression des attributs "ucbnOrganisme" et "unicaenMonEtupass" + +3.1.18 (16/03/2022) +------------------- + +- Suppression de l'attribut "ucbnSquidHash" \ No newline at end of file diff --git a/src/UnicaenLdap/Entity/Base/People.php b/src/UnicaenLdap/Entity/Base/People.php index 1f7c13b026a0377041f95e710a0b4e44bedb7fcd..2a4c390220b88b7d987b1a87a86ef3856bbfe507 100644 --- a/src/UnicaenLdap/Entity/Base/People.php +++ b/src/UnicaenLdap/Entity/Base/People.php @@ -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" * diff --git a/src/UnicaenLdap/Entity/Base/Structure.php b/src/UnicaenLdap/Entity/Base/Structure.php index e29c25fb9802b6087a3bbb109739ab34770fb6bc..ff879b2f3cee45ad06c4629e433079a8ec39967e 100644 --- a/src/UnicaenLdap/Entity/Base/Structure.php +++ b/src/UnicaenLdap/Entity/Base/Structure.php @@ -25,7 +25,6 @@ class Structure extends Entity 'top', 'organizationalUnit', 'supannEntite', - 'ucbnEntite', ]; /** diff --git a/src/UnicaenLdap/Entity/People.php b/src/UnicaenLdap/Entity/People.php index a51c7194e22c4eb4a1bb7b3c551b9d376753f811..6681c32bef8c766e1ef0f2a19d88401d5c43191b 100644 --- a/src/UnicaenLdap/Entity/People.php +++ b/src/UnicaenLdap/Entity/People.php @@ -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;