Use Composer to load MoTranslator functions

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2021-06-03 15:12:12 -03:00
parent bf46895582
commit 62f142c9fa
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
4 changed files with 2 additions and 13 deletions

View File

@ -23,7 +23,8 @@
"autoload": {
"psr-4": {
"PhpMyAdmin\\": "libraries/classes"
}
},
"files": ["vendor/phpmyadmin/motranslator/src/functions.php"]
},
"autoload-dev": {
"psr-4": {

View File

@ -37,7 +37,6 @@ use PhpMyAdmin\ErrorHandler;
use PhpMyAdmin\LanguageManager;
use PhpMyAdmin\Logging;
use PhpMyAdmin\Message;
use PhpMyAdmin\MoTranslator\Loader;
use PhpMyAdmin\Plugins;
use PhpMyAdmin\Profiling;
use PhpMyAdmin\Response;
@ -118,11 +117,6 @@ if ($route === '/import-status') {
$containerBuilder = Core::getContainerBuilder();
/**
* Load gettext functions.
*/
Loader::loadFunctions();
/** @var ErrorHandler $errorHandler */
$errorHandler = $containerBuilder->get('error_handler');

View File

@ -8,7 +8,6 @@ declare(strict_types=1);
use PhpMyAdmin\Config;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\MoTranslator\Loader;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
if (! defined('ROOT_PATH')) {
@ -46,7 +45,6 @@ if (! defined('PHPMYADMIN')) {
require_once ROOT_PATH . 'libraries/vendor_config.php';
require_once AUTOLOAD_FILE;
Loader::loadFunctions();
$GLOBALS['containerBuilder'] = Core::getContainerBuilder();

View File

@ -5,8 +5,6 @@
declare(strict_types=1);
use PhpMyAdmin\MoTranslator\Loader;
if (! defined('ROOT_PATH')) {
// phpcs:disable PSR1.Files.SideEffects
define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
@ -36,7 +34,5 @@ define('PMA_USR_OS', 'os');
define('PMA_IS_WINDOWS', false);
// phpcs:enable
Loader::loadFunctions();
// for PhpMyAdmin\Plugins\Import\ImportLdi
$GLOBALS['plugin_param'] = 'table';