Merge pull request #77 from CESNET/renovate/symplify-easy-coding-standard-11.x

chore(deps): update dependency symplify/easy-coding-standard to v11

composer.json

@@ -37,6 +37,6 @@
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "*",
-    "symplify/easy-coding-standard": "^10.0"
+    "symplify/easy-coding-standard": "^11.0"
   }
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bef79151cb81a54212518f52b3354fbe",
+    "content-hash": "c6cf0239d2544ae5fb18d3e67487d9e8",
     "packages": [
         {
             "name": "gettext/gettext",
@@ -5004,16 +5004,16 @@
         },
         {
             "name": "symplify/easy-coding-standard",
-            "version": "10.3.3",
+            "version": "11.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symplify/easy-coding-standard.git",
-                "reference": "c93878b3c052321231519b6540e227380f90be17"
+                "reference": "ee347cd02e2aea9f706fc3f67ea0fc19cc0ca606"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symplify/easy-coding-standard/zipball/c93878b3c052321231519b6540e227380f90be17",
-                "reference": "c93878b3c052321231519b6540e227380f90be17",
+                "url": "https://api.github.com/repos/symplify/easy-coding-standard/zipball/ee347cd02e2aea9f706fc3f67ea0fc19cc0ca606",
+                "reference": "ee347cd02e2aea9f706fc3f67ea0fc19cc0ca606",
                 "shasum": ""
             },
             "require": {
@@ -5043,7 +5043,7 @@
             ],
             "description": "Prefixed scoped version of ECS package",
             "support": {
-                "source": "https://github.com/symplify/easy-coding-standard/tree/10.3.3"
+                "source": "https://github.com/symplify/easy-coding-standard/tree/11.0.8"
             },
             "funding": [
                 {
@@ -5055,7 +5055,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-06-13T14:03:37+00:00"
+            "time": "2022-07-05T11:49:37+00:00"
         }
     ],
     "aliases": [],

ecs.php

@@ -6,12 +6,10 @@ use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
 use PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer;
 use PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Option;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 return static function (ECSConfig $ecsConfig): void {
-    $parameters = $ecsConfig->parameters();
-    $parameters->set(Option::PATHS, [
+    $ecsConfig->paths([
         __DIR__ . '/ecs.php',
         __DIR__ . '/config-templates',
         __DIR__ . '/hooks',
@@ -20,12 +18,13 @@ return static function (ECSConfig $ecsConfig): void {
         __DIR__ . '/templates',
         __DIR__ . '/www',
     ]);
-    $parameters->set(Option::PARALLEL, true);
-    $parameters->set(Option::SKIP, [NotOperatorWithSuccessorSpaceFixer::class, FunctionTypehintSpaceFixer::class]);
+
+    $ecsConfig->parallel();
+
+    $ecsConfig->skip([NotOperatorWithSuccessorSpaceFixer::class, FunctionTypehintSpaceFixer::class]);
 
     $ecsConfig->sets(
         [
-            SetList::PHP_CS_FIXER,
             SetList::CLEAN_CODE,
             SetList::SYMPLIFY,
             SetList::ARRAY,
@@ -37,7 +36,6 @@ return static function (ECSConfig $ecsConfig): void {
             SetList::PHPUNIT,
             SetList::SPACES,
             SetList::STRICT,
-            SetList::SYMFONY,
             SetList::PSR_12,
         ]
     );

hooks/hook_cron.php

@@ -12,7 +12,7 @@ use SimpleSAML\Module\proxystatistics\DatabaseCommand;
  */
 function proxystatistics_hook_cron(&$croninfo)
 {
-    if ('daily' !== $croninfo['tag']) {
+    if ($croninfo['tag'] !== 'daily') {
         Logger::debug('cron [proxystatistics]: Skipping cron in cron tag [' . $croninfo['tag'] . '] ');
 
         return;

lib/Config.php

@@ -70,7 +70,7 @@ class Config
 
     public static function getInstance(): self
     {
-        if (null === self::$instance) {
+        if (self::$instance === null) {
             self::$instance = new self();
         }
 
@@ -116,7 +116,7 @@ class Config
 
     public function getRequiredAuthSource()
     {
-        return$this->requiredAuthSource;
+        return $this->requiredAuthSource;
     }
 
     public function getKeepPerUser()

lib/DatabaseCommand.php

@@ -13,6 +13,7 @@ use SimpleSAML\Logger;
 class DatabaseCommand
 {
     public const TABLE_SUM = 'statistics_sums';
+
     private const DEBUG_PREFIX = 'proxystatistics:DatabaseCommand - ';
 
     private const TABLE_PER_USER = 'statistics_per_user';
@@ -87,7 +88,7 @@ class DatabaseCommand
             $ids[$tableId] = $this->getEntityDbIdFromEntityIdentifier($table, $entities[$side], $tableId);
         }
 
-        if (false === $this->writeLogin($date, $ids, $userId)) {
+        if ($this->writeLogin($date, $ids, $userId) === false) {
             Logger::error(self::DEBUG_PREFIX . 'login record has not been inserted (data \'' . json_encode([
                 'user' => $userId,
                 'ids' => $ids,
@@ -171,7 +172,7 @@ class DatabaseCommand
                         'day'
                     ) . '), EXTRACT(DAY FROM ' . $this->escape_col('day') . '), ';
                 foreach ($ids as $id) {
-                    $query .= (null === $id ? '0' : $id) . ',';
+                    $query .= ($id === null ? '0' : $id) . ',';
                 }
                 $query .= 'SUM(logins), COUNT(DISTINCT ' . $this->escape_col('user') . ') '
                     . 'FROM ' . $this->tables[self::TABLE_PER_USER] . ' '
@@ -221,7 +222,7 @@ class DatabaseCommand
         $written = $this->conn->write($query, $params);
         if (is_bool($written) && !$written) {
             Logger::warning(self::DEBUG_PREFIX . $msg . ' failed');
-        } elseif (0 === $written) {
+        } elseif ($written === 0) {
             Logger::warning(self::DEBUG_PREFIX . $msg . ' completed, but updated 0 rows.');
         } else {
             Logger::info(self::DEBUG_PREFIX . $msg . ' completed and updated ' . $written . ' rows.');
@@ -272,7 +273,7 @@ class DatabaseCommand
 
             return false;
         }
-        if (0 === $written) {
+        if ($written === 0) {
             Logger::debug(self::DEBUG_PREFIX . 'login entry has been inserted, but has updated 0 rows.');
 
             return false;
@@ -287,23 +288,23 @@ class DatabaseCommand
             Config::MODE_IDP => [],
             Config::MODE_SP => [],
         ];
-        if (Config::MODE_IDP !== $this->mode && Config::MODE_MULTI_IDP !== $this->mode) {
+        if ($this->mode !== Config::MODE_IDP && $this->mode !== Config::MODE_MULTI_IDP) {
             $entities[Config::MODE_IDP][self::KEY_ID] = $this->getIdpIdentifier($request);
             $entities[Config::MODE_IDP][self::KEY_NAME] = $this->getIdpName($request);
         }
-        if (Config::MODE_SP !== $this->mode) {
+        if ($this->mode !== Config::MODE_SP) {
             $entities[Config::MODE_SP][self::KEY_ID] = $this->getSpIdentifier($request);
             $entities[Config::MODE_SP][self::KEY_NAME] = $this->getSpName($request);
         }
 
-        if (Config::MODE_PROXY !== $this->mode && Config::MODE_MULTI_IDP !== $this->mode) {
+        if ($this->mode !== Config::MODE_PROXY && $this->mode !== Config::MODE_MULTI_IDP) {
             $entities[$this->mode] = $this->config->getSideInfo($this->mode);
             if (empty($entities[$this->mode][self::KEY_ID]) || empty($entities[$this->mode][self::KEY_NAME])) {
                 Logger::error(self::DEBUG_PREFIX . 'Invalid configuration (id, name) for ' . $this->mode);
             }
         }
 
-        if (Config::MODE_MULTI_IDP === $this->mode) {
+        if ($this->mode === Config::MODE_MULTI_IDP) {
             $entities[Config::MODE_IDP] = $this->config->getSideInfo(Config::MODE_IDP);
             if (empty($entities[Config::MODE_IDP][self::KEY_ID]) || empty($entities[Config::MODE_IDP][self::KEY_NAME])) {
                 Logger::error(self::DEBUG_PREFIX . 'Invalid configuration (id, name) for ' . $this->mode);
@@ -346,7 +347,7 @@ class DatabaseCommand
             $table = self::TABLE_SIDES[$side];
             $column = self::TABLE_IDS[$table];
             $part = $column;
-            if (null === $value) {
+            if ($value === null) {
                 $part .= '=0';
             } else {
                 $part .= '=:id';
@@ -363,8 +364,8 @@ class DatabaseCommand
 
     private function addDaysRange($days, &$query, &$params, $not = false)
     {
-        if (0 !== $days) {    // 0 = all time
-            if (false === stripos($query, 'WHERE')) {
+        if ($days !== 0) {    // 0 = all time
+            if (stripos($query, 'WHERE') === false) {
                 $query .= 'WHERE';
             } else {
                 $query .= 'AND';
@@ -408,7 +409,7 @@ class DatabaseCommand
     {
         $columns = ['day'];
         foreach ($ids as $id) {
-            if (null !== $id) {
+            if ($id !== null) {
                 $columns[] = $id;
             }
         }
@@ -460,12 +461,12 @@ class DatabaseCommand
 
     private function isPgsql(): bool
     {
-        return 'pgsql' === $this->conn->getDriver();
+        return $this->conn->getDriver() === 'pgsql';
     }
 
     private function isMysql(): bool
     {
-        return 'mysql' === $this->conn->getDriver();
+        return $this->conn->getDriver() === 'mysql';
     }
 
     private function unknownDriver()

lib/Templates.php

@@ -141,13 +141,13 @@ class Templates
             'SP' => 'id="tab-3" href="' . self::getFullUrl('serviceProviders.php') . '?lastDays=' . $lastDays . '"',
         ];
         $mode = $config->getMode();
-        if (Config::MODE_PROXY !== $mode) {
+        if ($mode !== Config::MODE_PROXY) {
             $t->data['tabsAttributes'][$mode] = 'class="hidden" ' . $t->data['tabsAttributes'][$mode];
         }
 
         $t->data['header'] = $t->t('{proxystatistics:stats:statistics_header}');
         $instanceName = Configuration::getInstance()->getString(self::INSTANCE_NAME, null);
-        if (null !== $instanceName) {
+        if ($instanceName !== null) {
             $t->data['header'] = $instanceName . ' ' . $t->data['header'];
         } else {
             Logger::warning(
@@ -192,7 +192,7 @@ class Templates
                 '!side_on' => $t->t('{proxystatistics:stats:chart_legend_side_on_' . $side . '}'),
             ]
         );
-        if (Config::MODE_SP === $side && Config::MODE_SP !== $mode) {
+        if ($side === Config::MODE_SP && $mode !== Config::MODE_SP) {
             echo ' ';
             echo $t->t(
                 '{proxystatistics:stats:first_access_only}',
@@ -211,7 +211,7 @@ class Templates
         $mode = Config::getInstance()->getMode();
         $t->data['mode'] = $mode;
         $t->data['summaryGraphs'] = [];
-        if (Config::MODE_PROXY === $mode || Config::MODE_MULTI_IDP === $mode) {
+        if ($mode === Config::MODE_PROXY || $mode === Config::MODE_MULTI_IDP) {
             foreach (Config::SIDES as $side) {
                 $t->data['summaryGraphs'][$side] = [];
                 $t->data['summaryGraphs'][$side]['Providers'] = 'col-md-6 graph';

scripts/migrate_2.0.php

@@ -37,7 +37,7 @@ $file = fopen($identityProvidersFileName, 'r');
 
 while (!feof($file)) {
     $line = fgetcsv($file);
-    if (null !== $line) {
+    if ($line !== null) {
         $lineInsert = 'INSERT INTO ' . $tableName . '(year, month, day, sourceIdp, service, count) ' .
             'VALUES(' . $line[0] . ', ' . $line[1] . ', ' . $line[2] . ', "' . $line[3] . '","" , ' . $line[4] . ');' .
             PHP_EOL;
@@ -52,7 +52,7 @@ $file = fopen($serviceProvidersFileName, 'r');
 
 while (!feof($file)) {
     $line = fgetcsv($file);
-    if (null !== $line) {
+    if ($line !== null) {
         $lineInsert = 'INSERT INTO ' . $tableName . '(year, month, day, sourceIdp, service, count) ' .
             'VALUES(' . $line[0] . ', ' . $line[1] . ', ' . $line[2] . ', "", "' . $line[3] . '", ' . $line[4] . ');' .
             PHP_EOL;