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

migrated to laminas

pull/255/head
Cédric Bonhomme 2020-02-21 09:40:34 +01:00
parent d92669e320
commit a5730ffc9a
No known key found for this signature in database
GPG Key ID: A1CB94DE57B7A70D
4 changed files with 2249 additions and 2027 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
composer.json
View File

@ -2,15 +2,42 @@
"name": "monarc/monarc", "name": "monarc/monarc",
"description": "Monarc application", "description": "Monarc application",
"authors": [ "authors": [
{"name": "Cyril Rouyer", "email": "cyril@netlor.fr"}, {
{"name": "Guillaume Lesniak", "email": "guillaume@netlor.fr"}, "name": "Cyril Rouyer",
{"name": "Jerôme De Almeida", "email": "jerome.dealmeida@vesperiagroup.com"}, "email": "cyril@netlor.fr"
{"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": "Guillaume Lesniak",
{"name": "Juan Rocha", "email": "juan.rocha@cases.lu"}, "email": "guillaume@netlor.fr"
{"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"}, },
{"name": "Ruslan Baidan", "email": "ruslan.baidan@cases.lu"} {
"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": { "require": {
"php": "^7.1", "php": "^7.1",
@ -18,16 +45,17 @@
"ext-pdo": "*", "ext-pdo": "*",
"monarc/frontoffice": "^2.9", "monarc/frontoffice": "^2.9",
"monarc/core": "^2.9", "monarc/core": "^2.9",
"zendframework/zend-mvc": "^3.1", "laminas/laminas-mvc": "^3.1",
"zendframework/zend-di": "^3.1", "laminas/laminas-di": "^3.1",
"zendframework/zend-permissions-rbac": "^3.0", "laminas/laminas-permissions-rbac": "^3.0",
"zendframework/zend-log": "^2.11", "laminas/laminas-log": "^2.11",
"zendframework/zend-i18n": "^2.9", "laminas/laminas-i18n": "^2.9",
"symfony/console": "^5.0" "symfony/console": "^5.0",
"laminas/laminas-dependency-plugin": "^1.0"
}, },
"require-dev": { "require-dev": {
"roave/security-advisories": "dev-master", "roave/security-advisories": "dev-master",
"zendframework/zend-component-installer": "^2.1" "laminas/laminas-component-installer": "^2.1"
}, },
"config": { "config": {
"bin-dir": "bin/" "bin-dir": "bin/"

4186
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 [ return [
'modules' => [ 'modules' => [
'Zend\Mvc\Console', 'Laminas\Mvc\Console',
'Zend\I18n', 'Laminas\I18n',
'Zend\Mail', 'Laminas\Mail',
'Zend\Log', 'Laminas\Log',
'Monarc\Core', 'Monarc\Core',
'Monarc\FrontOffice', 'Monarc\FrontOffice',
'Zend\Cache', 'Laminas\Cache',
'Zend\Form', 'Laminas\Form',
'Zend\InputFilter', 'Laminas\InputFilter',
'Zend\Filter', 'Laminas\Filter',
'Zend\Paginator', 'Laminas\Paginator',
'Zend\Hydrator', 'Laminas\Hydrator',
'Zend\Di', 'Laminas\Di',
'Zend\Router', 'Laminas\Router',
'Zend\Validator', 'Laminas\Validator',
'DoctrineModule', 'DoctrineModule',
'DoctrineORMModule', 'DoctrineORMModule',
], ],

4
public/index.php
View File

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