espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:espocrm/espocrm

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-12-28 11:52:32 +02:00
parent d0cf57cb66 713ecb3be7
commit f5232dc5af
5 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+2 -2
View File
@@ -315,11 +315,11 @@ module.exports = function (grunt) {
});
grunt.registerTask("unit-tests-run", function() {
cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php ./tests/unit", {stdio: 'inherit'});
cp.execSync("vendor/bin/phpunit ./tests/unit", {stdio: 'inherit'});
});
grunt.registerTask("integration-tests-run", function() {
cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php ./tests/integration", {stdio: 'inherit'});
cp.execSync("vendor/bin/phpunit ./tests/integration", {stdio: 'inherit'});
});
grunt.registerTask("zip", function() {
application/Espo/Core/Loaders/EntityManager.php
+6 -58
View File
@@ -30,73 +30,21 @@
namespace Espo\Core\Loaders;
use Espo\Core\{
Utils\Config,
InjectableFactory,
ORM\EntityManagerFactory,
ORM\EntityManager as EntityManagerService,
ORM\RepositoryFactory,
ORM\EntityFactory,
ORM\Helper,
ORM\MetadataDataProvider,
};
use Espo\{
ORM\Metadata as OrmMetadata,
};
class EntityManager implements Loader
{
protected $config;
protected $injectableFactory;
protected $metadataDataProvider;
protected $entityManagerFactory;
public function __construct(
Config $config,
InjectableFactory $injectableFactory,
MetadataDataProvider $metadataDataProvider
) {
$this->config = $config;
$this->injectableFactory = $injectableFactory;
$this->metadataDataProvider = $metadataDataProvider;
public function __construct(EntityManagerFactory $entityManagerFactory)
{
$this->entityManagerFactory = $entityManagerFactory;
}
public function load() : EntityManagerService
{
$entityFactory = $this->injectableFactory->create(EntityFactory::class);
$repositoryFactory = $this->injectableFactory->createWith(RepositoryFactory::class, [
'entityFactory' => $entityFactory,
]);
$helper = $this->injectableFactory->create(Helper::class);
$config = $this->config;
$params = [
'host' => $config->get('database.host'),
'port' => $config->get('database.port'),
'dbname' => $config->get('database.dbname'),
'user' => $config->get('database.user'),
'charset' => $config->get('database.charset', 'utf8'),
'password' => $config->get('database.password'),
'driver' => $config->get('database.driver'),
'platform' => $config->get('database.platform'),
'sslCA' => $config->get('database.sslCA'),
'sslCert' => $config->get('database.sslCert'),
'sslKey' => $config->get('database.sslKey'),
'sslCAPath' => $config->get('database.sslCAPath'),
'sslCipher' => $config->get('database.sslCipher'),
];
$metadata = new OrmMetadata($this->metadataDataProvider);
$entityManager = $this->injectableFactory->createWith(EntityManagerService::class, [
'params' => $params,
'metadata' => $metadata,
'repositoryFactory' => $repositoryFactory,
'entityFactory' => $entityFactory,
'helper' => $helper,
]);
return $entityManager;
return $this->entityManagerFactory->create();
}
}
application/Espo/Core/Loaders/OrmMetadata.php
-50
View File
@@ -1,50 +0,0 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Core\Loaders;
use Espo\{
ORM\Metadata,
ORM\EntityManager,
};
class OrmMetadata implements Loader
{
protected $entityManager;
public function __construct(EntityManager $entityManager)
{
$this->entityManager = $entityManager;
}
public function load() : Metadata
{
return $this->entityManager->getMetadata();
}
}
application/Espo/Core/ORM/EntityManagerFactory.php
+97
View File
@@ -0,0 +1,97 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Core\ORM;
use Espo\Core\{
Utils\Config,
InjectableFactory,
};
use Espo\{
ORM\Metadata,
};
class EntityManagerFactory
{
protected $config;
protected $injectableFactory;
protected $metadataDataProvider;
public function __construct(
Config $config,
InjectableFactory $injectableFactory,
MetadataDataProvider $metadataDataProvider
) {
$this->config = $config;
$this->injectableFactory = $injectableFactory;
$this->metadataDataProvider = $metadataDataProvider;
}
public function create() : EntityManager
{
$entityFactory = $this->injectableFactory->create(EntityFactory::class);
$repositoryFactory = $this->injectableFactory->createWith(RepositoryFactory::class, [
'entityFactory' => $entityFactory,
]);
$helper = $this->injectableFactory->create(Helper::class);
$config = $this->config;
$params = [
'host' => $config->get('database.host'),
'port' => $config->get('database.port'),
'dbname' => $config->get('database.dbname'),
'user' => $config->get('database.user'),
'charset' => $config->get('database.charset', 'utf8'),
'password' => $config->get('database.password'),
'driver' => $config->get('database.driver'),
'platform' => $config->get('database.platform'),
'sslCA' => $config->get('database.sslCA'),
'sslCert' => $config->get('database.sslCert'),
'sslKey' => $config->get('database.sslKey'),
'sslCAPath' => $config->get('database.sslCAPath'),
'sslCipher' => $config->get('database.sslCipher'),
];
$metadata = new Metadata($this->metadataDataProvider);
$entityManager = $this->injectableFactory->createWith(EntityManager::class, [
'params' => $params,
'metadata' => $metadata,
'repositoryFactory' => $repositoryFactory,
'entityFactory' => $entityFactory,
'helper' => $helper,
]);
return $entityManager;
}
}
application/Espo/ORM/QueryParams/SelectBuilder.php
+1
View File
@@ -30,6 +30,7 @@
namespace Espo\ORM\QueryParams;
use InvalidArgumentException;
use RuntimeException;
class SelectBuilder implements Builder
{