diff --git a/src/Domain/AIPD/Controller/AnalyseImpactController.php b/src/Domain/AIPD/Controller/AnalyseImpactController.php index 8649d949757d6b8891e5753b38ea31740be8ed56..a35c6c0a9ffe92db16545e8f0726b6b048a415bf 100644 --- a/src/Domain/AIPD/Controller/AnalyseImpactController.php +++ b/src/Domain/AIPD/Controller/AnalyseImpactController.php @@ -378,14 +378,14 @@ class AnalyseImpactController extends CRUDController $slugger = new AsciiSlugger(); $filename = $slugger->slug($object->getConformiteTraitement()->getTraitement()->getName()); - $mesures = []; + $mesures = []; $scenarios = $object->getScenarioMenaces(); foreach ($scenarios as $scenario) { /** - * @var AnalyseScenarioMenace $scenario + * @var AnalyseScenarioMenace */ - if ($scenario->getGravite() !== 'negligeable' || $scenario->getGravite() !== 'vide' || $scenario->getVraisemblance() !== 'negligeable' || $scenario->getVraisemblance() !== 'vide') { + if ('negligeable' !== $scenario->getGravite() || 'vide' !== $scenario->getGravite() || 'negligeable' !== $scenario->getVraisemblance() || 'vide' !== $scenario->getVraisemblance()) { foreach ($scenario->getMesuresProtections() as $mesure) { if (!array_key_exists($mesure->getNom(), $mesures) && ($mesure->getPoidsGravite() <= 1 || $mesure->getPoidsVraisemblance() <= 1)) { $mesures[$mesure->getNom()] = $mesure; @@ -394,13 +394,12 @@ class AnalyseImpactController extends CRUDController } } - return new PdfResponse( $this->pdf->getOutputFromHtml( $this->renderView($this->getTemplatingBasePath('pdf'), [ - 'object' => $object, + 'object' => $object, 'mesuresProtection' => $mesures, - 'base_dir' => $this->getParameter('kernel.project_dir') . '/public' . $request->getBasePath(), + 'base_dir' => $this->getParameter('kernel.project_dir') . '/public' . $request->getBasePath(), ]), ['javascript-delay' => 1000]), $filename . '.pdf' ); diff --git a/src/Domain/Registry/Repository/Contractor.php b/src/Domain/Registry/Repository/Contractor.php index 2057877cd2154ac5d6b67294611a5372d203f18b..7e1d7269e92efa4ef1ac651e0fead3c722adb2c6 100644 --- a/src/Domain/Registry/Repository/Contractor.php +++ b/src/Domain/Registry/Repository/Contractor.php @@ -67,8 +67,8 @@ interface Contractor extends CRUDRepositoryInterface, DataTablesRepository public function findAllByClonedFromCollectivity(Collectivity $collectivity); /** - * Set clonedFrom to null by collectivity - * @param Collectivity $collectivity + * Set clonedFrom to null by collectivity. + * * @return mixed */ public function resetClonedFromCollectivity(Collectivity $collectivity); diff --git a/src/Domain/Registry/Repository/Mesurement.php b/src/Domain/Registry/Repository/Mesurement.php index 0c5d981e8c2420ed3fea1157009d0bb20f42129a..b0455557860ee713167edf20b3c485d354b57912 100644 --- a/src/Domain/Registry/Repository/Mesurement.php +++ b/src/Domain/Registry/Repository/Mesurement.php @@ -100,8 +100,8 @@ interface Mesurement extends CRUDRepositoryInterface, DataTablesRepository public function getPlanifiedActionsDashBoard($limit, Collectivity $collectivity); /** - * Set clonedFrom to null by collectivity - * @param Collectivity $collectivity + * Set clonedFrom to null by collectivity. + * * @return mixed */ public function resetClonedFromCollectivity(Collectivity $collectivity); diff --git a/src/Domain/Registry/Repository/Treatment.php b/src/Domain/Registry/Repository/Treatment.php index 8eaabc1cd0f1b2577d14798ee058acf9238455a0..93e01a0141a30d7d3aca78b0ee19ed752046d4b8 100644 --- a/src/Domain/Registry/Repository/Treatment.php +++ b/src/Domain/Registry/Repository/Treatment.php @@ -106,8 +106,8 @@ interface Treatment extends CRUDRepositoryInterface, DataTablesRepository public function findAllByClonedFromCollectivity(Collectivity $collectivity); /** - * Set clonedFrom to null by collectivity - * @param Collectivity $collectivity + * Set clonedFrom to null by collectivity. + * * @return mixed */ public function resetClonedFromCollectivity(Collectivity $collectivity); diff --git a/src/Domain/User/Controller/CollectivityController.php b/src/Domain/User/Controller/CollectivityController.php index 4bddb0a013ffc3c4e2972b769ae764a31daba6e8..02f9c96d4adfe3338dedc4f0870a0f8c1045d8cf 100644 --- a/src/Domain/User/Controller/CollectivityController.php +++ b/src/Domain/User/Controller/CollectivityController.php @@ -254,7 +254,7 @@ class CollectivityController extends CRUDController foreach ($deletedTreaments as $deletedTreament) { $stringObjects[] = 'Traitement - ' . $deletedTreament->getName(); /** - * @var Treatment $deletedTreament + * @var Treatment */ $aipds = $deletedTreament->getConformiteTraitement() ? $deletedTreament->getConformiteTraitement()->getAnalyseImpacts() : []; foreach ($aipds as $aipd) { @@ -280,7 +280,7 @@ class CollectivityController extends CRUDController $deletedMesurements = $this->mesurementRepository->findBy(['collectivity' => $object]); foreach ($deletedMesurements as $deletedMesurement) { /** - * @var Mesurement $deletedMesurement + * @var Mesurement */ if ($deletedMesurement->getClonedFrom()) { $stringObjects[] = 'Action de protection - ' . $deletedMesurement->getClonedFrom()->getName(); diff --git a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php index e9232572bfff4d4f19586701fcfd60c85eaa6414..193f191ea60d77e6ee887815fa11212f10369c7b 100644 --- a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php +++ b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php @@ -394,7 +394,7 @@ class Mesurement extends CRUDRepository implements Repository\Mesurement ->groupBy('u.id') ->setMaxResults((int) $limit) ->getQuery(); - + return $query->getResult(); }