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

Extract ResponseRenderer dependency from InsertEdit

Browse Source 
Uses DI instead.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth 2026-02-12 16:55:26 -03:00
parent b6751c41ef
commit 7e6248c796
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
5 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/services.php
View File

@ -139,6 +139,7 @@ return [
FileListing::class,
Template::class,
Config::class,
ResponseRenderer::class,
],
],
Middleware\ErrorHandling::class => [

3
src/InsertEdit.php
View File

@ -84,6 +84,7 @@ class InsertEdit
private readonly FileListing $fileListing,
private readonly Template $template,
private readonly Config $config,
private readonly ResponseRenderer $responseRenderer,
) {
}
@ -155,7 +156,7 @@ class InsertEdit
$rows[$keyId] = $result[$keyId]->fetchAssoc();
if ($rows[$keyId] === []) {
ResponseRenderer::getInstance()->addHTML(
$this->responseRenderer->addHTML(
Generator::getMessage(
__('MySQL returned an empty result set (i.e. zero rows).'),
$localQuery,

2
tests/unit/Controllers/Table/ChangeControllerTest.php
View File

@ -64,6 +64,7 @@ final class ChangeControllerTest extends AbstractTestCase
new FileListing(),
$template,
$config,
$response,
);
(new ChangeController(
@ -175,6 +176,7 @@ final class ChangeControllerTest extends AbstractTestCase
new FileListing(),
$template,
$config,
$response,
);
(new ChangeController(

2
tests/unit/Controllers/Table/ReplaceControllerTest.php
View File

@ -120,7 +120,7 @@ class ReplaceControllerTest extends AbstractTestCase
$replaceController = new ReplaceController(
$response,
new InsertEdit($dbi, $relation, $transformations, new FileListing(), $template, $config),
new InsertEdit($dbi, $relation, $transformations, new FileListing(), $template, $config, $response),
$transformations,
$relation,
$dbi,

39
tests/unit/InsertEditTest.php
View File

@ -16,11 +16,11 @@ use PhpMyAdmin\EditField;
use PhpMyAdmin\FileListing;
use PhpMyAdmin\InsertEdit;
use PhpMyAdmin\InsertEditColumn;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\Table;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
use PhpMyAdmin\Tests\Stubs\DummyResult;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\TypeClass;
use PhpMyAdmin\Url;
@ -79,6 +79,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$this->dbi->setVersion([
@ -87,18 +88,6 @@ class InsertEditTest extends AbstractTestCase
]);
}
/**
* Teardown all objects
*/
protected function tearDown(): void
{
parent::tearDown();
$response = new ReflectionProperty(ResponseRenderer::class, 'instance');
$response->setValue(null, null);
DatabaseInterface::$instance = null;
}
/**
* Test for getFormParametersForInsertForm
*/
@ -194,6 +183,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->callFunction(
$this->insertEdit,
@ -241,6 +231,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->callFunction(
@ -278,6 +269,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->callFunction(
@ -995,6 +987,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$currentRow['f'] = '123';
@ -1203,6 +1196,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$this->insertEdit->setSessionForEditNext('`a` = 2');
@ -1286,6 +1280,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->insertEdit->executeSqlQuery($query);
@ -1310,6 +1305,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->insertEdit->executeSqlQuery($query);
@ -1344,6 +1340,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = (array) $this->callFunction(
@ -1397,6 +1394,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->insertEdit->getDisplayValueForForeignTableColumn('=1', $map, 'f');
@ -2136,6 +2134,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$this->insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData('db', 'table', 'a', $extraData);
@ -2186,6 +2185,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->insertEdit->getTableColumns('db', 'table');
@ -2220,15 +2220,6 @@ class InsertEditTest extends AbstractTestCase
$_POST['after_insert'] = 'edit_next';
$_POST['default_action'] = 'insert';
$responseMock = $this->getMockBuilder(ResponseRenderer::class)
->disableOriginalConstructor()
->onlyMethods(['addHtml'])
->getMock();
$restoreInstance = ResponseRenderer::getInstance();
$response = new ReflectionProperty(ResponseRenderer::class, 'instance');
$response->setValue(null, $responseMock);
$config = Config::getInstance();
$relation = new Relation($dbi);
$this->insertEdit = new InsertEdit(
@ -2238,6 +2229,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
$result = $this->insertEdit->determineInsertOrEdit('1', 'db', 'table');
@ -2254,8 +2246,6 @@ class InsertEditTest extends AbstractTestCase
$result = $this->insertEdit->determineInsertOrEdit(null, 'db', 'table');
$response->setValue(null, $restoreInstance);
self::assertSame(
[true, null, $resultStub, [[], []], false, 'edit_next'],
$result,
@ -2292,6 +2282,7 @@ class InsertEditTest extends AbstractTestCase
new FileListing(),
new Template($config),
$config,
new ResponseRenderer(),
);
self::assertSame(