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

Merge pull request #4 from monarc-project/laminas 

Migrated to Laminas.
feature/246
ruslanbaidan 2020-02-21 15:34:10 +01:00 committed by GitHub
parent 8bebf629c2 dc96289c36
commit b169fffd3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 2280 additions and 2033 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AUTHORS
View File

@ -1,8 +1,9 @@
# Developers
Cédric Bonhomme
Cédric Bonhomme - https://www.cedricbonhomme.org
Jérôme Lombardi
Juan Rocha
Ruslan Baidan
# Contributors
@ -19,10 +20,11 @@ Thomas Metois
# Copyright holders
- Copyright (C) 2016-2019 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2019 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2016-2019 SMILE gie securitymadein.lu
- Copyright (C) 2017-2019 Cédric Bonhomme - https://github.com/cedricbonhomme
- Copyright (C) 2016-2020 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2020 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2016-2020 SMILE gie securitymadein.lu
- Copyright (C) 2017-2020 Cédric Bonhomme - https://github.com/cedricbonhomme
- Copyright (C) 2016-2017 Guillaume Lesniak
- Copyright (C) 2016-2017 Thomas Metois
- Copyright (C) 2016-2017 Jérôme De Almeida
- Copyright (C) 2019-2020 Ruslan Baidan - https://github.com/ruslanbaydan

9
README.md
View File

@ -24,13 +24,14 @@ License
This software is licensed under
[GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html)
- Copyright (C) 2016-2019 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2019 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2016-2019 SMILE gie securitymadein.lu
- Copyright (C) 2017-2019 Cédric Bonhomme - https://github.com/cedricbonhomme
- Copyright (C) 2016-2020 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2020 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2016-2020 SMILE gie securitymadein.lu
- Copyright (C) 2017-2020 Cédric Bonhomme - https://www.cedricbonhomme.org
- Copyright (C) 2016-2017 Guillaume Lesniak
- Copyright (C) 2016-2017 Thomas Metois
- Copyright (C) 2016-2017 Jérôme De Almeida
- Copyright (C) 2019-2020 Ruslan Baidan - https://github.com/ruslanbaydan
For more information, [the list of authors and contributors](AUTHORS) is available.

2
VERSION.json
View File

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

65
composer.json
View File

@ -2,32 +2,59 @@
"name": "monarc/monarc-backoffice",
"description": "Monarc back office 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/backoffice": "^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"
}
,
"monarc/backoffice": "^2.9.5",
"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",
"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/"

4195
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

24
config/application.config.php
View File

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

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "MONARC",
"version": "2.9.4",
"version": "2.9.11",
"description": "Monarc back office",
"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();