Remove last public use of Tracker::isTracked

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Mar 17, 2023 · 8eb023b · 8eb023b
1 parent 938dd6f
commit 8eb023b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php
@@ -14,6 +14,7 @@
 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 @@ public function __construct(
         ResponseRenderer $response,
         Template $template,
         private Tracking $tracking,
+        private TrackingChecker $trackingChecker,
     ) {
         parent::__construct($response, $template);
     }
@@ -64,9 +66,11 @@ public function __invoke(ServerRequest $request): void
         $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'
         ) {

diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php
@@ -1615,6 +1615,7 @@
                 '$response' => '@response',
                 '$template' => '@template',
                 '$tracking' => '@tracking',
+                '$trackingChecker' => '@tracking_checker',
             ],
         ],
         Table\TriggersController::class => [

diff --git a/test/classes/Controllers/Table/TrackingControllerTest.php b/test/classes/Controllers/Table/TrackingControllerTest.php
@@ -45,6 +45,7 @@ public function testTrackingController(): void
 
         $response = new ResponseRenderer();
         $template = new Template();
+        $trackingChecker = $this->createStub(TrackingChecker::class);
         (new TrackingController(
             $response,
             $template,
@@ -53,8 +54,9 @@ public function testTrackingController(): void
                 $template,
                 new Relation($this->dbi),
                 $this->dbi,
-                $this->createStub(TrackingChecker::class),
+                $trackingChecker,
             ),
+            $trackingChecker,
         ))($this->createStub(ServerRequest::class));
 
         $main = $template->render('table/tracking/main', [