[Coding Style] Enable rule PSR2.Classes.PropertyDeclaration.Underscore (

#22140) * [Coding Style] Enable rule PSR2.Classes.PropertyDeclaration.Underscore * Apply CS * Fix tests
matomo-org · Apr 22, 2024 · 691dd60 · 691dd60
1 parent 9a3ef94
commit 691dd60
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 109 deletions.
diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
@@ -60,7 +60,7 @@ public static function getInstance()
 
     private $pluginHooks = array();
 
-    public static $_SKIP_EVENTS_IN_TESTS = false;
+    public static $_SKIP_EVENTS_IN_TESTS = false; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
 
     /**
      * Constructor.

diff --git a/core/Visualization/Sparkline.php b/core/Visualization/Sparkline.php
@@ -29,12 +29,12 @@ class Sparkline implements ViewInterface
      * Width of the sparkline
      * @var int
      */
-    protected $_width = self::DEFAULT_WIDTH;
+    protected $width = self::DEFAULT_WIDTH;
     /**
      * Height of sparkline
      * @var int
      */
-    protected $_height = self::DEFAULT_HEIGHT;
+    protected $height = self::DEFAULT_HEIGHT;
     private $serieses = [];
     /**
      * @var \Davaxi\Sparkline
@@ -120,7 +120,7 @@ public function main()
      */
     public function getWidth()
     {
-        return $this->_width;
+        return $this->width;
     }
 
     /**
@@ -133,9 +133,9 @@ public function setWidth($width)
             return;
         }
         if ($width > self::MAX_WIDTH) {
-            $this->_width = self::MAX_WIDTH;
+            $this->width = self::MAX_WIDTH;
         } else {
-            $this->_width = (int)$width;
+            $this->width = (int)$width;
         }
     }
 
@@ -145,7 +145,7 @@ public function setWidth($width)
      */
     public function getHeight()
     {
-        return $this->_height;
+        return $this->height;
     }
 
     /**
@@ -158,9 +158,9 @@ public function setHeight($height)
             return;
         }
         if ($height > self::MAX_HEIGHT) {
-            $this->_height = self::MAX_HEIGHT;
+            $this->height = self::MAX_HEIGHT;
         } else {
-            $this->_height = (int)$height;
+            $this->height = (int)$height;
         }
     }
 

diff --git a/phpcs.xml b/phpcs.xml
@@ -29,7 +29,6 @@
 
         <exclude name="Generic.Files.LineLength" />
         <exclude name="Generic.PHP.LowerCaseConstant.Found" />
-        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore" />
     </rule>
 
     <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">

diff --git a/plugins/API/API.php b/plugins/API/API.php
@@ -70,7 +70,7 @@ class API extends \Piwik\Plugin\API
      * For Testing purpose only
      * @var int
      */
-    public static $_autoSuggestLookBack = 60;
+    public static $_autoSuggestLookBack = 60; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
 
     public function __construct(SettingsProvider $settingsProvider, ProcessedReport $processedReport)
     {

diff --git a/plugins/ProfessionalServices/tests/Unit/PromoWidgetApplicableTest.php b/plugins/ProfessionalServices/tests/Unit/PromoWidgetApplicableTest.php
@@ -46,7 +46,7 @@ public function test_check_shouldOnlyReturnTrue_IfAdShouldBeShown(bool $adsForPr
         $this->assertEquals($expected, $sut->check('MyPlugin', 'Any'));
     }
 
-    protected function checkDataProvider(): \Generator
+    public function checkDataProvider(): \Generator
     {
         yield [true, true, true, true, false, false];
         yield [true, true, true, false, false, true];

diff --git a/tests/PHPUnit/Unit/Scheduler/Schedule/DailyTest.php b/tests/PHPUnit/Unit/Scheduler/Schedule/DailyTest.php
@@ -18,20 +18,20 @@
  */
 class DailyTest extends \PHPUnit\Framework\TestCase
 {
-    private static $_JANUARY_01_1971_09_00_00;
-    private static $_JANUARY_01_1971_09_10_00;
-    private static $_JANUARY_01_1971_12_10_00;
-    private static $_JANUARY_02_1971_00_00_00;
-    private static $_JANUARY_02_1971_09_00_00;
+    private static $JANUARY_01_1971_09_00_00;
+    private static $JANUARY_01_1971_09_10_00;
+    private static $JANUARY_01_1971_12_10_00;
+    private static $JANUARY_02_1971_00_00_00;
+    private static $JANUARY_02_1971_09_00_00;
 
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        self::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_12_10_00 = mktime(12, 10, 00, 1, 1, 1971);
-        self::$_JANUARY_02_1971_00_00_00 = mktime(0, 00, 00, 1, 2, 1971);
-        self::$_JANUARY_02_1971_09_00_00 = mktime(9, 00, 00, 1, 2, 1971);
+        self::$JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
+        self::$JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
+        self::$JANUARY_01_1971_12_10_00 = mktime(12, 10, 00, 1, 1, 1971);
+        self::$JANUARY_02_1971_00_00_00 = mktime(0, 00, 00, 1, 2, 1971);
+        self::$JANUARY_02_1971_09_00_00 = mktime(9, 00, 00, 1, 2, 1971);
     }
 
     /**
@@ -82,17 +82,17 @@ public function testGetRescheduledTimeDailyUnspecifiedHour()
          * Expected :
          *  getRescheduledTime returns Saturday January 2 1971 00:00:00 UTC
          */
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_09_10_00);
-        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
+        $mock = $this->getDailyMock(self::$JANUARY_01_1971_09_10_00);
+        $this->assertEquals(self::$JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
     }
 
     public function test_setTimezone_ShouldConvertRescheduledTime()
     {
         $oneHourInSeconds = 3600;
 
-        $mock    = $this->getDailyMock(self::$_JANUARY_01_1971_09_10_00);
+        $mock    = $this->getDailyMock(self::$JANUARY_01_1971_09_10_00);
         $timeUTC = $mock->getRescheduledTime();
-        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $timeUTC);
+        $this->assertEquals(self::$JANUARY_02_1971_00_00_00, $timeUTC);
 
         $mock->setTimezone('Pacific/Auckland');
         $timeAuckland = $mock->getRescheduledTime();
@@ -118,9 +118,9 @@ public function testGetRescheduledTimeDailySpecifiedHour()
          * Expected :
          *  getRescheduledTime returns Saturday January 2 1971 09:00:00 UTC
          */
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_09_00_00);
+        $mock = $this->getDailyMock(self::$JANUARY_01_1971_09_00_00);
         $mock->setHour(9);
-        $this->assertEquals(self::$_JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
+        $this->assertEquals(self::$JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
 
         /*
          * Test 2
@@ -133,9 +133,9 @@ public function testGetRescheduledTimeDailySpecifiedHour()
          *  getRescheduledTime returns Saturday January 2 1971 09:00:00 UTC
          */
 
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_12_10_00);
+        $mock = $this->getDailyMock(self::$JANUARY_01_1971_12_10_00);
         $mock->setHour(9);
-        $this->assertEquals(self::$_JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
+        $this->assertEquals(self::$JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
 
         /*
          * Test 3
@@ -147,9 +147,9 @@ public function testGetRescheduledTimeDailySpecifiedHour()
          * Expected :
          *  getRescheduledTime returns Saturday January 2 1971 00:00:00 UTC
          */
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_12_10_00);
+        $mock = $this->getDailyMock(self::$JANUARY_01_1971_12_10_00);
         $mock->setHour(0);
-        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
+        $this->assertEquals(self::$JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
     }
 
     /**

diff --git a/tests/PHPUnit/Unit/Scheduler/Schedule/HourlyTest.php b/tests/PHPUnit/Unit/Scheduler/Schedule/HourlyTest.php
@@ -17,16 +17,16 @@
  */
 class HourlyTest extends \PHPUnit\Framework\TestCase
 {
-    private static $_JANUARY_01_1971_09_00_00;
-    private static $_JANUARY_01_1971_09_10_00;
-    private static $_JANUARY_01_1971_10_00_00;
+    private static $JANUARY_01_1971_09_00_00;
+    private static $JANUARY_01_1971_09_10_00;
+    private static $JANUARY_01_1971_10_00_00;
 
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        self::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_10_00_00 = mktime(10, 00, 00, 1, 1, 1971);
+        self::$JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
+        self::$JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
+        self::$JANUARY_01_1971_10_00_00 = mktime(10, 00, 00, 1, 1, 1971);
     }
 
     /**
@@ -71,8 +71,8 @@ public function testGetRescheduledTimeHourly()
         $mock = $this->createPartialMock('Piwik\Scheduler\Schedule\Hourly', array('getTime'));
         $mock->expects($this->any())
             ->method('getTime')
-            ->will($this->returnValue(self::$_JANUARY_01_1971_09_00_00));
-        $this->assertEquals(self::$_JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
+            ->will($this->returnValue(self::$JANUARY_01_1971_09_00_00));
+        $this->assertEquals(self::$JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
 
         /*
          * Test 2
@@ -86,7 +86,7 @@ public function testGetRescheduledTimeHourly()
         $mock = $this->createPartialMock('Piwik\Scheduler\Schedule\Hourly', array('getTime'));
         $mock->expects($this->any())
             ->method('getTime')
-            ->will($this->returnValue(self::$_JANUARY_01_1971_09_10_00));
-        $this->assertEquals(self::$_JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
+            ->will($this->returnValue(self::$JANUARY_01_1971_09_10_00));
+        $this->assertEquals(self::$JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
     }
 }