[Coding Style] Enable rule PSR12.Classes.ClassInstantiation.MissingParentheses (matomo-org#21681)

michalkleiner · sgiehl · web-flow · commit e30646531986 · 2023-12-13T15:53:43.000+01:00
* Enable rule PSR12.Classes.ClassInstantiation.MissingParentheses

* Apply CS

---------

Co-authored-by: Stefan Giehl &lt;stefan@matomo.org&gt;
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
@@ -706,7 +706,7 @@ protected function getAggregatedNumericMetrics($columns, $operationsToApply)
 
         $rowMetrics = $results->getFirstRow();
         if ($rowMetrics === false) {
-            $rowMetrics = new Row;
+            $rowMetrics = new Row();
         }
         $this->enrichWithUniqueVisitorsMetric($rowMetrics);
         $this->renameColumnsAfterAggregation($results, self::$columnsToRenameAfterAggregation);
diff --git a/core/BaseFactory.php b/core/BaseFactory.php
@@ -38,7 +38,7 @@ public static function factory($classId)
             throw new Exception(static::getInvalidClassIdExceptionMessage($classId));
         }
 
-        return new $className;
+        return new $className();
     }
 
     private static function sendPlainHeader()
diff --git a/core/Columns/MetricsList.php b/core/Columns/MetricsList.php
@@ -109,7 +109,7 @@ public static function get()
             return $cache->fetch($cacheKey);
         }
 
-        $list = new static;
+        $list = new static();
 
         /**
          * Triggered to add new metrics that cannot be picked up automatically by the platform.
diff --git a/core/Console.php b/core/Console.php
@@ -166,7 +166,7 @@ private function addCommandIfExists($command)
             Log::warning(sprintf('Cannot add command %s, class does not extend Piwik\Plugin\ConsoleCommand', $command));
         } else {
             /** @var Command $commandInstance */
-            $commandInstance = new $command;
+            $commandInstance = new $command();
 
             // do not add the command if it already exists; this way we can add the command ourselves in tests
             if (!$this->has($commandInstance->getName())) {
diff --git a/core/CronArchive.php b/core/CronArchive.php
@@ -344,7 +344,7 @@ public function run()
     {
         $pid = Common::getProcessId();
 
-        $timer = new Timer;
+        $timer = new Timer();
 
         $this->logSection("START");
         $this->logger->info("Starting Matomo reports archiving...");
diff --git a/core/DataTable.php b/core/DataTable.php
@@ -747,7 +747,7 @@ public function getRowIdFromLabel($label)
      */
     public function getEmptyClone($keepFilters = true)
     {
-        $clone = new DataTable;
+        $clone = new DataTable();
         if ($keepFilters) {
             $clone->queuedFilters = $this->queuedFilters;
         }
@@ -2040,7 +2040,7 @@ protected function aggregateRowFromSimpleTable($row)
         }
         $thisRow = $this->getFirstRow();
         if ($thisRow === false) {
-            $thisRow = new Row;
+            $thisRow = new Row();
             $this->addRow($thisRow);
         }
         $thisRow->sumRow($row, $copyMeta = true, $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME));
diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php
@@ -518,7 +518,7 @@ public function mergeSubtables()
      */
     public function getEmptyClone()
     {
-        $dataTableMap = new Map;
+        $dataTableMap = new Map();
         $dataTableMap->setKeyName($this->getKeyName());
         return $dataTableMap;
     }
diff --git a/core/Option.php b/core/Option.php
@@ -141,7 +141,7 @@ public static function clearCache()
     private static function getInstance()
     {
         if (self::$instance == null) {
-            self::$instance = new self;
+            self::$instance = new self();
         }
 
         return self::$instance;
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
@@ -1263,7 +1263,7 @@ protected function makePluginClass($pluginName)
         if (!class_exists($namespacedClass, false)) {
             throw new \Exception("The class $pluginClassName couldn't be found in the file '$path'");
         }
-        $newPlugin = new $namespacedClass;
+        $newPlugin = new $namespacedClass();
 
         if (!($newPlugin instanceof Plugin)) {
             throw new \Exception("The plugin $pluginClassName in the file $path must inherit from Plugin.");
diff --git a/core/Plugin/ReportsProvider.php b/core/Plugin/ReportsProvider.php
@@ -42,7 +42,7 @@ public static function factory($module, $action)
 
         $klassName = $listApiToReport[$api];
 
-        return new $klassName;
+        return new $klassName();
     }
 
     private static function getMapOfModuleActionsToReport()
diff --git a/core/Segment/SegmentsList.php b/core/Segment/SegmentsList.php
@@ -107,7 +107,7 @@ public static function get()
             return $cache->fetch($cacheKey);
         }
 
-        $list = new static;
+        $list = new static();
 
         /**
          * Triggered to add custom segment definitions.
diff --git a/core/Singleton.php b/core/Singleton.php
@@ -39,7 +39,7 @@ public static function getInstance()
         $class = get_called_class();
 
         if (!isset(self::$instances[$class])) {
-            self::$instances[$class] = new $class;
+            self::$instances[$class] = new $class();
         }
         return self::$instances[$class];
     }
diff --git a/core/Tracker/Db.php b/core/Tracker/Db.php
@@ -71,7 +71,7 @@ public static function isProfilingEnabled()
      */
     protected function initProfiler()
     {
-        return new Timer;
+        return new Timer();
     }
 
     /**
diff --git a/core/View.php b/core/View.php
@@ -337,7 +337,7 @@ protected function renderTwigTemplate()
             $output = $this->applyFilterCacheBuster($output);
         }
 
-        $helper = new Theme;
+        $helper = new Theme();
         $output = $helper->rewriteAssetsPathToTheme($output);
         return $output;
     }
diff --git a/core/Widget/WidgetsList.php b/core/Widget/WidgetsList.php
@@ -172,7 +172,7 @@ public function isDefined($module, $action)
      */
     public static function get()
     {
-        $list = new static;
+        $list = new static();
 
         $widgets = StaticContainer::get('Piwik\Plugin\WidgetsProvider');
 
diff --git a/phpcs.xml b/phpcs.xml
@@ -35,7 +35,6 @@
         <exclude name="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma" />
         <exclude name="Generic.PHP.LowerCaseConstant.Found" />
         <exclude name="Generic.PHP.LowerCaseKeyword.Found" />
-        <exclude name="PSR12.Classes.ClassInstantiation.MissingParentheses" />
         <exclude name="PSR12.Classes.OpeningBraceSpace.Found" />
         <exclude name="PSR12.ControlStructures.BooleanOperatorPlacement.FoundMixed" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisIndent" />
@@ -150,4 +149,4 @@
         <!-- still allow those functions in tests -->
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
-</ruleset>
+</ruleset>
diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php
@@ -67,7 +67,7 @@ public function getFollowingPages($url, $idSite, $period, $date, $segment = fals
         $url = PageUrl::excludeQueryParametersFromUrl($url, $idSite);
         // we don't unsanitize $url here. it will be done in the Transitions plugin.
 
-        $resultDataTable = new DataTable;
+        $resultDataTable = new DataTable();
 
         try {
             $limitBeforeGrouping = Config::getInstance()->General['overlay_following_pages_limit'];
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
@@ -479,7 +479,7 @@ protected function queryInternalReferrers($idaction, $actionType, $logAggregator
 
         $loops = 0;
         $nbPageviews = 0;
-        $previousPagesDataTable = new DataTable;
+        $previousPagesDataTable = new DataTable();
         if (isset($data['result'][$keyIsPageUrlAction])) {
             foreach ($data['result'][$keyIsPageUrlAction] as &$page) {
                 $nbActions = intval($page[Metrics::INDEX_NB_ACTIONS]);
@@ -493,7 +493,7 @@ protected function queryInternalReferrers($idaction, $actionType, $logAggregator
             }
         }
 
-        $previousSearchesDataTable = new DataTable;
+        $previousSearchesDataTable = new DataTable();
         if (isset($data['result'][$keyIsSiteSearchAction])) {
             foreach ($data['result'][$keyIsSiteSearchAction] as &$search) {
                 $nbActions = intval($search[Metrics::INDEX_NB_ACTIONS]);
@@ -646,7 +646,7 @@ protected function makeDataTablesFollowingActions($types, $data)
         $this->totalTransitionsToFollowingPages = 0;
         $dataTables = array();
         foreach ($types as $type => $recordName) {
-            $dataTable = new DataTable;
+            $dataTable = new DataTable();
             if (isset($data[$type])) {
                 foreach ($data[$type] as &$record) {
                     $actions = intval($record[Metrics::INDEX_NB_ACTIONS]);
diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php
@@ -193,7 +193,7 @@ protected function generateApiUrlPermutations($parametersToSet)
         $originalDate = $parametersToSet['date'];
 
         $requestUrls = array();
-        $apiMetadata = new DocumentationGenerator;
+        $apiMetadata = new DocumentationGenerator();
 
         // Get the URLs to query against the API for all functions starting with get*
         foreach ($this->getAllApiMethods() as $apiMethodInfo) {
diff --git a/tests/PHPUnit/Integration/Tracker/Visit/ReferrerSpamFilterTest.php b/tests/PHPUnit/Integration/Tracker/Visit/ReferrerSpamFilterTest.php
@@ -30,7 +30,7 @@ public function setUp(): void
         parent::setUp();
 
         Cache::flushAll();
-        $this->filter = new ReferrerSpamFilter;
+        $this->filter = new ReferrerSpamFilter();
     }
 
     public function tearDown(): void
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
@@ -39,7 +39,7 @@ public function testAddSummaryRow()
      */
     protected function getDataTableCount5()
     {
-        $table = new DataTable;
+        $table = new DataTable();
         $table->addRow($this->getRow0());
         $table->addRow($this->getRow1());
         $table->addRow($this->getRow2());
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
@@ -19,7 +19,7 @@ class ExcludeLowPopulationTest extends \PHPUnit\Framework\TestCase
 {
     protected function getTestDataTable()
     {
-        $table = new DataTable;
+        $table = new DataTable();
         $table->addRowsFromArray(
             array(
                  array(Row::COLUMNS => array('label' => 'zero', 'count' => 0)),
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
@@ -24,7 +24,7 @@ class LimitTest extends \PHPUnit\Framework\TestCase
      */
     protected function getDataTableCount10()
     {
-        $table = new DataTable;
+        $table = new DataTable();
         $idcol = Row::COLUMNS;
         $rows = array(
             array($idcol => array('label' => 'google', 'idRow' => 0)),
@@ -186,7 +186,7 @@ public function testLimitIsZeroShouldReturnEmptyTable()
      */
     public function testFilterOffsetLimit()
     {
-        $table = new DataTable;
+        $table = new DataTable();
 
         $idcol = Row::COLUMNS;
 
@@ -218,7 +218,7 @@ public function testFilterOffsetLimit()
      */
     public function testFilterOffsetLimitOffbound()
     {
-        $table = new DataTable;
+        $table = new DataTable();
 
         $idcol = Row::COLUMNS;
 
@@ -250,7 +250,7 @@ public function testFilterOffsetLimitOffbound()
      */
     public function testFilterOffsetLimit2()
     {
-        $table = new DataTable;
+        $table = new DataTable();
 
         $idcol = Row::COLUMNS;
 
@@ -281,7 +281,7 @@ public function testFilterOffsetLimit2()
      */
     public function testFilterOffsetLimit3()
     {
-        $table = new DataTable;
+        $table = new DataTable();
 
         $idcol = Row::COLUMNS;
 
@@ -297,7 +297,7 @@ public function testFilterOffsetLimit3()
 
         $table->addRowsFromArray($rows);
 
-        $expectedtable = new DataTable;
+        $expectedtable = new DataTable();
 
         $filter = new Limit($table, 8, 15);
         $filter->filter($table);
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
@@ -35,7 +35,7 @@ protected function getTable()
                                             array(Row::COLUMNS => array('label' => 'index.html')),
                                        ));
 
-        $table = new DataTable;
+        $table = new DataTable();
         $rows = array(
             array(Row::COLUMNS              => array('label' => 'http://www.ask.com'),
                   Row::DATATABLE_ASSOCIATED => $subtableAsk),
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
@@ -40,7 +40,7 @@ public function getTestData()
      */
     public function testFilterPattern($pattern, $expectedRows)
     {
-        $table = new DataTable;
+        $table = new DataTable();
 
         $idcol = Row::COLUMNS;
 
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
@@ -121,7 +121,7 @@ public function testSumTablesWithSummaryRowShouldSumTheSummaryRow()
         $filter->filter($table2);
 
         // we expect row0+row0, row1+row1, row2, rowSummary1+rowSummary2
-        $expectedTable = new DataTable;
+        $expectedTable = new DataTable();
         $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'amazon', 'nb' => 20000))));
         $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'yahoo', 'nb' => 2000))));
         $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'piwik', 'nb' => 100))));
@@ -143,7 +143,7 @@ public function testAddOneTableWithSummaryRow()
         $table2 = $this->getDataTableCount5();
 
         // we expect row0+row0, row1+row1, row2+row2, row3, row4, rowSummary1
-        $expectedTable = new DataTable;
+        $expectedTable = new DataTable();
         $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'amazon', 'nb' => 20000))));
         $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'yahoo', 'nb' => 2000))));
         $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'piwik', 'nb' => 200))));
@@ -159,7 +159,7 @@ public function testAddOneTableWithSummaryRow()
 
     public function testWhenRowsInRandomOrderButSortSpecifiedShouldComputeSummaryRowAfterSort()
     {
-        $table = new DataTable;
+        $table = new DataTable();
         $table->addRow($this->getRow3());
         $table->addRow($this->getRow2());
         $table->addRow($this->getRow4());
@@ -180,7 +180,7 @@ public function testWhenRowsInRandomOrderButSortSpecifiedShouldComputeSummaryRow
      */
     protected function getDataTableCount5()
     {
-        $table = new DataTable;
+        $table = new DataTable();
         $table->addRow($this->getRow0());
         $table->addRow($this->getRow1());
         $table->addRow($this->getRow2());
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
diff --git a/tests/PHPUnit/Unit/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ protected function getAggregatedNumericMetrics($columns, $operationsToApply)`
`706`	`706`
`707`	`707`	`$rowMetrics = $results->getFirstRow();`
`708`	`708`	`if ($rowMetrics === false) {`
`709`		`- $rowMetrics = new Row;`
	`709`	`+ $rowMetrics = new Row();`
`710`	`710`	`}`
`711`	`711`	`$this->enrichWithUniqueVisitorsMetric($rowMetrics);`
`712`	`712`	`$this->renameColumnsAfterAggregation($results, self::$columnsToRenameAfterAggregation);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static function factory($classId)`
`38`	`38`	`throw new Exception(static::getInvalidClassIdExceptionMessage($classId));`
`39`	`39`	`}`
`40`	`40`
`41`		`- return new $className;`
	`41`	`+ return new $className();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`private static function sendPlainHeader()`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public static function get()`
`109`	`109`	`return $cache->fetch($cacheKey);`
`110`	`110`	`}`
`111`	`111`
`112`		`- $list = new static;`
	`112`	`+ $list = new static();`
`113`	`113`
`114`	`114`	`/**`
`115`	`115`	`* Triggered to add new metrics that cannot be picked up automatically by the platform.`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ public function run()`
`344`	`344`	`{`
`345`	`345`	`$pid = Common::getProcessId();`
`346`	`346`
`347`		`- $timer = new Timer;`
	`347`	`+ $timer = new Timer();`
`348`	`348`
`349`	`349`	`$this->logSection("START");`
`350`	`350`	`$this->logger->info("Starting Matomo reports archiving...");`
Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ public function getRowIdFromLabel($label)`
`747`	`747`	`*/`
`748`	`748`	`public function getEmptyClone($keepFilters = true)`
`749`	`749`	`{`
`750`		`- $clone = new DataTable;`
	`750`	`+ $clone = new DataTable();`
`751`	`751`	`if ($keepFilters) {`
`752`	`752`	`$clone->queuedFilters = $this->queuedFilters;`
`753`	`753`	`}`
`@@ -2040,7 +2040,7 @@ protected function aggregateRowFromSimpleTable($row)`
`2040`	`2040`	`}`
`2041`	`2041`	`$thisRow = $this->getFirstRow();`
`2042`	`2042`	`if ($thisRow === false) {`
`2043`		`- $thisRow = new Row;`
	`2043`	`+ $thisRow = new Row();`
`2044`	`2044`	`$this->addRow($thisRow);`
`2045`	`2045`	`}`
`2046`	`2046`	`$thisRow->sumRow($row, $copyMeta = true, $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME));`
Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ public function mergeSubtables()`
`518`	`518`	`*/`
`519`	`519`	`public function getEmptyClone()`
`520`	`520`	`{`
`521`		`- $dataTableMap = new Map;`
	`521`	`+ $dataTableMap = new Map();`
`522`	`522`	`$dataTableMap->setKeyName($this->getKeyName());`
`523`	`523`	`return $dataTableMap;`
`524`	`524`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public static function clearCache()`
`141`	`141`	`private static function getInstance()`
`142`	`142`	`{`
`143`	`143`	`if (self::$instance == null) {`
`144`		`- self::$instance = new self;`
	`144`	`+ self::$instance = new self();`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`return self::$instance;`
Original file line number	Diff line number	Diff line change
`@@ -1263,7 +1263,7 @@ protected function makePluginClass($pluginName)`
`1263`	`1263`	`if (!class_exists($namespacedClass, false)) {`
`1264`	`1264`	`throw new \Exception("The class $pluginClassName couldn't be found in the file '$path'");`
`1265`	`1265`	`}`
`1266`		`- $newPlugin = new $namespacedClass;`
	`1266`	`+ $newPlugin = new $namespacedClass();`
`1267`	`1267`
`1268`	`1268`	`if (!($newPlugin instanceof Plugin)) {`
`1269`	`1269`	`throw new \Exception("The plugin $pluginClassName in the file $path must inherit from Plugin.");`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static function factory($module, $action)`
`42`	`42`
`43`	`43`	`$klassName = $listApiToReport[$api];`
`44`	`44`
`45`		`- return new $klassName;`
	`45`	`+ return new $klassName();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`private static function getMapOfModuleActionsToReport()`