Compare commits

...

2 Commits

  1. 2
      .gitlab-ci.yml
  2. 10
      CHANGELOG.md
  3. 11
      connecteur/depot-nextcloud/Nextcloud.php
  4. 11
      docker-compose.yml

@ -31,7 +31,7 @@ lint:
unit_test:
stage: test
image : gitlab.libriciel.fr:4567/libriciel/pole-plate-formes/pastell/pastell:4.0.2
image : gitlab.libriciel.fr:4567/libriciel/pole-plate-formes/pastell/pastell:4.0.9
variables:
XDEBUG_ON: "true"
COMPOSER_PROCESS_TIMEOUT: 1200

@ -1,4 +1,10 @@
# 1.0.0 - 2023-06-05
## 1.0.1 - 2023-11-27
## Ajout
### Correction
- le passage en v4.0.8 faisait échouer les tests
## 1.0.0 - 2023-06-05
### Ajout
- Passage en pastell v4

@ -115,11 +115,16 @@ class Nextcloud extends DepotWebDAV
return $result;
}
private $forTesting = true;
public function setDocDonneesFormulaire(DonneesFormulaire $docDonneesFormulaire): void
{
parent::setDocDonneesFormulaire($docDonneesFormulaire);
$this->forTesting = false;
}
public function getUser()
{
if ($this->getDocDonneesFormulaire()) {
if (! $this->forTesting) {
$donneesFormulaire = $this->getDocDonneesFormulaire();
$dictionnary = [];
} else {
@ -184,7 +189,7 @@ class Nextcloud extends DepotWebDAV
private function getDirectory(string $directory)
{
if ($this->getDocDonneesFormulaire()) {
if (! $this->forTesting) {
$donneesFormulaire = $this->getDocDonneesFormulaire();
$dictionnary = [];
} else {

@ -2,7 +2,7 @@ version: '3.7'
services:
web:
image: registry.libriciel.fr:443/public/plateforme/pastell:3.1.17
image: gitlab.libriciel.fr:4567/libriciel/pole-plate-formes/pastell/pastell:4.0.9
links:
- db
- redis
@ -11,10 +11,18 @@ services:
MYSQL_USER: ${MYSQL_USER:-user}
MYSQL_PASSWORD: ${MYSQL_PASSWORD:-user}
MYSQL_DATABASE: ${MYSQL_DATABASE:-pastell}
MYSQL_HOST_TEST: 'db'
MYSQL_HOST: db
MYSQL_DATABASE_TEST: ${MYSQL_DATABASE:-pastell}
MYSQL_USER_TEST: ${MYSQL_USER:-user}
MYSQL_PASSWORD_TEST: ${MYSQL_PASSWORD:-user}
DONT_RETRIEVE_VALIDCA: "true"
PASTELL_SITE_BASE: ${PASTELL_SITE_BASE:-https://localhost:8443}
WEBSEC_BASE: ${WEBSEC_BASE:-https://127.0.0.1:8443/}
volumes:
- .:/pack-rh
- ${WORKSPACE_VOLUME:-app_workspace}:/data/workspace
user: "${UID:-33}:${GID:-33}"
db:
image: mysql:5.7
@ -32,3 +40,4 @@ services:
volumes:
db_datadir:
app_workspace:

Loading…
Cancel
Save