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

Remove last public use of Tracker::isTracked

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-03-14 11:28:09 +00:00
parent 938dd6f7f8
commit 8eb023bcce
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/Controllers/Table/TrackingController.php
View File

@ -14,6 +14,7 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tracking\Tracker;
use PhpMyAdmin\Tracking\Tracking;
use PhpMyAdmin\Tracking\TrackingChecker;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use Throwable;
@ -35,6 +36,7 @@ final class TrackingController extends AbstractController
ResponseRenderer $response,
Template $template,
private Tracking $tracking,
private TrackingChecker $trackingChecker,
) {
parent::__construct($response, $template);
}
@ -64,9 +66,11 @@ final class TrackingController extends AbstractController
$toggleActivation = $request->getParsedBodyParam('toggle_activation');
$reportExport = $request->getParsedBodyParam('report_export');
$trackedTables = $this->trackingChecker->getTrackedTables($GLOBALS['db']);
if (
Tracker::isActive()
&& Tracker::isTracked($GLOBALS['db'], $GLOBALS['table'])
&& isset($trackedTables[$GLOBALS['table']])
&& $trackedTables[$GLOBALS['table']]->active
&& $toggleActivation !== 'deactivate_now'
&& $reportExport !== 'sqldumpfile'
) {

1
libraries/services_controllers.php
View File

@ -1615,6 +1615,7 @@ return [
'$response' => '@response',
'$template' => '@template',
'$tracking' => '@tracking',
'$trackingChecker' => '@tracking_checker',
],
],
Table\TriggersController::class => [

4
test/classes/Controllers/Table/TrackingControllerTest.php
View File

@ -45,6 +45,7 @@ class TrackingControllerTest extends AbstractTestCase
$response = new ResponseRenderer();
$template = new Template();
$trackingChecker = $this->createStub(TrackingChecker::class);
(new TrackingController(
$response,
$template,
@ -53,8 +54,9 @@ class TrackingControllerTest extends AbstractTestCase
$template,
new Relation($this->dbi),
$this->dbi,
$this->createStub(TrackingChecker::class),
$trackingChecker,
),
$trackingChecker,
))($this->createStub(ServerRequest::class));
$main = $template->render('table/tracking/main', [