Merge branch 'master' into ll-php8-bs5 (2861477e) · Commits · lib / unicaen / app

CHANGELOG.md

+20 −0

Original line number	Diff line number	Diff line
		CHANGELOG
		=========

		5.1.6
		-----
		- Nouveau collecteur dans la barre LaminasDevTools : messages produits par \UnicaenApp\Service\MessageCollector.

		5.1.5
		-----
		- Nouvel élément de formulaire SearchAndSelect2 (basé sur le widget js Select2).

		5.1.4
		-----
		-

		5.1.3
		-----
		-

		5.1.2
		-----
		-

		5.1.1
		-----
		- Suppression du fix pour bootstrap-select-1.14.0-beta2 donc nécessaité de passer à bootstrap-select-1.14.0-beta3 dans vos applis.

config/module.config.php

+25 −2

Original line number	Diff line number	Diff line
		@@ -2,12 +2,17 @@

		namespace UnicaenApp;

		use Laminas\ServiceManager\Factory\InvokableFactory;
		use Unicaen\Console\Router\Simple;
		use UnicaenApp\Controller\CacheControllerFactory;
		use UnicaenApp\Controller\ConsoleController;
		use UnicaenApp\Controller\ConsoleControllerFactory;
		use UnicaenApp\Controller\InstadiaControllerFactory;
		use UnicaenApp\DeveloperTools\MessageCollectorService;
		use UnicaenApp\DeveloperTools\MessageCollectorServiceFactory;
		use UnicaenApp\Form\Element\SearchAndSelect2;
		use UnicaenApp\Form\View\Helper\FormControlGroup;
		use UnicaenApp\Form\View\Helper\FormControlGroupFactory;
		use UnicaenApp\Form\View\Helper\FormSearchAndSelect2;
		use UnicaenApp\HostLocalization\HostLocalization;
		use UnicaenApp\HostLocalization\HostLocalizationFactory;
		use UnicaenApp\Message\View\Helper\MessageHelper;
		@@ -46,7 +51,6 @@ use UnicaenApp\View\Helper\Upload\UploaderHelper;
		use UnicaenApp\View\Helper\Upload\UploaderHelperFactory;
		use UnicaenApp\View\Helper\UserProfileSelect;
		use UnicaenApp\View\Helper\UserProfileSelectFactory;
		use Unicaen\Console\Router\Simple;


		return [
		@@ -345,6 +349,8 @@ return [
		'instadia' => InstadiaServiceFactory::class,
		HostLocalization::class => HostLocalizationFactory::class,
		RedirectResponse::class => RedirectResponseFactory::class,

		MessageCollectorService::class => MessageCollectorServiceFactory::class,
		],
		'shared' => [
		'MouchardListenerErrorHandler' => false,
		@@ -373,6 +379,7 @@ return [
		'form_elements' => [
		'invokables' => [
		'UploadForm' => 'UnicaenApp\Controller\Plugin\Upload\UploadForm',
		SearchAndSelect2::class => InvokableFactory::class,
		],
		'initializers' => [
		'UnicaenApp\Service\EntityManagerAwareInitializer',
		@@ -433,6 +440,7 @@ return [
		'formDateInfSup' => 'UnicaenApp\Form\View\Helper\FormDateInfSup',
		'formRowDateInfSup' => 'UnicaenApp\Form\View\Helper\FormRowDateInfSup',
		'formSearchAndSelect' => 'UnicaenApp\Form\View\Helper\FormSearchAndSelect',
		'formSearchAndSelect2' => FormSearchAndSelect2::class,
		'formLdapPeople' => 'UnicaenApp\Form\View\Helper\FormLdapPeople',
		'formErrors' => 'UnicaenApp\Form\View\Helper\FormErrors',
		'form' => 'UnicaenApp\Form\View\Helper\Form',
		@@ -526,6 +534,7 @@ return [
		// 'unicaen-app/application/plan' => __DIR__ . '/../view/application/plan.phtml',
		// 'unicaen-app/application/mentions-legales' => __DIR__ . '/../view/application/mentions-legales.phtml',
		// 'unicaen-app/application/informatique-et-libertes' => __DIR__ . '/../view/application/informatique-et-libertes.phtml',
		'laminas-developer-tools/toolbar/messages' => __DIR__ . '/../view/laminas-developer-tools/toolbar/messages.phtml',
		],
		// TemplatePathStack configuration
		'template_path_stack' => [
		@@ -682,4 +691,18 @@ return [
		],
		],
		],

		// intégration à la Laminas Developer Toolbar
		'laminas-developer-tools' => [
		'profiler' => [
		'collectors' => [
		DeveloperTools\MessageCollectorService::class => DeveloperTools\MessageCollectorService::class,
		],
		],
		'toolbar' => [
		'entries' => [
		DeveloperTools\MessageCollectorService::class => 'laminas-developer-tools/toolbar/messages',
		],
		],
		],
		];

public/unicaen/app/css/unicaen-icon.css

+44 −4

Original line number	Diff line number	Diff line
		@@ -17,6 +17,11 @@
		content: "\f06e";
		}

		.icon.icon-masquer:before,
		.icon.icon-hide:before {
		content: "\f070";
		}

		.icon.icon-ajouter:before {
		content: "\f0fe";
		}
		@@ -58,6 +63,11 @@
		content: "\f503";
		}

		.icon.icon-user-checked:before,
		.icon.icon-utilisateur-ok:before {
		content: "\f4fc";
		}

		.icon.icon-listing:before,
		.icon.icon-lister:before
		{
		@@ -168,6 +178,16 @@
		content: "\f204";
		}

		.icon.icon-text:before,
		.icon.icon-texte:before {
		content: "\f039";
		}

		.icon.icon-mail:before,
		.icon.icon-courrier:before{
		content: "\f0e0";
		}

		.icon.icon-pdf:before {
		content: "\f1c1";
		}
		@@ -240,8 +260,28 @@
		content: "\f1c6";
		}

		.icon.icon-attente,
		.icon.icon-wait,
		.icon.icon-hourglass {
		.icon.icon-attente:before,
		.icon.icon-wait:before,
		.icon.icon-hourglass:before {
		content: "\f252";
		}

		.icon.icon-asterisque:before,
		.icon.icon-asterisk:before,
		.icon.icon-obligatoire:before,
		.icon.icon-mandatory:before
		{
		content: "\f069";
		}

		.icon.icon-sauvegarder:before,
		.icon.icon-save:before
		{
		content: "\f0c7";
		}

		.icon.icon-valider:before,
		.icon.icon-validate:before
		{
		content: "\f14a";
		}

src/UnicaenApp/DeveloperTools/MessageCollectorService.php

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		<?php

		namespace UnicaenApp\DeveloperTools;

		use Laminas\DeveloperTools\Collector\CollectorInterface;
		use Laminas\Mvc\MvcEvent;
		use UnicaenApp\Service\MessageCollectorAwareTrait;

		class MessageCollectorService implements CollectorInterface
		{
		use MessageCollectorAwareTrait;

		const NAME = 'messages';
		const PRIORITY = 200;

		public function getMessages(): array
		{
		return $this->messageCollector->getMessages();
		}

		/**
		* {@inheritDoc}
		*/
		public function getName(): string
		{
		return self::NAME;
		}

		/**
		* {@inheritDoc}
		*/
		public function getPriority(): int
		{
		return static::PRIORITY;
		}

		/**
		* {@inheritDoc}
		*/
		public function collect(MvcEvent $mvcEvent)
		{
		}
		}

src/UnicaenApp/DeveloperTools/MessageCollectorServiceFactory.php

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?php

		namespace UnicaenApp\DeveloperTools;

		use Laminas\ServiceManager\Factory\FactoryInterface;
		use Psr\Container\ContainerInterface;
		use UnicaenApp\Service\MessageCollector;

		class MessageCollectorServiceFactory implements FactoryInterface
		{
		public function __invoke(ContainerInterface $container, $requestedName, $options = null): MessageCollectorService
		{
		$service = new MessageCollectorService();

		/** @var MessageCollector $messageCollector */
		$messageCollector = $container->get('MessageCollector');
		$service->setServiceMessageCollector($messageCollector);

		return $service;
		}

		}
		No newline at end of file