Merge branch 'ZF3' into development (07a9383c) · Commits · open-source / emc2

composer.json

+7 −6

Original line number	Diff line number	Diff line
		{
		"name": "unicaen/skeleton-application",
		"description": "Squelette d'application Unicaen (ZF2)",
		"description": "PrEECoG : outils pour la GPEEC",
		"repositories": [
		{
		"type": "composer",
		@@ -8,11 +8,12 @@
		}
		],
		"require": {
		"unicaen/app": "^1.2",
		"unicaen/auth": "^1.2",
		"unicaen/ldap": "^2.2",
		"unicaen/octopus": "^0.6.0",
		"unicaen/db-import": "^1.1"
		"unicaen/app": "dev-zf-3.x",
		"unicaen/auth": "dev-zf-3.x",
		"unicaen/bjy-authorize": "dev-zf-3.x",
		"unicaen/ldap": "dev-zf-3.x",
		"unicaen/octopus": "dev-zf-3.x",
		"unicaen/db-import": "dev-zf-3.x"
		},
		"require-dev": {
		"unicaen/code": "^1.0",

+3459 −691

File changed.

Preview size limit exceeded, changes collapsed.

+23 −2

Original line number	Diff line number	Diff line
		<?php

		$modules = [
		'ZfcBase', 'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'ZfcUserDoctrineORM',
		'BjyAuthorize', 'AssetManager',
		'Zend\Cache',
		'Zend\Filter',
		'Zend\Form',
		'Zend\Hydrator',
		'Zend\I18n',
		'Zend\InputFilter',
		'Zend\Log',
		'Zend\Mail',
		'Zend\Mvc\Console',
		'Zend\Mvc\I18n',
		'Zend\Mvc\Plugin\FilePrg',
		'Zend\Mvc\Plugin\FlashMessenger',
		'Zend\Mvc\Plugin\Identity',
		'Zend\Mvc\Plugin\Prg',
		'Zend\Navigation',
		'Zend\Paginator',
		'Zend\Router',
		'Zend\Session',
		'Zend\Validator',

		'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'BjyAuthorize' => 'BjyAuthorize',
		'UnicaenApp',
		'UnicaenApp', 'UnicaenAuth', 'UnicaenLdap', 'UnicaenDbImport',
		'Autoform',
		'Fichier',
		@@ -12,6 +32,7 @@ $modules = [
		'Indicateur',
		'Application',
		//'ZendDeveloperTools',

		];

		if ( 'development' == getenv('APPLICATION_ENV') ?: 'production' ) {

+14 −0

Original line number	Diff line number	Diff line
		@@ -5,7 +5,19 @@
		* Copiez ce fichier dans le répertoire "config/autoload" de l'application,
		* enlevez l'extension ".dist" et adaptez son contenu à vos besoins.
		*/

		use Zend\Session\Storage\SessionArrayStorage;

		return [
		'session_config' => [
		'cookie_lifetime' => 60608,
		'gc_maxlifetime' => 606024*30,
		],

		'session_storage' => [
		'type' => SessionArrayStorage::class
		],

		'unicaen-app' => [

		/**
		@@ -21,6 +33,8 @@ return [
		'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/",
		],



		/**
		* Période d'exécution de la requête de rafraîchissement de la session utilisateur, en millisecondes.
		*/

+1 −1