Monarc
/
MonarcAppFO
mirror of https://github.com/monarc-project/MonarcAppFO
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #255 from monarc-project/laminas 

migrated to laminas
2.9.12
ruslanbaidan 2020-02-21 15:30:14 +01:00 committed by GitHub
parent d92669e320 3bc80ee319
commit 7f51be2cb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 2317 additions and 2069 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CHANGELOG.md
View File

@ -1,6 +1,30 @@
MONARC Changelog
================
## 2.9.11 (2020-02-21)
### New
- added users creation command
([PR 27](https://github.com/monarc-project/zm-client/pull/27));
- backend has been migrated from Zend Framework to Laminas
([#249](https://github.com/monarc-project/MonarcAppFO/issues/249)).
### Fix
- The description area of the shelf life is too fair at the character level
([#252](https://github.com/monarc-project/MonarcAppFO/issues/252));
- In the description of destinations area; info is not kept after registration
([#253](https://github.com/monarc-project/MonarcAppFO/issues/253));
- [GDPR module] Issue when creating a new recipient with default values
([#254](https://github.com/monarc-project/MonarcAppFO/issues/254));
- Get the list controls in BO
([#256](https://github.com/monarc-project/MonarcAppFO/issues/256));
- fix: improved performance when drag and dropping assets
([ff473d9](https://github.com/monarc-project/zm-core/commit/ff473d96b51ddbdbcd8e6c59927e59f246b7b67b)).
## 2.9.10 (2020-01-29)
### New

2
INSTALL/INSTALL.debian10.md
View File

@ -83,7 +83,7 @@ Especially by setting a strong root password.
### Back-end
The back-end is using the Zend Framework 3.
The back-end is using [Laminas](https://getlaminas.org).
Create two symbolic links:

2
INSTALL/INSTALL.ubuntu1804.md
View File

@ -79,7 +79,7 @@ Especially by setting a strong root password.
### Back-end
The back-end is using the Zend Framework 3.
The back-end is using [Laminas](https://getlaminas.org).
Create two symbolic links:

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":9, "hotfix":10}
{"major":2, "minor":9, "hotfix":11}

64
composer.json
View File

@ -2,32 +2,60 @@
"name": "monarc/monarc",
"description": "Monarc application",
"authors": [
{"name": "Cyril Rouyer", "email": "cyril@netlor.fr"},
{"name": "Guillaume Lesniak", "email": "guillaume@netlor.fr"},
{"name": "Jerôme De Almeida", "email": "jerome.dealmeida@vesperiagroup.com"},
{"name": "Benjamin Ganivet", "email": "benjamin@netlor.fr"},
{"name": "Thomas Metois", "email": "thomas@netlor.fr"},
{"name": "Jérôme Lombardi", "email": "jerome.lombardi@cases.lu"},
{"name": "Juan Rocha", "email": "juan.rocha@cases.lu"},
{"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"},
{"name": "Ruslan Baidan", "email": "ruslan.baidan@cases.lu"}
{
"name": "Cyril Rouyer",
"email": "cyril@netlor.fr"
},
{
"name": "Guillaume Lesniak",
"email": "guillaume@netlor.fr"
},
{
"name": "Jérôme De Almeida",
"email": "jerome.dealmeida@vesperiagroup.com"
},
{
"name": "Benjamin Ganivet",
"email": "benjamin@netlor.fr"
},
{
"name": "Thomas Metois",
"email": "thomas@netlor.fr"
},
{
"name": "Jérôme Lombardi",
"email": "jerome.lombardi@cases.lu"
},
{
"name": "Juan Rocha",
"email": "juan.rocha@cases.lu"
},
{
"name": "Cédric Bonhomme",
"email": "cedric.bonhomme@cases.lu"
},
{
"name": "Ruslan Baidan",
"email": "ruslan.baidan@cases.lu"
}
],
"require": {
"php": "^7.1",
"ext-json": "*",
"ext-pdo": "*",
"monarc/frontoffice": "^2.9",
"monarc/core": "^2.9",
"zendframework/zend-mvc": "^3.1",
"zendframework/zend-di": "^3.1",
"zendframework/zend-permissions-rbac": "^3.0",
"zendframework/zend-log": "^2.11",
"zendframework/zend-i18n": "^2.9",
"symfony/console": "^5.0"
"monarc/frontoffice": "^2.9.15",
"monarc/core": "^2.9.15",
"laminas/laminas-mvc": "^3.1",
"laminas/laminas-di": "^3.1",
"laminas/laminas-permissions-rbac": "^3.0",
"laminas/laminas-log": "^2.11",
"laminas/laminas-i18n": "^2.9",
"symfony/console": "^5.0",
"laminas/laminas-dependency-plugin": "^1.0"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"zendframework/zend-component-installer": "^2.1"
"laminas/laminas-component-installer": "^2.1"
},
"config": {
"bin-dir": "bin/"

4260
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

26
config/application.config.php
View File

@ -22,21 +22,21 @@ if (!empty($appConfDir)) {
return [
'modules' => [
'Zend\Mvc\Console',
'Zend\I18n',
'Zend\Mail',
'Zend\Log',
'Laminas\Mvc\Console',
'Laminas\I18n',
'Laminas\Mail',
'Laminas\Log',
'Monarc\Core',
'Monarc\FrontOffice',
'Zend\Cache',
'Zend\Form',
'Zend\InputFilter',
'Zend\Filter',
'Zend\Paginator',
'Zend\Hydrator',
'Zend\Di',
'Zend\Router',
'Zend\Validator',
'Laminas\Cache',
'Laminas\Form',
'Laminas\InputFilter',
'Laminas\Filter',
'Laminas\Paginator',
'Laminas\Hydrator',
'Laminas\Di',
'Laminas\Router',
'Laminas\Validator',
'DoctrineModule',
'DoctrineORMModule',
],

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "MONARC",
"version": "2.9.10",
"version": "2.9.11",
"description": "Monarc front office application",
"private": true,
"repository": {

4
public/index.php
View File

@ -1,6 +1,6 @@
<?php
use Zend\Mvc\Application;
use Laminas\Mvc\Application;
chdir(dirname(__DIR__));
@ -28,7 +28,7 @@ if (! class_exists(Application::class)) {
$appConfig = require 'config/application.config.php';
if (file_exists('config/development.config.php')) {
$appConfig = Zend\Stdlib\ArrayUtils::merge($appConfig, include 'config/development.config.php');
$appConfig = Laminas\Stdlib\ArrayUtils::merge($appConfig, include 'config/development.config.php');
}
Application::init($appConfig)->run();