gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old DI container in user_password.php

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-06-15 21:14:15 -03:00
parent 89bce5a782
commit b739e204c2
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services.yml
View File

@ -87,6 +87,10 @@ services:
class: 'PhpMyAdmin\Relation'
arguments: ['@dbi', '@template']
relation_cleanup:
class: 'PhpMyAdmin\RelationCleanup'
arguments: ['@dbi', '@relation']
replication:
class: 'PhpMyAdmin\Replication'
@ -99,6 +103,10 @@ services:
response:
factory: 'PhpMyAdmin\Response::getInstance'
server_privileges:
class: 'PhpMyAdmin\Server\Privileges'
arguments: ['@template', '@dbi', '@relation', '@relation_cleanup']
sql_query_form:
class: 'PhpMyAdmin\SqlQueryForm'
@ -122,6 +130,10 @@ services:
transformations:
class: 'PhpMyAdmin\Transformations'
user_password:
class: 'PhpMyAdmin\UserPassword'
arguments: ['@server_privileges']
#Aliases
PhpMyAdmin\Response: '@response'

21
user_password.php
View File

@ -9,14 +9,9 @@
declare(strict_types=1);
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Display\ChangePassword;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\Response;
use PhpMyAdmin\Server\Privileges;
use PhpMyAdmin\Template;
use PhpMyAdmin\UserPassword;
if (! defined('ROOT_PATH')) {
@ -27,27 +22,19 @@ global $cfg;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('server/privileges.js');
$scripts->addFile('vendor/zxcvbn.js');
/** @var Template $template */
$template = $containerBuilder->get('template');
/** @var Relation $relation */
$relation = $containerBuilder->get('relation');
$relationCleanup = new RelationCleanup($dbi, $relation);
$serverPrivileges = new Privileges($template, $dbi, $relation, $relationCleanup);
$userPassword = new UserPassword($serverPrivileges);
/** @var UserPassword $userPassword */
$userPassword = $containerBuilder->get('user_password');
/**
* Displays an error message and exits if the user isn't allowed to use this