From 7dd25917b22d4c5900953eadf8bff2989a4dee14 Mon Sep 17 00:00:00 2001
From: Bertrand GAUTHIER <bertrand.gauthier@unicaen.fr>
Date: Tue, 6 Dec 2022 16:43:55 +0100
Subject: [PATCH] =?UTF-8?q?[FIX]=20Probl=C3=A8mes=20signal=C3=A9s=20par=20?=
=?UTF-8?q?PHPStorm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Module.php | 15 +++------------
.../Controller/ConsoleController.php | 7 +------
.../Controller/IndexController.php | 2 +-
.../Controller/IndexControllerFactory.php | 2 ++
src/UnicaenDbAnonym/Service/AnonymService.php | 6 ++++--
.../Service/AnonymServiceAwareTrait.php | 2 +-
src/UnicaenDbAnonym/Service/DbService.php | 11 +++++++----
.../Service/DbServiceAwareTrait.php | 2 +-
8 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/Module.php b/Module.php
index 7acd7eb..ee6ed1f 100644
--- a/Module.php
+++ b/Module.php
@@ -3,21 +3,12 @@
namespace UnicaenDbAnonym;
use Laminas\Config\Factory as ConfigFactory;
-use Unicaen\Console\Adapter\AdapterInterface;
-use Laminas\Mvc\ModuleRouteListener;
-use Laminas\Mvc\MvcEvent;
use Laminas\Stdlib\Glob;
+use Unicaen\Console\Adapter\AdapterInterface;
class Module
{
-// public function onBootstrap(MvcEvent $e)
-// {
-// $eventManager = $e->getApplication()->getEventManager();
-// $moduleRouteListener = new ModuleRouteListener();
-// $moduleRouteListener->attach($eventManager);
-// }
-
- public function getConfig()
+ public function getConfig(): array
{
$paths = array_merge(
[__DIR__ . '/config/module.config.php'],
@@ -49,7 +40,7 @@ class Module
/**
* @inheritDoc
*/
- public function getConsoleUsage(AdapterInterface $console)
+ public function getConsoleUsage(AdapterInterface $console): array
{
return [
/**
diff --git a/src/UnicaenDbAnonym/Controller/ConsoleController.php b/src/UnicaenDbAnonym/Controller/ConsoleController.php
index f0409e5..5215f73 100644
--- a/src/UnicaenDbAnonym/Controller/ConsoleController.php
+++ b/src/UnicaenDbAnonym/Controller/ConsoleController.php
@@ -3,19 +3,14 @@
namespace UnicaenDbAnonym\Controller;
use Exception;
+use RuntimeException;
use Unicaen\Console\Controller\AbstractConsoleController;
-use UnicaenApp\Exception\RuntimeException;
use UnicaenDbAnonym\Service\AnonymServiceAwareTrait;
class ConsoleController extends AbstractConsoleController
{
use AnonymServiceAwareTrait;
- /**
- * @var string
- */
- protected $outputDir;
-
public function genererAction()
{
$start = microtime(true);
diff --git a/src/UnicaenDbAnonym/Controller/IndexController.php b/src/UnicaenDbAnonym/Controller/IndexController.php
index c633ab7..d23f34f 100755
--- a/src/UnicaenDbAnonym/Controller/IndexController.php
+++ b/src/UnicaenDbAnonym/Controller/IndexController.php
@@ -5,7 +5,7 @@ namespace UnicaenDbAnonym\Controller;
use Application\Controller\AbstractController;
use Exception;
use Laminas\View\Model\ViewModel;
-use UnicaenApp\Exception\RuntimeException;
+use RuntimeException;
use UnicaenApp\Service\SQL\RunSQLResult;
use UnicaenDbAnonym\Service\AnonymServiceAwareTrait;
diff --git a/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php b/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php
index 785a848..ca5a74b 100644
--- a/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php
+++ b/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php
@@ -12,6 +12,8 @@ class IndexControllerFactory
*
* @param ContainerInterface $container
* @return IndexController
+ * @throws \Psr\Container\ContainerExceptionInterface
+ * @throws \Psr\Container\NotFoundExceptionInterface
*/
public function __invoke(ContainerInterface $container): IndexController
{
diff --git a/src/UnicaenDbAnonym/Service/AnonymService.php b/src/UnicaenDbAnonym/Service/AnonymService.php
index 6f3c4fa..a30ff13 100644
--- a/src/UnicaenDbAnonym/Service/AnonymService.php
+++ b/src/UnicaenDbAnonym/Service/AnonymService.php
@@ -17,12 +17,12 @@ class AnonymService
/**
* @var array
*/
- protected $entitiesConfig = [];
+ protected array $entitiesConfig = [];
/**
* @var array
*/
- protected $outputConfig = [];
+ protected array $outputConfig = [];
/**
* @param array $config
@@ -105,6 +105,7 @@ class AnonymService
/**
* @throws \Doctrine\DBAL\ConnectionException
+ * @throws \Doctrine\DBAL\Exception
*/
public function anonymiser(): RunSQLResult
{
@@ -122,6 +123,7 @@ class AnonymService
/**
* @throws \Doctrine\DBAL\ConnectionException
+ * @throws \Doctrine\DBAL\Exception
*/
public function restaurer(): RunSQLResult
{
diff --git a/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php b/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php
index 2938732..cab44fe 100644
--- a/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php
+++ b/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php
@@ -7,7 +7,7 @@ trait AnonymServiceAwareTrait
/**
* @var AnonymService
*/
- protected $anonymService;
+ protected AnonymService $anonymService;
/**
* @param AnonymService $anonymService
diff --git a/src/UnicaenDbAnonym/Service/DbService.php b/src/UnicaenDbAnonym/Service/DbService.php
index c7c9f37..5e19a5f 100644
--- a/src/UnicaenDbAnonym/Service/DbService.php
+++ b/src/UnicaenDbAnonym/Service/DbService.php
@@ -4,9 +4,11 @@ namespace UnicaenDbAnonym\Service;
use Doctrine\DBAL\ConnectionException;
use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Mapping\ClassMetadata;
use Faker\Factory;
+use Faker\Generator;
use Laminas\Log\Logger;
use Laminas\Log\Writer\Stream;
use Locale;
@@ -23,22 +25,22 @@ class DbService
/**
* @var \Doctrine\ORM\EntityManager
*/
- protected $entityManager;
+ protected EntityManager $entityManager;
/**
* @var \Doctrine\DBAL\Platforms\AbstractPlatform
*/
- protected $databasePlatform;
+ protected AbstractPlatform $databasePlatform;
/**
* @var string
*/
- protected $updateSQLTemplate = 'update %s set %s where id = %d ;';
+ protected string $updateSQLTemplate = 'update %s set %s where id = %d ;';
/**
* @var \Faker\Generator $faker
*/
- protected $faker;
+ protected Generator $faker;
public function __construct()
@@ -159,6 +161,7 @@ class DbService
/**
* @throws \Doctrine\DBAL\ConnectionException
+ * @throws \Doctrine\DBAL\Exception
*/
public function lancerScript(string $scriptPath): RunSQLResult
{
diff --git a/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php b/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php
index 3e83baf..285c08e 100644
--- a/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php
+++ b/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php
@@ -7,7 +7,7 @@ trait DbServiceAwareTrait
/**
* @var DbService $dbService
*/
- protected $dbService;
+ protected DbService $dbService;
public function setDbService(DbService $dbService)
{
--
GitLab