diff --git a/composer.json b/composer.json index a8fdb4dd02ed8f2d29b10eb73d42247da9627335..bc777d4aa808778cae434bc75ed91fc24111bab6 100755 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ "unicaen/app": "^4|^5|^6", "unicaen/utilisateur": "^4|^5|^6", "unicaen/privilege": "^4|^5|^6", - "unicaen/mail": "^5|^6" + "unicaen/mail": "^5|^6", + "unicaen/console": "^6" }, "autoload": { "psr-0": [], diff --git a/config/merged/abonnement.config.php b/config/merged/abonnement.config.php index 18797c537069279bddd178f73909811501fe8efc..b8763175a91512ff10b3645e56f442dead06120b 100644 --- a/config/merged/abonnement.config.php +++ b/config/merged/abonnement.config.php @@ -1,12 +1,13 @@ <?php +use Unicaen\Console\Router\Simple; use UnicaenIndicateur\Controller\AbonnementController; use UnicaenIndicateur\Controller\AbonnementControllerFactory; use UnicaenIndicateur\Provider\Privilege\AbonnementPrivileges; use UnicaenIndicateur\Service\Abonnement\AbonnementService; use UnicaenIndicateur\Service\Abonnement\AbonnementServiceFactory; use UnicaenPrivilege\Guard\PrivilegeController; -use Laminas\Mvc\Console\Router\Simple; + use Laminas\Router\Http\Literal; use Laminas\Router\Http\Segment; diff --git a/config/merged/indicateur.config.php b/config/merged/indicateur.config.php index bc1412d930cd7460de51cc004bf9029cef32a31f..8308299a92740da86f1c8fd2a59d9a1cde27b04f 100644 --- a/config/merged/indicateur.config.php +++ b/config/merged/indicateur.config.php @@ -12,7 +12,7 @@ use UnicaenIndicateur\Service\Indicateur\IndicateurServiceFactory; use UnicaenIndicateur\View\Helper\DefaultItemViewHelper; use UnicaenIndicateur\View\Helper\IndicateurViewHelperFactory; use UnicaenPrivilege\Guard\PrivilegeController; -use Laminas\Mvc\Console\Router\Simple; +use Unicaen\Console\Router\Simple; use Laminas\Router\Http\Literal; use Laminas\Router\Http\Segment; diff --git a/src/UnicaenIndicateur/Controller/IndicateurController.php b/src/UnicaenIndicateur/Controller/IndicateurController.php index d61e8b208f0d7374d37c2c2452dccf75fc9b1190..cfb8ab881e2c6e3655f78afbdc58cb6ad25da815 100644 --- a/src/UnicaenIndicateur/Controller/IndicateurController.php +++ b/src/UnicaenIndicateur/Controller/IndicateurController.php @@ -103,7 +103,7 @@ class IndicateurController extends AbstractActionController { $namespace = $this->params()->fromQuery('namespace'); $form = $this->getIndicateurForm(); - $form->setAttribute('action', $this->url()->fromRoute('indicateur/modifier', ['indicateur' => $indicateur], ['query' => ['namespace' => $namespace]], true)); + $form->setAttribute('action', $this->url()->fromRoute('indicateur/modifier', ['indicateur' => $indicateur->getId()], ['query' => ['namespace' => $namespace]], true)); if ($namespace) { $indicateur->setNamespace($namespace); $form->get('namespace')->setAttribute('readonly', true); diff --git a/src/UnicaenIndicateur/Service/Indicateur/IndicateurService.php b/src/UnicaenIndicateur/Service/Indicateur/IndicateurService.php index 935306cef65c3e5634b6dc17a64e26105ee8897f..acb9e90375a56d793adf2c0549a990ebdb1fb97f 100644 --- a/src/UnicaenIndicateur/Service/Indicateur/IndicateurService.php +++ b/src/UnicaenIndicateur/Service/Indicateur/IndicateurService.php @@ -73,8 +73,8 @@ class IndicateurService { try { $sql = "SELECT EXISTS (SELECT FROM pg_matviews WHERE matviewname='" . $viewname . "')"; $query = $this->getObjectManager()->getConnection()->prepare($sql); - $query->execute(); - $value = $query->fetchOne(); + $execute = $query->execute(); + $value = $execute->fetchOne(); } catch (Exception $e) { return false; } @@ -98,8 +98,8 @@ class IndicateurService { throw new RuntimeException("Un problème est survenu lors de la récupération de la session.", 0, $e); } try { - $query->execute(); - $array = $query->fetchAll(); + $execute = $query->execute(); + $array = $execute->fetchAll(); } catch (DBA_Driver_Exception $e) { throw new RuntimeException("Un problème est survenu lors de la récupération de des données de l'indicateur.", 0, $e); }