Merge branch '6.x' (5c33a4fb) · Commits · lib / unicaen / app

CHANGELOG.md

+9 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,15 @@ CHANGELOG
		- [Fix] config Doctrine pointant vers un répertoire inexistant commentée


		6.0.3
		-----
		- Version 6 requise de unicaen/console (plutôt que dev-main).

		6.0.2
		-----
		- Exporter PDF : correction du constructeur pour compatibilité avec la version de mPDF requise.
		- FormElementCollection : correction (trop simple ?) du bug dans la suppression d'un item de la collection.

		6.0.1
		-----
		- FormElementCollection->render : définition rendue compatible avec le parent

composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		"laminas/laminas-text": "^2.9",
		"laminas/laminas-view": "^2.16",
		"laminas/laminas-dependency-plugin": "^2.2",
		"unicaen/console": "dev-main"
		"unicaen/console": "^6.0"
		},
		"require-dev": {
		"laminas/laminas-test": "^3.2",

config/module.config.php

+0 −25

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ use Laminas\ServiceManager\Factory\InvokableFactory;
		use Unicaen\Console\Router\Simple;
		use UnicaenApp\Controller\CacheControllerFactory;
		use UnicaenApp\Controller\ConsoleController;
		use UnicaenApp\Controller\InstadiaControllerFactory;
		use UnicaenApp\DeveloperTools\MessageCollectorService;
		use UnicaenApp\DeveloperTools\MessageCollectorServiceFactory;
		use UnicaenApp\Form\Element\SearchAndSelect2;
		@@ -26,7 +25,6 @@ use UnicaenApp\ORM\Query\Functions\Chr;
		use UnicaenApp\ORM\Query\Functions\CompriseEntre;
		use UnicaenApp\ORM\Query\Functions\PasHistorise;
		use UnicaenApp\ORM\Query\Functions\Replace;
		use UnicaenApp\Service\InstadiaServiceFactory;
		use UnicaenApp\Service\Mailer\MailerService;
		use UnicaenApp\Service\Mailer\MailerServiceFactory;
		use UnicaenApp\Service\SQL\RunSQLService;
		@@ -42,8 +40,6 @@ use UnicaenApp\View\Helper\HeadScript;
		use UnicaenApp\View\Helper\HeadScriptFactory;
		use UnicaenApp\View\Helper\InlineScript;
		use UnicaenApp\View\Helper\InlineScriptFactory;
		use UnicaenApp\View\Helper\InstadiaViewHelper;
		use UnicaenApp\View\Helper\InstadiaViewHelperFactory;
		use UnicaenApp\View\Helper\MessageCollectorHelper;
		use UnicaenApp\View\Helper\MessageCollectorHelperFactory;
		use UnicaenApp\View\Helper\Messenger;
		@@ -217,18 +213,6 @@ return [
		],
		],
		],
		'instadia' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/instadia',
		'defaults' => [
		'__NAMESPACE__' => 'UnicaenApp\Controller',
		'controller' => 'Instadia',
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		],
		// The following is a route to simplify getting started creating
		// new controllers and actions without needing to create a new
		// module. Simply drop new controllers in, and you can access them
		@@ -349,7 +333,6 @@ return [

		MailerService::class => MailerServiceFactory::class,
		RunSQLService::class => RunSQLServiceFactory::class,
		'instadia' => InstadiaServiceFactory::class,
		HostLocalization::class => HostLocalizationFactory::class,
		RedirectResponse::class => RedirectResponseFactory::class,

		@@ -409,7 +392,6 @@ return [
		'headLink' => HeadLink::class,
		'headScript' => HeadScript::class,
		'inlineScript' => InlineScript::class,
		'instadia' => InstadiaViewHelper::class,
		'messageCollector' => MessageCollectorHelper::class,
		'uploader' => UploaderHelper::class,
		'Uploader' => UploaderHelper::class,
		@@ -425,7 +407,6 @@ return [
		HeadLink::class => HeadLinkFactory::class,
		HeadScript::class => HeadScriptFactory::class,
		InlineScript::class => InlineScriptFactory::class,
		InstadiaViewHelper::class => InstadiaViewHelperFactory::class,
		MessageCollectorHelper::class => MessageCollectorHelperFactory::class,
		UploaderHelper::class => UploaderHelperFactory::class,
		],
		@@ -486,7 +467,6 @@ return [
		],
		'factories' => [
		'UnicaenApp\Controller\Cache' => CacheControllerFactory::class,
		'UnicaenApp\Controller\Instadia' => InstadiaControllerFactory::class,
		],
		],

		@@ -687,11 +667,6 @@ return [
		'action' => ['js', 'css', 'printable-css'],
		'roles' => [],
		],
		[
		'controller' => 'UnicaenApp\Controller\Instadia',
		'action' => ['index'],
		'roles' => [],
		],
		],
		],
		],

config/unicaen-app.local.php.dist

+2 −2

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ return [
		* Paramétrage pour utilisation pour autorisation ou non à la connexion à
		* une app de l'exterieur de l'établissement
		*/
		hostlocalization' => [
		'hostlocalization' => [
		'activated' => false,

		'proxies' => [

data/schema-oracle.sql

deleted100644 → 0

+0 −18

Original line number	Diff line number	Diff line
		/* Si vous voulez utiliser Instadia!! */
		CREATE
		TABLE INSTADIA
		(
		ID NUMBER (*,0) NOT NULL ,
		USER_ID NUMBER (*,0) ,
		RUBRIQUE VARCHAR2 (80 CHAR) NOT NULL ,
		SOUS_RUBRIQUE VARCHAR2 (80 CHAR) ,
		HORODATAGE DATE NOT NULL ,
		CONTENU VARCHAR2 (3000 CHAR) NOT NULL
		)
		LOGGING ;
		ALTER TABLE INSTADIA ADD CONSTRAINT INSTADIA_PK PRIMARY KEY ( id ) ;

		ALTER TABLE INSTADIA ADD CONSTRAINT INSTADIA_USER_FK FOREIGN KEY ( USER_ID )
		REFERENCES "USER" ( ID ) ON DELETE SET NULL NOT DEFERRABLE ;

		CREATE SEQUENCE INSTADIA_ID_SEQ;
		No newline at end of file