simplesamlphp / simplesamlphp-module-consent

lib/Controller/ConsentController.php

Spacing +2 added lines, -2 removed lines

@@ -139,12 +139,12 @@
                 $attributeSet = $state['consent:store.attributeSet'];
 
                 $this->logger::debug(
-                    'Consent - saveConsent() : [' . $userId . '|' . $targetedId . '|' . $attributeSet . ']'
+                    'Consent - saveConsent() : ['.$userId.'|'.$targetedId.'|'.$attributeSet.']'
                 );
                 try {
                     $store->saveConsent($userId, $targetedId, $attributeSet);
                 } catch (Exception $e) {
-                    $this->logger::error('Consent: Error writing to storage: ' . $e->getMessage());
+                    $this->logger::error('Consent: Error writing to storage: '.$e->getMessage());
                 }
             }
 

lib/Auth/Process/Consent.php

Spacing +24 added lines, -24 removed lines

@@ -97,8 +97,8 @@ 
         if (array_key_exists('includeValues', $config)) {
             if (!is_bool($config['includeValues'])) {
                 throw new Error\Exception(
-                    'Consent: includeValues must be boolean. ' .
-                    var_export($config['includeValues'], true) . ' given.'
+                    'Consent: includeValues must be boolean. '.
+                    var_export($config['includeValues'], true).' given.'
                 );
             }
             $this->includeValues = $config['includeValues'];
@@ -107,8 +107,8 @@ 
         if (array_key_exists('checked', $config)) {
             if (!is_bool($config['checked'])) {
                 throw new Error\Exception(
-                    'Consent: checked must be boolean. ' .
-                    var_export($config['checked'], true) . ' given.'
+                    'Consent: checked must be boolean. '.
+                    var_export($config['checked'], true).' given.'
                 );
             }
             $this->checked = $config['checked'];
@@ -117,8 +117,8 @@ 
         if (array_key_exists('focus', $config)) {
             if (!in_array($config['focus'], ['yes', 'no'], true)) {
                 throw new Error\Exception(
-                    'Consent: focus must be a string with values `yes` or `no`. ' .
-                    var_export($config['focus'], true) . ' given.'
+                    'Consent: focus must be a string with values `yes` or `no`. '.
+                    var_export($config['focus'], true).' given.'
                 );
             }
             $this->focus = $config['focus'];
@@ -127,8 +127,8 @@ 
         if (array_key_exists('hiddenAttributes', $config)) {
             if (!is_array($config['hiddenAttributes'])) {
                 throw new Error\Exception(
-                    'Consent: hiddenAttributes must be an array. ' .
-                    var_export($config['hiddenAttributes'], true) . ' given.'
+                    'Consent: hiddenAttributes must be an array. '.
+                    var_export($config['hiddenAttributes'], true).' given.'
                 );
             }
             $this->hiddenAttributes = $config['hiddenAttributes'];
@@ -137,8 +137,8 @@ 
         if (array_key_exists('attributes.exclude', $config)) {
             if (!is_array($config['attributes.exclude'])) {
                 throw new Error\Exception(
-                    'Consent: attributes.exclude must be an array. ' .
-                    var_export($config['attributes.exclude'], true) . ' given.'
+                    'Consent: attributes.exclude must be an array. '.
+                    var_export($config['attributes.exclude'], true).' given.'
                 );
             }
             $this->noconsentattributes = $config['attributes.exclude'];
@@ -146,8 +146,8 @@ 
             Logger::warning("The 'noconsentattributes' option has been deprecated in favour of 'attributes.exclude'.");
             if (!is_array($config['noconsentattributes'])) {
                 throw new Error\Exception(
-                    'Consent: noconsentattributes must be an array. ' .
-                    var_export($config['noconsentattributes'], true) . ' given.'
+                    'Consent: noconsentattributes must be an array. '.
+                    var_export($config['noconsentattributes'], true).' given.'
                 );
             }
             $this->noconsentattributes = $config['noconsentattributes'];
@@ -158,7 +158,7 @@ 
                 $this->store = \SimpleSAML\Module\consent\Store::parseStoreConfig($config['store']);
             } catch (Exception $e) {
                 Logger::error(
-                    'Consent: Could not create consent storage: ' .
+                    'Consent: Could not create consent storage: '.
                     $e->getMessage()
                 );
             }
@@ -281,7 +281,7 @@ 
             isset($state['Source']['consent.disable']) &&
             self::checkDisable($state['Source']['consent.disable'], $spEntityId)
         ) {
-            Logger::debug('Consent: Consent disabled for entity ' . $spEntityId . ' with IdP ' . $idpEntityId);
+            Logger::debug('Consent: Consent disabled for entity '.$spEntityId.' with IdP '.$idpEntityId);
             Stats::log('consent:disabled', $statsData);
             return;
         }
@@ -289,14 +289,14 @@ 
             isset($state['Destination']['consent.disable']) &&
             self::checkDisable($state['Destination']['consent.disable'], $idpEntityId)
         ) {
-            Logger::debug('Consent: Consent disabled for entity ' . $spEntityId . ' with IdP ' . $idpEntityId);
+            Logger::debug('Consent: Consent disabled for entity '.$spEntityId.' with IdP '.$idpEntityId);
             Stats::log('consent:disabled', $statsData);
             return;
         }
 
         if ($this->store !== null) {
-            $source = $state['Source']['metadata-set'] . '|' . $idpEntityId;
-            $destination = $state['Destination']['metadata-set'] . '|' . $spEntityId;
+            $source = $state['Source']['metadata-set'].'|'.$idpEntityId;
+            $destination = $state['Destination']['metadata-set'].'|'.$spEntityId;
             $attributes = $state['Attributes'];
             Assert::keyExists(
                 $attributes,
@@ -312,16 +312,16 @@ 
                 }
             }
 
-            Logger::debug('Consent: userid: ' . $userId);
-            Logger::debug('Consent: source: ' . $source);
-            Logger::debug('Consent: destination: ' . $destination);
+            Logger::debug('Consent: userid: '.$userId);
+            Logger::debug('Consent: source: '.$source);
+            Logger::debug('Consent: destination: '.$destination);
 
             $hashedUserId = self::getHashedUserID($userId, $source);
             $targetedId = self::getTargetedID($userId, $source, $destination);
             $attributeSet = self::getAttributeHash($attributes, $this->includeValues);
 
             Logger::debug(
-                'Consent: hasConsent() [' . $hashedUserId . '|' . $targetedId . '|' . $attributeSet . ']'
+                'Consent: hasConsent() ['.$hashedUserId.'|'.$targetedId.'|'.$attributeSet.']'
             );
 
             try {
@@ -340,7 +340,7 @@ 
                 $state['consent:store.destination'] = $targetedId;
                 $state['consent:store.attributeSet'] = $attributeSet;
             } catch (\Exception $e) {
-                Logger::error('Consent: Error reading from storage: ' . $e->getMessage());
+                Logger::error('Consent: Error reading from storage: '.$e->getMessage());
                 Logger::stats('Consent failed');
                 Stats::log('consent:failed', $statsData);
             }
@@ -381,7 +381,7 @@ 
      */
     public static function getHashedUserID(string $userid, string $source): string
     {
-        return hash('sha1', $userid . '|' . Utils\Config::getSecretSalt() . '|' . $source);
+        return hash('sha1', $userid.'|'.Utils\Config::getSecretSalt().'|'.$source);
     }
 
 
@@ -396,7 +396,7 @@ 
      */
     public static function getTargetedID(string $userid, string $source, string $destination): string
     {
-        return hash('sha1', $userid . '|' . Utils\Config::getSecretSalt() . '|' . $source . '|' . $destination);
+        return hash('sha1', $userid.'|'.Utils\Config::getSecretSalt().'|'.$source.'|'.$destination);
     }