diff --git a/composer.json b/composer.json index dade2e034f0651b563a03ea3d6dd609e098ee0c9..0e0260b92c33264ccb85e9c384f1dbdb9d1a341c 100755 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "unicaen/app": "dev-master as 1.3.6", "unicaen/auth": "dev-master", "zendframework/zend-code": "^2.4", + "zendframework/zend-text": "^2.4", "bjyoungblood/bjy-authorize": "dev-master", "zf-commons/zfc-user": "0.1.3", "zendframework/zend-file": "^2.4", diff --git a/config/application.config.php b/config/application.config.php index fe8a0235a77293f8c1d2686cda193d210003116b..eb6c9a9e80f65e0a093badadbdd4b191a45c9169 100755 --- a/config/application.config.php +++ b/config/application.config.php @@ -73,6 +73,9 @@ class AppConfig if ('development' == $env) { $modules[] = 'ZendDeveloperTools'; + } + + if (\Zend\Console\Console::isConsole() || 'development' == $env){ $modules[] = 'UnicaenCode'; } diff --git a/module/Application/Module.php b/module/Application/Module.php index 82b21a677679e169633ad22cfd44f63ec57ca048..602bca4c3fcf377b75240e082ae1ce63d6575add 100755 --- a/module/Application/Module.php +++ b/module/Application/Module.php @@ -46,7 +46,7 @@ class Module implements ConsoleUsageProviderInterface, ConsoleBannerProviderInte /* Utilise un layout spécial si on est en AJAX. Valable pour TOUS les modules de l'application */ $eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch', function (\Zend\Mvc\MvcEvent $e) { - if ($e->getRequest()->isXmlHttpRequest()) { + if ($e->getRequest() instanceof \Zend\Http\Request && $e->getRequest()->isXmlHttpRequest()) { $e->getTarget()->layout('application/ajax-layout.phtml'); } } @@ -161,8 +161,6 @@ class Module implements ConsoleUsageProviderInterface, ConsoleBannerProviderInte "Notifications", 'notifier indicateurs [--force]' => "Notification par mail des personnes abonnées à des indicateurs", ['--force', "Facultatif", "Envoie les mails sytématiquement, sans tenir compte de la fréquence de notification."], - ['--requestUriHost', "Obligatoire", "Exemples: \"/ose.unicaen.fr\", \"/test.unicaen.fr/ose\"."], - ['--requestUriScheme', "Facultatif", "Exemples: \"http\" (par défaut), \"https\"."], ]; }