From 3e8c99e859f4a8dbed8b0dec7aa49bdb81159c60 Mon Sep 17 00:00:00 2001 From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr> Date: Thu, 22 Nov 2018 21:18:36 +0100 Subject: [PATCH] =?UTF-8?q?Corrections=20r=C3=A9alis=C3=A9es=20par=20compo?= =?UTF-8?q?ser=20cs-fix.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/Application/view/error/404.phtml | 5 +---- module/Application/view/error/index.phtml | 2 -- module/ImportData/config/module.config.php | 3 ++- module/ImportData/src/Module.php | 1 - module/ImportData/src/V1/Entity/Db/Acteur.php | 2 +- module/ImportData/src/V1/Entity/Db/Doctorant.php | 3 --- module/ImportData/src/V1/Entity/Db/Financement.php | 2 +- module/ImportData/src/V1/Entity/Db/Individu.php | 5 +---- module/ImportData/src/V1/Entity/Db/OrigineFinancement.php | 2 +- module/ImportData/src/V1/Entity/Db/Role.php | 5 +---- module/ImportData/src/V1/Entity/Db/Source.php | 6 +----- module/ImportData/src/V1/Entity/Db/These.php | 3 --- module/ImportData/src/V1/Entity/Db/Variable.php | 5 +---- module/ImportData/src/V1/Query/Provider/FetchAll.php | 2 +- module/ImportData/src/V1/Rest/Acteur/ActeurFetchAll.php | 2 +- 15 files changed, 12 insertions(+), 36 deletions(-) diff --git a/module/Application/view/error/404.phtml b/module/Application/view/error/404.phtml index a5242ed..72f1572 100644 --- a/module/Application/view/error/404.phtml +++ b/module/Application/view/error/404.phtml @@ -27,14 +27,13 @@ if (! empty($this->reason)) : $reasonMessage = 'We cannot determine at this time why a 404 was generated.'; break; } -?> + ?> <p><?= $reasonMessage ?></p> <?php endif ?> <?php if (! empty($this->controller)) : ?> - <dl> <dt>Controller:</dt> <dd><?= $this->escapeHtml($this->controller) ?> @@ -51,7 +50,6 @@ if (! empty($this->reason)) : <?php endif ?> <?php if (! empty($this->display_exceptions)) : ?> - <?php if (isset($this->exception) && ($this->exception instanceof \Throwable || $this->exception instanceof \Exception)) : ?> <hr/> @@ -100,7 +98,6 @@ if (! empty($this->reason)) : <?php endif ?> <?php else : ?> - <h3>No Exception available</h3> <?php endif ?> diff --git a/module/Application/view/error/index.phtml b/module/Application/view/error/index.phtml index 2790d6e..3ac43ad 100644 --- a/module/Application/view/error/index.phtml +++ b/module/Application/view/error/index.phtml @@ -2,7 +2,6 @@ <h2><?= $this->message ?></h2> <?php if (! empty($this->display_exceptions)) : ?> - <?php if (isset($this->exception) && ($this->exception instanceof \Throwable || $this->exception instanceof \Exception)) : ?> <hr/> @@ -51,7 +50,6 @@ <?php endif ?> <?php else : ?> - <h3>No Exception available</h3> <?php endif ?> diff --git a/module/ImportData/config/module.config.php b/module/ImportData/config/module.config.php index e8a2b8e..965fbb5 100644 --- a/module/ImportData/config/module.config.php +++ b/module/ImportData/config/module.config.php @@ -2576,7 +2576,8 @@ return [ ], 'service_manager' => [ 'factories' => [ - \ImportData\V1\Rest\Version\VersionResource::class => \ImportData\V1\Rest\Version\VersionResourceFactory::class, + \ImportData\V1\Rest\Version\VersionResource::class => + \ImportData\V1\Rest\Version\VersionResourceFactory::class, ], ], ]; diff --git a/module/ImportData/src/Module.php b/module/ImportData/src/Module.php index fb7f486..f5d5deb 100644 --- a/module/ImportData/src/Module.php +++ b/module/ImportData/src/Module.php @@ -9,5 +9,4 @@ class Module implements ApigilityProviderInterface { return include __DIR__ . '/../config/module.config.php'; } - } diff --git a/module/ImportData/src/V1/Entity/Db/Acteur.php b/module/ImportData/src/V1/Entity/Db/Acteur.php index daf5f16..c567f3f 100644 --- a/module/ImportData/src/V1/Entity/Db/Acteur.php +++ b/module/ImportData/src/V1/Entity/Db/Acteur.php @@ -214,4 +214,4 @@ class Acteur { $this->temoinRapport = $temoinRapport; } -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Entity/Db/Doctorant.php b/module/ImportData/src/V1/Entity/Db/Doctorant.php index 1f9c399..0ebaee3 100644 --- a/module/ImportData/src/V1/Entity/Db/Doctorant.php +++ b/module/ImportData/src/V1/Entity/Db/Doctorant.php @@ -2,7 +2,6 @@ namespace ImportData\V1\Entity\Db; - /** * Doctorant */ @@ -63,6 +62,4 @@ class Doctorant { $this->individuId = $individuId; } - - } diff --git a/module/ImportData/src/V1/Entity/Db/Financement.php b/module/ImportData/src/V1/Entity/Db/Financement.php index 8508818..f538ba7 100644 --- a/module/ImportData/src/V1/Entity/Db/Financement.php +++ b/module/ImportData/src/V1/Entity/Db/Financement.php @@ -88,4 +88,4 @@ class Financement { return $this->dateFinFinancement; } -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Entity/Db/Individu.php b/module/ImportData/src/V1/Entity/Db/Individu.php index 312ad58..6e3c75a 100644 --- a/module/ImportData/src/V1/Entity/Db/Individu.php +++ b/module/ImportData/src/V1/Entity/Db/Individu.php @@ -2,7 +2,6 @@ namespace ImportData\V1\Entity\Db; - /** * These */ @@ -230,6 +229,4 @@ class Individu { $this->nationalite = $nationalite; } - - -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php b/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php index 190ebee..20b7d48 100644 --- a/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php +++ b/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php @@ -52,4 +52,4 @@ class OrigineFinancement { return $this->libOfi; } -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Entity/Db/Role.php b/module/ImportData/src/V1/Entity/Db/Role.php index 296990d..034e6ca 100644 --- a/module/ImportData/src/V1/Entity/Db/Role.php +++ b/module/ImportData/src/V1/Entity/Db/Role.php @@ -2,7 +2,6 @@ namespace ImportData\V1\Entity\Db; - /** * Role */ @@ -76,6 +75,4 @@ class Role { $this->libCourtRole = $libCourtRole; } - - -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Entity/Db/Source.php b/module/ImportData/src/V1/Entity/Db/Source.php index 48abfa3..cf4c11e 100644 --- a/module/ImportData/src/V1/Entity/Db/Source.php +++ b/module/ImportData/src/V1/Entity/Db/Source.php @@ -2,7 +2,6 @@ namespace ImportData\V1\Entity\Db; - /** * Source */ @@ -80,7 +79,4 @@ class Source { $this->code = $code; } - - - -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Entity/Db/These.php b/module/ImportData/src/V1/Entity/Db/These.php index 4a1ccb7..c99c279 100644 --- a/module/ImportData/src/V1/Entity/Db/These.php +++ b/module/ImportData/src/V1/Entity/Db/These.php @@ -2,7 +2,6 @@ namespace ImportData\V1\Entity\Db; - /** * These */ @@ -385,6 +384,4 @@ class These { $this->correctionAutorisee = $correctionAutorisee; } - - } diff --git a/module/ImportData/src/V1/Entity/Db/Variable.php b/module/ImportData/src/V1/Entity/Db/Variable.php index 242aa89..f2874e1 100644 --- a/module/ImportData/src/V1/Entity/Db/Variable.php +++ b/module/ImportData/src/V1/Entity/Db/Variable.php @@ -2,7 +2,6 @@ namespace ImportData\V1\Entity\Db; - /** * Variable */ @@ -131,6 +130,4 @@ class Variable { $this->sourceId = $sourceId; } - - -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Query/Provider/FetchAll.php b/module/ImportData/src/V1/Query/Provider/FetchAll.php index f28ea14..c2c3434 100644 --- a/module/ImportData/src/V1/Query/Provider/FetchAll.php +++ b/module/ImportData/src/V1/Query/Provider/FetchAll.php @@ -23,4 +23,4 @@ class FetchAll extends DefaultOrm return $qb; } -} \ No newline at end of file +} diff --git a/module/ImportData/src/V1/Rest/Acteur/ActeurFetchAll.php b/module/ImportData/src/V1/Rest/Acteur/ActeurFetchAll.php index c194766..27f35d7 100644 --- a/module/ImportData/src/V1/Rest/Acteur/ActeurFetchAll.php +++ b/module/ImportData/src/V1/Rest/Acteur/ActeurFetchAll.php @@ -26,4 +26,4 @@ class ActeurFetchAll extends FetchAll return $qb; } -} \ No newline at end of file +} -- GitLab