Merge branch 'development' (e5fae179) · Commits · open-source / emc2

Dockerfile.php7.dev

+7 −3

Original line number	Diff line number	Diff line

		###########################################################################################
		#
		# Image pour le dev.
		@@ -7,12 +6,13 @@
		#
		###########################################################################################

		FROM php:7-apache
		FROM php:7.0-apache

		LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"

		# Mise à niveau de la distrib et installation des packages requis.
		RUN apt-get update && apt-get install -y \
		RUN apt-get update
		RUN apt-get install -y \
		ghostscript \
		git \
		libaio1 \
		@@ -33,6 +33,8 @@ RUN apt-get update && apt-get install -y \
		vim \
		wget \
		zlib1g-dev
		RUN apt-get install -y \
		libpq-dev
		RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && \
		docker-php-ext-configure opcache --enable-opcache && \
		docker-php-ext-install -j$(nproc) \
		@@ -48,6 +50,8 @@ RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && \
		pdo_mysql \
		soap \
		zip
		RUN docker-php-ext-install -j$(nproc) \
		pdo_pgsql
		RUN rm -rf /var/lib/apt/lists/*

		# Installation d'extensions PECL

composer.json

+3 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,8 @@
		],
		"require": {
		"unicaen/app": "^1.2",
		"unicaen/auth": "^1.2"
		"unicaen/auth": "^1.2",
		"unicaen/ldap": "^2.2"
		},
		"require-dev": {
		"unicaen/code": "^1.0",

composer.lock

+40 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
		"This file is @generated automatically"
		],
		"content-hash": "bcb9208b9be4b8501ca2523e38beb559",
		"content-hash": "bfc07f403e04b3d5970f0443758676ac",
		"packages": [
		{
		"name": "bjyoungblood/bjy-authorize",
		@@ -74,6 +74,7 @@
		"zf2",
		"zfc-user"
		],
		"abandoned": true,
		"time": "2013-07-05T11:59:46+00:00"
		},
		{
		@@ -1481,6 +1482,43 @@
		"description": "Module d'authentification pour les applications Unicaen",
		"time": "2018-03-28T08:19:16+00:00"
		},
		{
		"name": "unicaen/ldap",
		"version": "2.2.2",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/ldap.git",
		"reference": "4e981c60db598168c9f8a5d916d01af4bf9b0581"
		},
		"require": {
		"php": "^5.6 \|\| ^7.0",
		"zendframework/zend-config": "~2.4 \|\| ^2.7",
		"zendframework/zend-i18n": "~2.4 \|\| ^2.7",
		"zendframework/zend-ldap": "~2.4 \|\| ^2.7",
		"zendframework/zend-log": "~2.4 \|\| ^2.7",
		"zendframework/zend-modulemanager": "~2.4 \|\| ^2.7",
		"zendframework/zend-serializer": "~2.4 \|\| ^2.7",
		"zendframework/zend-servicemanager": "~2.4 \|\| ^2.7",
		"zendframework/zend-stdlib": "~2.4 \|\| ^2.7"
		},
		"require-dev": {
		"phpunit/phpunit": ">=3.7",
		"zendframework/zend-test": ">=2.2"
		},
		"type": "library",
		"autoload": {
		"psr-0": {
		"UnicaenLdap": "src/",
		"UnicaenLdapUnitTest": "tests/unit/",
		"UnicaenLdapFuncTest": "tests/func/"
		},
		"classmap": [
		"./Module.php"
		]
		},
		"description": "Module Ldap des applications Unicaen",
		"time": "2018-02-26T08:32:18+00:00"
		},
		{
		"name": "zendframework/zend-authentication",
		"version": "2.4.13",
		@@ -3265,6 +3303,7 @@
		"version",
		"zf2"
		],
		"abandoned": "ocramius/package-versions",
		"time": "2017-07-13T17:22:10+00:00"
		},
		{

config/application.config.php

+3 −2

Original line number	Diff line number	Diff line
		<?php

		$modules = [
		'Application',
		'ZfcBase', 'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'ZfcUserDoctrineORM',
		'BjyAuthorize', 'AssetManager',
		'UnicaenApp', 'UnicaenAuth',
		'UnicaenApp', 'UnicaenAuth', 'UnicaenLdap',
		'Application',
		'Mailing',
		];

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

config/autoload/README.md

deleted100755 → 0

+0 −8

Original line number	Diff line number	Diff line
		About this directory:
		=====================

		By default, this application is configured to load all configs in
		`./config/autoload/{,*.}{global,local}.php`. Doing this provides a
		location for a developer to drop in configuration override files provided by
		modules, as well as cleanly provide individual, application-wide config files
		for things like database connections, etc.