Loading module/Application/src/Application/Controller/EcoleDoctoraleController.php +2 −2 Changes for module/Application/src/Application/Controller/EcoleDoctoraleController.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -241,7 +241,7 @@ class EcoleDoctoraleController extends AbstractController $this->getEcoleDoctoraleService()->deleteLogo($ecole); $logoFilepath = $this->fileService->computeLogoPathForStructure($ecole); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($ecole); if (file_exists($logoFilepath)) { $ok = unlink($logoFilepath); if ($ok) { Loading Loading @@ -276,7 +276,7 @@ class EcoleDoctoraleController extends AbstractController } $logoFilename = $this->fileService->computeLogoFilenameForStructure($ecole); $logoFilepath = $this->fileService->computeLogoPathForStructure($ecole); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($ecole); $ok = rename($cheminLogoUploade, $logoFilepath); if ($ok) { Loading module/Application/src/Application/Controller/EtablissementController.php +2 −2 Changes for module/Application/src/Application/Controller/EtablissementController.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -264,7 +264,7 @@ class EtablissementController extends AbstractController $this->getEtablissementService()->deleteLogo($etablissement); $logoFilepath = $this->fileService->computeLogoPathForStructure($etablissement); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($etablissement); if (file_exists($logoFilepath)) { $ok = unlink($logoFilepath); Loading Loading @@ -301,7 +301,7 @@ class EtablissementController extends AbstractController } $logoFilename = $this->fileService->computeLogoFilenameForStructure($etablissement); $logoFilepath = $this->fileService->computeLogoPathForStructure($etablissement); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($etablissement); $ok = rename($cheminLogoUploade, $logoFilepath); if ($ok) { Loading module/Application/src/Application/Controller/UniteRechercheController.php +2 −2 Changes for module/Application/src/Application/Controller/UniteRechercheController.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -264,7 +264,7 @@ class UniteRechercheController extends AbstractController $this->getUniteRechercheService()->deleteLogo($unite); $logoFilepath = $this->fileService->computeLogoPathForStructure($unite); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($unite); if (file_exists($logoFilepath)) { $ok = unlink($logoFilepath); Loading Loading @@ -301,7 +301,7 @@ class UniteRechercheController extends AbstractController } $logoFilename = $this->fileService->computeLogoFilenameForStructure($unite); $logoFilepath = $this->fileService->computeLogoPathForStructure($unite); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($unite); $ok = rename($cheminLogoUploade, $logoFilepath); if ($ok) { Loading module/Application/src/Application/Entity/Db/Etablissement.php +8 −0 Changes for module/Application/src/Application/Entity/Db/Etablissement.php: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -106,6 +106,14 @@ class Etablissement implements StructureConcreteInterface, HistoriqueAwareInterf return $this->getStructure()->getCode(); } /** * @return string */ public function generateUniqCode() { return uniqid(); } /** * Set sourceCode * Loading module/Application/src/Application/Service/File/FileService.php +11 −42 Changes for module/Application/src/Application/Service/File/FileService.php: 11 added lines, 42 removed lines. Original line number Diff line number Diff line Loading @@ -27,18 +27,7 @@ class FileService public function setRootDirectoryPathForUploadedFiles(string $rootDirectoryPathForUploadedFiles) { $this->rootDirectoryPathForUploadedFiles = $rootDirectoryPathForUploadedFiles; $this->rootDirectoryPathForUploadedLogos = $rootDirectoryPathForUploadedFiles . '/' . $this->getLogosSubDirectoryRelativePath(); } /** * Ajoute devant le chemin relatif spécifié le chemin du répertoire racine des logos de structures uploadés. * * @param string $relativeFilepath * @return string */ public function prependLogosRootDirectoryToRelativePath($relativeFilepath) { return $this->rootDirectoryPathForUploadedLogos . '/' . $relativeFilepath; $this->rootDirectoryPathForUploadedLogos = $rootDirectoryPathForUploadedFiles . '/ressources/Logos'; } /** Loading @@ -53,37 +42,26 @@ class FileService } /** * @return string */ public function getLogosSubDirectoryRelativePath() { return 'ressources/Logos'; } /** * Retourne * @param StructureConcreteInterface $structure * @return string */ public function computeLogoFilenameForStructure(StructureConcreteInterface $structure) { if ($structure instanceof EcoleDoctorale || $structure instanceof UniteRecherche) { if ($sigle = $structure->getSourceCode() . "-" . $structure->getSigle() . ".png") { return $sigle; if ($structure instanceof Etablissement) { $name = $structure->getCode() ?: $structure->generateUniqCode(); } else { return uniqid() . ".png"; } } elseif ($structure instanceof Etablissement) { return $structure->getStructure()->getCode() . ".png"; } else { throw new RuntimeException("Structure spécifiée imprévue."); $name = $structure->getSourceCode() . "-" . $structure->getSigle(); } return $name . ".png"; } /** * @param StructureConcreteInterface $structure * @return string */ public function computeLogoPathForStructure(StructureConcreteInterface $structure) public function computeLogoFilepathForStructure(StructureConcreteInterface $structure) { // sous-répertoire identifiant le type de structure if ($structure instanceof EcoleDoctorale) { Loading @@ -97,19 +75,8 @@ class FileService } $logoFilename = $this->computeLogoFilenameForStructure($structure); $filepath = $this->prependLogosRootDirectoryToRelativePath($dir . '/' . $logoFilename); return $filepath; } /** * @param UniteRecherche $unite * @return string */ public function computeLogoAbsolutePathForUniteRecherche(UniteRecherche $unite) { $logoFilename = $this->computeLogoFilenameForStructure($unite); $filepath = $this->fileService->prependLogosRootDirToRelativePath('ED/' . $logoFilename); $filepath = $this->rootDirectoryPathForUploadedLogos . '/' . $dir . '/' . $logoFilename; return $filepath; } Loading Loading @@ -137,6 +104,8 @@ class FileService * @param int $mode * @return bool true: folder has been created or exist and is writable. * false: folder does not exist and cannot be created. * * @codeCoverageIgnore */ private function createWritableFolder($folder, $mode = 0700) { Loading Loading
module/Application/src/Application/Controller/EcoleDoctoraleController.php +2 −2 Changes for module/Application/src/Application/Controller/EcoleDoctoraleController.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -241,7 +241,7 @@ class EcoleDoctoraleController extends AbstractController $this->getEcoleDoctoraleService()->deleteLogo($ecole); $logoFilepath = $this->fileService->computeLogoPathForStructure($ecole); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($ecole); if (file_exists($logoFilepath)) { $ok = unlink($logoFilepath); if ($ok) { Loading Loading @@ -276,7 +276,7 @@ class EcoleDoctoraleController extends AbstractController } $logoFilename = $this->fileService->computeLogoFilenameForStructure($ecole); $logoFilepath = $this->fileService->computeLogoPathForStructure($ecole); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($ecole); $ok = rename($cheminLogoUploade, $logoFilepath); if ($ok) { Loading
module/Application/src/Application/Controller/EtablissementController.php +2 −2 Changes for module/Application/src/Application/Controller/EtablissementController.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -264,7 +264,7 @@ class EtablissementController extends AbstractController $this->getEtablissementService()->deleteLogo($etablissement); $logoFilepath = $this->fileService->computeLogoPathForStructure($etablissement); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($etablissement); if (file_exists($logoFilepath)) { $ok = unlink($logoFilepath); Loading Loading @@ -301,7 +301,7 @@ class EtablissementController extends AbstractController } $logoFilename = $this->fileService->computeLogoFilenameForStructure($etablissement); $logoFilepath = $this->fileService->computeLogoPathForStructure($etablissement); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($etablissement); $ok = rename($cheminLogoUploade, $logoFilepath); if ($ok) { Loading
module/Application/src/Application/Controller/UniteRechercheController.php +2 −2 Changes for module/Application/src/Application/Controller/UniteRechercheController.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -264,7 +264,7 @@ class UniteRechercheController extends AbstractController $this->getUniteRechercheService()->deleteLogo($unite); $logoFilepath = $this->fileService->computeLogoPathForStructure($unite); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($unite); if (file_exists($logoFilepath)) { $ok = unlink($logoFilepath); Loading Loading @@ -301,7 +301,7 @@ class UniteRechercheController extends AbstractController } $logoFilename = $this->fileService->computeLogoFilenameForStructure($unite); $logoFilepath = $this->fileService->computeLogoPathForStructure($unite); $logoFilepath = $this->fileService->computeLogoFilepathForStructure($unite); $ok = rename($cheminLogoUploade, $logoFilepath); if ($ok) { Loading
module/Application/src/Application/Entity/Db/Etablissement.php +8 −0 Changes for module/Application/src/Application/Entity/Db/Etablissement.php: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -106,6 +106,14 @@ class Etablissement implements StructureConcreteInterface, HistoriqueAwareInterf return $this->getStructure()->getCode(); } /** * @return string */ public function generateUniqCode() { return uniqid(); } /** * Set sourceCode * Loading
module/Application/src/Application/Service/File/FileService.php +11 −42 Changes for module/Application/src/Application/Service/File/FileService.php: 11 added lines, 42 removed lines. Original line number Diff line number Diff line Loading @@ -27,18 +27,7 @@ class FileService public function setRootDirectoryPathForUploadedFiles(string $rootDirectoryPathForUploadedFiles) { $this->rootDirectoryPathForUploadedFiles = $rootDirectoryPathForUploadedFiles; $this->rootDirectoryPathForUploadedLogos = $rootDirectoryPathForUploadedFiles . '/' . $this->getLogosSubDirectoryRelativePath(); } /** * Ajoute devant le chemin relatif spécifié le chemin du répertoire racine des logos de structures uploadés. * * @param string $relativeFilepath * @return string */ public function prependLogosRootDirectoryToRelativePath($relativeFilepath) { return $this->rootDirectoryPathForUploadedLogos . '/' . $relativeFilepath; $this->rootDirectoryPathForUploadedLogos = $rootDirectoryPathForUploadedFiles . '/ressources/Logos'; } /** Loading @@ -53,37 +42,26 @@ class FileService } /** * @return string */ public function getLogosSubDirectoryRelativePath() { return 'ressources/Logos'; } /** * Retourne * @param StructureConcreteInterface $structure * @return string */ public function computeLogoFilenameForStructure(StructureConcreteInterface $structure) { if ($structure instanceof EcoleDoctorale || $structure instanceof UniteRecherche) { if ($sigle = $structure->getSourceCode() . "-" . $structure->getSigle() . ".png") { return $sigle; if ($structure instanceof Etablissement) { $name = $structure->getCode() ?: $structure->generateUniqCode(); } else { return uniqid() . ".png"; } } elseif ($structure instanceof Etablissement) { return $structure->getStructure()->getCode() . ".png"; } else { throw new RuntimeException("Structure spécifiée imprévue."); $name = $structure->getSourceCode() . "-" . $structure->getSigle(); } return $name . ".png"; } /** * @param StructureConcreteInterface $structure * @return string */ public function computeLogoPathForStructure(StructureConcreteInterface $structure) public function computeLogoFilepathForStructure(StructureConcreteInterface $structure) { // sous-répertoire identifiant le type de structure if ($structure instanceof EcoleDoctorale) { Loading @@ -97,19 +75,8 @@ class FileService } $logoFilename = $this->computeLogoFilenameForStructure($structure); $filepath = $this->prependLogosRootDirectoryToRelativePath($dir . '/' . $logoFilename); return $filepath; } /** * @param UniteRecherche $unite * @return string */ public function computeLogoAbsolutePathForUniteRecherche(UniteRecherche $unite) { $logoFilename = $this->computeLogoFilenameForStructure($unite); $filepath = $this->fileService->prependLogosRootDirToRelativePath('ED/' . $logoFilename); $filepath = $this->rootDirectoryPathForUploadedLogos . '/' . $dir . '/' . $logoFilename; return $filepath; } Loading Loading @@ -137,6 +104,8 @@ class FileService * @param int $mode * @return bool true: folder has been created or exist and is writable. * false: folder does not exist and cannot be created. * * @codeCoverageIgnore */ private function createWritableFolder($folder, $mode = 0700) { Loading