Fix PHPCS

Author: tzi

plugins/SegmentEditor/Controller.php

@@ -38,7 +38,7 @@ public function __construct()
         parent::__construct();
 
         $this->period = Request::fromRequest()->getStringParameter('period', 'day');
-        $this->date = Request::fromRequest()->getStringParameter('date', 'yesterday');
+        $this->strDate = Request::fromRequest()->getStringParameter('date', 'yesterday');
         $this->currentSegmentDefinition = Request::fromRequest()->getStringParameter('segment', '');
         $this->checkSitePermission();
         Piwik::checkUserHasViewAccess($this->idSite);
@@ -65,12 +65,12 @@ public function manageSegments(): string
         foreach ($view->segmentList as $index => &$segment) {
             $segment['fixed'] = $segment['fixed'] ?? false;
             $segment['selected'] = $segment['definition'] === $this->currentSegmentDefinition;
-            $segment['dashboardUrl'] = '?module=CoreHome&action=index&idSite=' . $this->idSite . '&period=' . $this->period . '&date=' . $this->date . '&segment=' . urlencode($segment['definition']);
+            $segment['dashboardUrl'] = '?module=CoreHome&action=index&idSite=' . $this->idSite . '&period=' . $this->period . '&date=' . $this->strDate . '&segment=' . urlencode($segment['definition']);
             $segment['sparklineUrl'] = $this->getSegmentSparklineUrl($segment);
             $data = VisitsSummary\API::getInstance()
-                ->get($this->idSite, $this->period, $this->date, $segment['definition'])
+                ->get($this->idSite, $this->period, $this->strDate, $segment['definition'])
                 ->getFirstRow()->getArrayCopy();
-            list($previousDate, $ignore) = Range::getLastDate($this->date, $this->period);
+            list($previousDate, $ignore) = Range::getLastDate($this->strDate, $this->period);
             $data['past_nb_visits'] = VisitsSummary\API::getInstance()
                 ->getVisits($this->idSite, $this->period, $previousDate, $segment['definition'])
                 ->getFirstRow()->getColumn('nb_visits');

plugins/SegmentEditor/Menu.php

@@ -16,39 +16,32 @@
 
 namespace Piwik\Plugins\SegmentEditor;
 
+use Piwik\Container\StaticContainer;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Piwik;
-use Piwik\Plugins\CustomReports\Input\Validator;
 use Piwik\Request;
 
 class Menu extends \Piwik\Plugin\Menu
 {
-    /**
-     * @var Validator
-     */
-    private $validator;
-
-    public function __construct(Validator $validator)
-    {
-        $this->validator = $validator;
-
-        parent::__construct();
-    }
-
     public function configureAdminMenu(MenuAdmin $menu)
     {
         $idSite = Request::fromRequest()->getIntegerParameter('idSite', 0);
-        if ($this->validator->canWrite($idSite)) {
+        if (self::getAccessValidator()->canWrite($idSite)) {
             $menu->addMeasurableItem(
                 'CoreHome_Segments',
                 $this->urlForModuleAction('CoreHome', 'index', [
                     'category' => 'General_Visitors',
-                    'subcategory' => 'CoreHome_Segments'
+                    'subcategory' => 'CoreHome_Segments',
                 ]),
                 19,
                 Piwik::translate('SegmentEditor_ManageSegments'),
                 'icon-outlink'
             );
         }
     }
+
+    private static function getAccessValidator()
+    {
+        return StaticContainer::get('Piwik\Plugins\HeatmapSessionRecording\Input\Validator');
+    }
 }

plugins/SegmentEditor/SegmentSelectorControl.php

@@ -79,7 +79,7 @@ public function __construct()
             'module' => 'CoreHome',
             'action' => 'index',
             'category' => 'General_Visitors',
-            'subcategory' => 'CoreHome_Segments'
+            'subcategory' => 'CoreHome_Segments',
         ];
         $this->authorizedToCreateSegments = SegmentEditorAPI::getInstance()->isUserCanAddNewSegment($this->idSite);
         $this->isUserAnonymous = Piwik::isUserIsAnonymous();