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

Merge pull request #13 from monarc-project/feature/remove-db-abstract 

Refactored the backend code
master
Ruslan Baidan 2024-10-04 19:15:41 +02:00 committed by GitHub
parent 8f005da738 042a3cd44e
commit ac7ccee478
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 1448 additions and 618 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":12, "hotfix":6} {"major":2, "minor":13, "hotfix":1}

11
composer.json
View File

@ -40,18 +40,21 @@
} }
], ],
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^8.0",
"ext-json": "*", "ext-json": "*",
"ext-pdo": "*", "ext-pdo": "*",
"monarc/backoffice": "^2.12.6", "ext-openssl": "*",
"monarc/core": "^v2.12.6", "monarc/backoffice": "^2.13.1",
"monarc/core": "^2.13.1",
"laminas/laminas-mvc": "^3.1", "laminas/laminas-mvc": "^3.1",
"laminas/laminas-di": "^3.1", "laminas/laminas-di": "^3.1",
"laminas/laminas-permissions-rbac": "^3.0", "laminas/laminas-permissions-rbac": "^3.0",
"laminas/laminas-log": "^2.11", "laminas/laminas-log": "^2.11",
"laminas/laminas-i18n": "^2.9", "laminas/laminas-i18n": "^2.9",
"laminas/laminas-dependency-plugin": "^2.0", "laminas/laminas-dependency-plugin": "^2.0",
"endroid/qr-code": "^4.4" "laminas/laminas-mvc-middleware": "^2.2",
"endroid/qr-code": "^4.4",
"laminas/laminas-i18n-resources": "^2.9"
}, },
"require-dev": { "require-dev": {
"roave/security-advisories": "dev-latest" "roave/security-advisories": "dev-latest"

2005
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

1
config/application.config.php
View File

@ -41,6 +41,7 @@ return array(
'Laminas\Mail', 'Laminas\Mail',
'Laminas\Validator', 'Laminas\Validator',
'Laminas\I18n', 'Laminas\I18n',
'Laminas\Mvc\Middleware',
'DoctrineModule', 'DoctrineModule',
'DoctrineORMModule', 'DoctrineORMModule',
'Monarc\Core', 'Monarc\Core',

4
config/autoload/global.php.dist
View File

@ -28,7 +28,7 @@ return array(
'doctrine' => array( 'doctrine' => array(
'connection' => array( 'connection' => array(
'orm_default' => array( 'orm_default' => array(
'driverClass' => 'Doctrine\DBAL\Driver\PDO\MySQL\Driver', 'driverClass' => Doctrine\DBAL\Driver\PDO\MySQL\Driver::class,
'params' => array( 'params' => array(
'host' => 'localhost', 'host' => 'localhost',
'port' => 3306, 'port' => 3306,
@ -42,7 +42,7 @@ return array(
), ),
), ),
'orm_cli' => array( 'orm_cli' => array(
'driverClass' => 'Doctrine\DBAL\Driver\PDO\MySQL\Driver', 'driverClass' => Doctrine\DBAL\Driver\PDO\MySQL\Driver::class,
'params' => array( 'params' => array(
'host' => 'localhost', 'host' => 'localhost',
'port' => 3306, 'port' => 3306,

39
config/autoload/local.php.dist
View File

@ -11,27 +11,29 @@
* credentials from accidentally being committed into version control. * credentials from accidentally being committed into version control.
*/ */
return array( $package_json = json_decode(file_get_contents('./package.json'), true);
'doctrine' => array(
'connection' => array( return [
'orm_default' => array( 'doctrine' => [
'params' => array( 'connection' => [
'orm_default' => [
'params' => [
'host' => 'localhost', 'host' => 'localhost',
'user' => 'root', 'user' => 'root',
'password' => 'password', 'password' => 'password',
'dbname' => 'monarc_common', 'dbname' => 'monarc_common',
), ],
), ],
'orm_cli' => array( 'orm_cli' => [
'params' => array( 'params' => [
'host' => 'localhost', 'host' => 'localhost',
'user' => 'root', 'user' => 'root',
'password' => 'password', 'password' => 'password',
'dbname' => 'monarc_master', 'dbname' => 'monarc_master',
), ],
), ],
), ],
), ],
/* Link with (ModuleCore) /* Link with (ModuleCore)
config['languages'] = [ config['languages'] = [
@ -49,10 +51,13 @@ return array(
), ),
] ]
*/ */
'activeLanguages' => array('fr','en','de','nl'),
'monarc' => array( 'appVersion' => $package_json['version'],
'activeLanguages' => ['fr','en','de','nl'],
'monarc' => [
'ttl' => 20, // timeout 'ttl' => 20, // timeout
'salt' => '', // salt privé pour chiffrement pwd 'salt' => '', // salt privé pour chiffrement pwd
), ],
); ];

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "MONARC Back Office", "name": "MONARC Back Office",
"version": "2.12.6", "version": "2.13.1",
"description": "MONARC Back Office", "description": "MONARC Back Office",
"private": true, "private": true,
"repository": { "repository": {

2
vagrant/Vagrantfile vendored
View File

@ -55,7 +55,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# #
# # Use VBoxManage to customize the VM. For example to change memory: # # Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "2048"] vb.customize ["modifyvm", :id, "--memory", "2048"]
vb.customize ["modifyvm", :id, "--name", "MONARC BO - Ubuntu 22.04 - DEV"] vb.customize ["modifyvm", :id, "--name", "MONARC BO - Ubuntu 22.04 - New"]
end end
# #
# View the documentation for the provider you're using for more # View the documentation for the provider you're using for more