Merge pull request #53 from CESNET/ecs

chore: fix ECS, fix PSR-12, add lock files

Author: melanger

.gitignore

@@ -1,4 +1,4 @@
 .idea
 vendor
 modules
-composer.lock
+node_modules

composer.json

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

composer.lock

@@ -6,7 +6,6 @@
  * This is an example configuration of SimpleSAMLphp Perun interface and additional features. Copy this file to default
  * config directory and edit the properties.
  */
-
 $config = [
     /*
      * Choose one of the following modes: PROXY, IDP, SP, MULTI_IDP
@@ -45,9 +44,9 @@
         'database.username' => 'stats',
         'database.password' => 'stats',
 
-    /**
-     * Configuration for SSL If you want to use SSL, fill these values and uncomment the block of code
-     */
+        /*
+         * Configuration for SSL If you want to use SSL, fill these values and uncomment the block of code
+         */
         //'database.driver_options' => [
         //    PDO::MYSQL_ATTR_SSL_KEY => '', // Path for the ssl key file
         //    PDO::MYSQL_ATTR_SSL_CERT => '', // Path for the ssl cert file
@@ -56,14 +55,14 @@
         //],
     ],
 
-    /**
+    /*
      * Which attribute should be used as user ID.
      *
      * @default uid
      */
     //'userIdAttribute' => 'uid',
 
-    /**
+    /*
      * Database table names. Default is to keep the name (as in `tables.sql`)
      */
     'tableNames' => [
@@ -73,13 +72,13 @@
         //'statistics_sp' => 'statistics_sp',
     ],
 
-/**
- * Authentication source name if authentication should be required. Defaults to empty string.
- */
+    /*
+     * Authentication source name if authentication should be required. Defaults to empty string.
+     */
     //'requireAuth.source' => 'default-sp',
 
-/**
- * For how many days should the detailed statistics be kept. Minimum is 31.
- */
+    /*
+     * For how many days should the detailed statistics be kept. Minimum is 31.
+     */
     //'keepPerUser' => 62,
 ];

config-templates/module_proxystatistics.php

@@ -3,31 +3,27 @@
 declare(strict_types=1);
 
 use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
+use PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer;
+use PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\EasyCodingStandard\ValueObject\Option;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(ArraySyntaxFixer::class)
-        ->call('configure', [[
-            'syntax' => 'short',
-        ]])
-    ;
-
     $parameters = $containerConfigurator->parameters();
     $parameters->set(Option::PATHS, [
         __DIR__ . '/ecs.php',
         __DIR__ . '/config-templates',
-        __DIR__ . '/dictionaries',
         __DIR__ . '/hooks',
         __DIR__ . '/lib',
         __DIR__ . '/scripts',
         __DIR__ . '/templates',
         __DIR__ . '/www',
-        __DIR__ . '/composer.json',
     ]);
+    $parameters->set(Option::PARALLEL, true);
+    $parameters->set(Option::SKIP, [NotOperatorWithSuccessorSpaceFixer::class, FunctionTypehintSpaceFixer::class]);
 
+    $containerConfigurator->import(SetList::PHP_CS_FIXER);
     $containerConfigurator->import(SetList::CLEAN_CODE);
     $containerConfigurator->import(SetList::SYMPLIFY);
     $containerConfigurator->import(SetList::ARRAY);
@@ -38,5 +34,14 @@
     $containerConfigurator->import(SetList::NAMESPACES);
     $containerConfigurator->import(SetList::PHPUNIT);
     $containerConfigurator->import(SetList::SPACES);
+    $containerConfigurator->import(SetList::STRICT);
+    $containerConfigurator->import(SetList::SYMFONY);
     $containerConfigurator->import(SetList::PSR_12);
+
+    $services = $containerConfigurator->services();
+    $services->set(ArraySyntaxFixer::class)
+        ->call('configure', [[
+            'syntax' => 'short',
+        ]])
+    ;
 };

ecs.php

@@ -8,12 +8,13 @@
 /**
  * Hook to run a cron job.
  *
- * @param array $croninfo  Output
+ * @param array $croninfo Output
  */
 function proxystatistics_hook_cron(&$croninfo)
 {
-    if ($croninfo['tag'] !== 'daily') {
+    if ('daily' !== $croninfo['tag']) {
         Logger::debug('cron [proxystatistics]: Skipping cron in cron tag [' . $croninfo['tag'] . '] ');
+
         return;
     }
 

hooks/hook_cron.php

@@ -36,7 +36,7 @@ class Config
 
     private $mode;
 
-    private static $instance = null;
+    private static $instance;
 
     private function __construct()
     {
@@ -52,9 +52,10 @@ private function __clone()
 
     public static function getInstance()
     {
-        if (self::$instance === null) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }
+
         return self::$instance;
     }
 
@@ -81,6 +82,7 @@ public function getIdAttribute()
     public function getSideInfo($side)
     {
         assert(in_array($side, [self::SIDES], true));
+
         return array_merge([
             'name' => '',
             'id' => '',