fix: update ECS, update configuration and fix the code

Author: vyskocilpavel

composer.json

@@ -22,6 +22,6 @@
         "ext-curl": "*"
     },
     "require-dev": {
-        "symplify/easy-coding-standard": "^9.2"
+        "symplify/easy-coding-standard": "^10.0"
     }
 }

config-templates/module_cesnet_IsCesnetEligible.php

@@ -9,12 +9,12 @@
  * copy command (from SimpleSAML base dir) cp modules/perun/module_cesnet_IsCesnetEligible.php config/
  */
 $config = [
-    /**
+    /*
      * hostname of CESNET ldap with ldap(s):// at the beginning.
      */
     'ldap.hostname' => '',
 
-    /**
+    /*
      * ldap credentials if ldap search is protected. If it is null or not set at all. No user is used for bind.
      */
     'ldap.username' => '',

ecs.php

@@ -8,13 +8,6 @@
 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',
@@ -25,7 +18,9 @@
         __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);
@@ -36,5 +31,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',
+        ]])
+    ;
 };

lib/Auth/Process/ComputeLoA.php

@@ -8,7 +8,7 @@
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 
 /**
- * Class ComputeLoA
+ * Class ComputeLoA.
  *
  * Filter compute the LoA and save it to attribute defined by 'attrName' config property.
  */
@@ -32,7 +32,7 @@ class ComputeLoA extends \SimpleSAML\Auth\ProcessingFilter
 
     private $metadata;
 
-    private $entityCategory = null;
+    private $entityCategory;
 
     private $eduPersonScopedAffiliation = [];
 
@@ -75,7 +75,7 @@ public function process(&$request)
         }
 
         foreach ($entityCategoryAttributes as $entityCategoryAttribute) {
-            if (substr($entityCategoryAttribute, 0, strlen(self::EDUID_IDP_GROUP)) === self::EDUID_IDP_GROUP) {
+            if (self::EDUID_IDP_GROUP === substr($entityCategoryAttribute, 0, strlen(self::EDUID_IDP_GROUP))) {
                 $this->entityCategory = substr(
                     $entityCategoryAttribute,
                     strlen(self::EDUID_IDP_GROUP),
@@ -91,15 +91,16 @@ public function process(&$request)
     }
 
     /**
-     * Get LoA by CESNET filter
+     * Get LoA by CESNET filter.
      *
      * @return int 2 if combination of IdP attributes and User attributes corresponds to the filter, 0 if not
      */
     private function getLoA()
     {
-        if ($this->entityCategory === null || empty($this->entityCategory)) {
+        if (null === $this->entityCategory || empty($this->entityCategory)) {
             return 0;
-        } elseif ($this->entityCategory === self::UNIVERSITY) {
+        }
+        if (self::UNIVERSITY === $this->entityCategory) {
             foreach ($this->eduPersonScopedAffiliation as $affiliation) {
                 if (preg_match(
                     '/(^employee@.+\.cz$)|' .
@@ -114,31 +115,32 @@ private function getLoA()
                     return 2;
                 }
             }
-        } elseif ($this->entityCategory === self::AVCR) {
+        } elseif (self::AVCR === $this->entityCategory) {
             foreach ($this->eduPersonScopedAffiliation as $affiliation) {
                 if (preg_match('/^member@.+\.cz$/', $affiliation, $matches)) {
                     return 2;
                 }
             }
-        } elseif ($this->entityCategory === self::LIBRARY) {
+        } elseif (self::LIBRARY === $this->entityCategory) {
             foreach ($this->eduPersonScopedAffiliation as $affiliation) {
                 if (preg_match('/^employee@.+\.cz$/', $affiliation, $matches)) {
                     return 2;
                 }
             }
-        } elseif ($this->entityCategory === self::HOSPITAL) {
+        } elseif (self::HOSPITAL === $this->entityCategory) {
             foreach ($this->eduPersonScopedAffiliation as $affiliation) {
                 if (preg_match('/^employee@.+\.cz$/', $affiliation, $matches)) {
                     return 2;
                 }
             }
-        } elseif ($this->entityCategory === self::OTHER) {
+        } elseif (self::OTHER === $this->entityCategory) {
             foreach ($this->eduPersonScopedAffiliation as $affiliation) {
                 if (preg_match('/(^employee@.+\.cz$)|(^member@.+\.cz$)/', $affiliation, $matches)) {
                     return 2;
                 }
             }
         }
+
         return 0;
     }
 }

lib/Auth/Process/IsCesnetEligible.php

@@ -17,7 +17,7 @@
 use SimpleSAML\Module\perun\model\User;
 
 /**
- * Class IsCesnetEligible
+ * Class IsCesnetEligible.
  *
  * This class put the timestamp of last login into list of Attributes, when at least one value of attribute
  * 'eduPersonScopedAffiliation' is marked as isCesnetEligible in CESNET LDAP
@@ -87,8 +87,7 @@ public function __construct($config, $reserved)
         $conf = Configuration::loadFromArray($config);
         if (! isset($config[self::RPC_ATTRIBUTE_NAME]) || empty($config[self::RPC_ATTRIBUTE_NAME])) {
             throw new Exception(
-                'cesnet:IsCesnetEligible - missing mandatory configuration option \'' .
-                self::RPC_ATTRIBUTE_NAME . '\'.'
+                'cesnet:IsCesnetEligible - missing mandatory configuration option \'' . self::RPC_ATTRIBUTE_NAME . '\'.'
             );
         }
 
@@ -102,7 +101,7 @@ public function __construct($config, $reserved)
         }
 
         if (isset($config[self::INTERFACE_PROPNAME], $config[self::LDAP_ATTRIBUTE_NAME]) &&
-            $config[self::INTERFACE_PROPNAME] === self::LDAP && ! empty($config[self::LDAP_ATTRIBUTE_NAME])) {
+            self::LDAP === $config[self::INTERFACE_PROPNAME] && ! empty($config[self::LDAP_ATTRIBUTE_NAME])) {
             $this->interface = $config[self::INTERFACE_PROPNAME];
             $this->ldapAttrName = $config[self::LDAP_ATTRIBUTE_NAME];
             $this->adapter = Adapter::getInstance(Adapter::LDAP);
@@ -150,7 +149,7 @@ public function process(&$request)
         }
 
         if (! empty($user)) {
-            if ($this->interface === self::LDAP) {
+            if (self::LDAP === $this->interface) {
                 $attrs = $this->adapter->getUserAttributes($user, [$this->ldapAttrName]);
                 if (isset($attrs[$this->ldapAttrName][0])) {
                     $this->cesnetEligibleLastSeenValue = $attrs[$this->ldapAttrName][0];
@@ -188,7 +187,7 @@ public function process(&$request)
             }
         }
 
-        if ($this->cesnetEligibleLastSeenValue !== null) {
+        if (null !== $this->cesnetEligibleLastSeenValue) {
             $request['Attributes'][$this->returnAttrName] = [$this->cesnetEligibleLastSeenValue];
             Logger::debug(
                 'cesnet:IsCesnetEligible - Attribute ' . $this->returnAttrName . ' was set to value ' .
@@ -197,7 +196,7 @@ public function process(&$request)
         }
 
         $request['Attributes']['isCesnetEligible'] = ['false'];
-        if (($this->cesnetEligibleLastSeenValue !== null) && $this->cesnetEligibleLastSeenValue > date(
+        if ((null !== $this->cesnetEligibleLastSeenValue) && $this->cesnetEligibleLastSeenValue > date(
             'Y-m-d H:i:s',
             strtotime('-1 year')
         )) {
@@ -207,7 +206,7 @@ public function process(&$request)
     }
 
     /**
-     * Returns true if one of user's affiliation is in allowed affiliations for this IdP , False if not
+     * Returns true if one of user's affiliation is in allowed affiliations for this IdP , False if not.
      *
      * @param User $user or Null
      */
@@ -218,7 +217,7 @@ private function isCesnetEligible($user): bool
             return true;
         }
 
-        # Check if user has isCesnetEligible by sponsoring in some organization
+        // Check if user has isCesnetEligible by sponsoring in some organization
         try {
             if (isset($user, $this->userAffiliationsAttrName, $this->userSponsoringOrganizationsAttrName)) {
                 $userAttributes = $this->rpcAdapter->getUserAttributesValues(
@@ -235,10 +234,12 @@ private function isCesnetEligible($user): bool
                         json_encode($perunUserAffiliations) . ', ' . $this->userSponsoringOrganizationsAttrName .
                         ':' . json_encode($perunUserSponsoringOrganizations) . '] has empty value!'
                     );
+
                     return false;
                 }
 
                 $allowedSponsoredAffiliations = $this->getAllowedAffiliations($perunUserSponsoringOrganizations);
+
                 return $this->compareAffiliations($perunUserAffiliations, $allowedSponsoredAffiliations);
             }
         } catch (\Exception $exception) {
@@ -252,9 +253,10 @@ private function isCesnetEligible($user): bool
     }
 
     /**
-     * Return list of allowed affiliations for IdP from CESNET LDAP
+     * Return list of allowed affiliations for IdP from CESNET LDAP.
      *
      * @param array $idpEntityIds of entityId of IdPs
+     *
      * @return array of allowed affiliations
      */
     private function getAllowedAffiliations($idpEntityIds): array
@@ -298,7 +300,7 @@ private function getAllowedAffiliations($idpEntityIds): array
     /**
      * Compare two lists of affiliations and returns true if one of affiliations without scope is in booth lists.
      *
-     * @param array $userAffiliations of user scoped affiliations
+     * @param array $userAffiliations    of user scoped affiliations
      * @param array $allowedAffiliations of allowed unscoped affiliations
      */
     private function compareAffiliations($userAffiliations, $allowedAffiliations): bool
@@ -307,6 +309,7 @@ private function compareAffiliations($userAffiliations, $allowedAffiliations): b
         if (! empty($result)) {
             return true;
         }
+
         return false;
     }
 }

themes/cesnet/default/includes/footer.php

@@ -20,7 +20,7 @@
             <div class="row">
                 <div class="col-md-4 logo">
                     <a href="http://www.cesnet.cz/">
-                        <img src="<?php echo Module::getModuleUrl('cesnet/res/img/logo-cesnet.png') ?>"
+                        <img src="<?php echo Module::getModuleUrl('cesnet/res/img/logo-cesnet.png'); ?>"
                              width="250px">
                     </a>
                 </div>

themes/cesnet/default/includes/header.php

@@ -3,7 +3,7 @@
 use SimpleSAML\Module;
 use SimpleSAML\Utils\HTTP;
 
-/**
+/*
  * Support the htmlinject hook, which allows modules to change header, pre and post body on all pages.
  */
 $this->data['htmlinject'] = [
@@ -30,7 +30,7 @@
 }
 // - o - o - o - o - o - o - o - o - o - o - o - o -
 
-/**
+/*
  * Do not allow to frame SimpleSAMLphp pages from another location. This prevents clickjacking attacks in modern
  * browsers.
  *
@@ -66,7 +66,7 @@
             $version = $jquery['version'];
         }
 
-        if ($version === '1.8') {
+        if ('1.8' === $version) {
             if (isset($jquery['core']) && $jquery['core']) {
                 echo '<script type="text/javascript" src="/' . $this->data['baseurlpath'] .
                         'resources/jquery-1.8.js"></script>' . "\n"
@@ -97,7 +97,6 @@
         }
     }
 
-
     if ($this->isLanguageRTL()) {
         ?>
         <link rel="stylesheet" type="text/css"
@@ -133,7 +132,7 @@
     $onLoad .= $this->data['onLoad'];
 }
 
-if ($onLoad !== '') {
+if ('' !== $onLoad) {
     $onLoad = ' onload="' . $onLoad . '"';
 }
 
@@ -147,7 +146,7 @@
         <?php
 
         $includeLanguageBar = true;
-        if (isset($this->data['hideLanguageBar']) && $this->data['hideLanguageBar'] === true) {
+        if (isset($this->data['hideLanguageBar']) && true === $this->data['hideLanguageBar']) {
             $includeLanguageBar = false;
         }