simplesamlphp / simplesamlphp-module-metarefresh

lib/ARP.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
     private function loadAttributeMap(string $attributemap_filename): void
     {
         $config = \SimpleSAML\Configuration::getInstance();
-        include($config->getPathValue('attributemap', 'attributemap/') . $attributemap_filename . '.php');
+        include($config->getPathValue('attributemap', 'attributemap/').$attributemap_filename.'.php');
         // Note that $attributemap is defined in the included attributemap-file!
         $this->attributes = $attributemap;
     }
@@ -131,9 +131,9 @@ 
     private function getEntryXML(array $entry): string
     {
         $entityid = $entry['entityid'];
-        return '    <AttributeFilterPolicy id="' . $entityid .
-            '"><PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="' . $entityid .
-            '" />' . $this->getEntryXMLcontent($entry) . '</AttributeFilterPolicy>';
+        return '    <AttributeFilterPolicy id="'.$entityid.
+            '"><PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="'.$entityid.
+            '" />'.$this->getEntryXMLcontent($entry).'</AttributeFilterPolicy>';
     }
 
 
@@ -150,7 +150,7 @@ 
 
         $ret = '';
         foreach ($entry['attributes'] as $a) {
-            $ret .= '            <AttributeRule attributeID="' . $this->getAttributeID($a) .
+            $ret .= '            <AttributeRule attributeID="'.$this->getAttributeID($a).
                 '"><PermitValueRule xsi:type="basic:ANY" /></AttributeRule>';
         }
         return $ret;

hooks/hook_cron.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
     Assert::keyExists($croninfo, 'summary');
     Assert::keyExists($croninfo, 'tag');
 
-    Logger::info('cron [metarefresh]: Running cron in cron tag [' . $croninfo['tag'] . '] ');
+    Logger::info('cron [metarefresh]: Running cron in cron tag ['.$croninfo['tag'].'] ');
 
     try {
         $config = Configuration::getInstance();
@@ -24,7 +24,7 @@ 
         $sets = $mconfig->getArray('sets', []);
         /** @var string $datadir */
         $datadir = $config->getPathValue('datadir', 'data/');
-        $stateFile = $datadir . 'metarefresh-state.php';
+        $stateFile = $datadir.'metarefresh-state.php';
 
         foreach ($sets as $setkey => $set) {
             $set = Configuration::loadFromArray($set);
@@ -35,7 +35,7 @@ 
                 continue;
             }
 
-            Logger::info('cron [metarefresh]: Executing set [' . $setkey . ']');
+            Logger::info('cron [metarefresh]: Executing set ['.$setkey.']');
 
             $expireAfter = $set->getInteger('expireAfter', null);
             if ($expireAfter !== null) {
@@ -99,7 +99,7 @@ 
                     $source['conditionalGET'] = $conditionalGET;
                 }
 
-                Logger::debug('cron [metarefresh]: In set [' . $setkey . '] loading source [' . $source['src'] . ']');
+                Logger::debug('cron [metarefresh]: In set ['.$setkey.'] loading source ['.$source['src'].']');
                 $metaloader->loadSource($source);
             }
 
@@ -121,6 +121,6 @@ 
             }
         }
     } catch (\Exception $e) {
-        $croninfo['summary'][] = 'Error during metarefresh: ' . $e->getMessage();
+        $croninfo['summary'][] = 'Error during metarefresh: '.$e->getMessage();
     }
 }

www/fetch.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 foreach ($sets as $setkey => $set) {
     $set = \SimpleSAML\Configuration::loadFromArray($set);
 
-    \SimpleSAML\Logger::info('[metarefresh]: Executing set [' . $setkey . ']');
+    \SimpleSAML\Logger::info('[metarefresh]: Executing set ['.$setkey.']');
 
     try {
         $expireAfter = $set->getInteger('expireAfter', null);
@@ -58,7 +58,7 @@ 
             }
 
             \SimpleSAML\Logger::debug(
-                '[metarefresh]: In set [' . $setkey . '] loading source [' . $source['src'] . ']'
+                '[metarefresh]: In set ['.$setkey.'] loading source ['.$source['src'].']'
             );
             $metaloader->loadSource($source);
         }

lib/MetaLoader.php

Spacing +40 added lines, -40 removed lines

@@ -108,13 +108,13 @@ 
             try {
                 list($data, $responseHeaders) = \SimpleSAML\Utils\HTTP::fetch($source['src'], $context, true);
             } catch (\Exception $e) {
-                Logger::warning('metarefresh: ' . $e->getMessage());
+                Logger::warning('metarefresh: '.$e->getMessage());
             }
 
             // We have response headers, so the request succeeded
             if (!isset($responseHeaders)) {
                 // No response headers, this means the request failed in some way, so re-use old data
-                Logger::debug('No response from ' . $source['src'] . ' - attempting to re-use cached metadata');
+                Logger::debug('No response from '.$source['src'].' - attempting to re-use cached metadata');
                 $this->addCachedMetadata($source);
                 return;
             } elseif (preg_match('@^HTTP/1\.[01]\s304\s@', $responseHeaders[0])) {
@@ -124,7 +124,7 @@ 
                 return;
             } elseif (!preg_match('@^HTTP/1\.[01]\s200\s@', $responseHeaders[0])) {
                 // Other error
-                Logger::debug('Error from ' . $source['src'] . ' - attempting to re-use cached metadata');
+                Logger::debug('Error from '.$source['src'].' - attempting to re-use cached metadata');
                 $this->addCachedMetadata($source);
                 return;
             }
@@ -143,8 +143,8 @@ 
         try {
             $entities = $this->loadXML($data, $source);
         } catch (\Exception $e) {
-            Logger::debug('XML parser error when parsing ' . $source['src'] . ' - attempting to re-use cached metadata');
-            Logger::debug('XML parser returned: ' . $e->getMessage());
+            Logger::debug('XML parser error when parsing '.$source['src'].' - attempting to re-use cached metadata');
+            Logger::debug('XML parser returned: '.$e->getMessage());
             $this->addCachedMetadata($source);
             return;
         }
@@ -152,14 +152,14 @@ 
         foreach ($entities as $entity) {
             if (isset($source['blacklist'])) {
                 if (!empty($source['blacklist']) && in_array($entity->getEntityId(), $source['blacklist'], true)) {
-                    Logger::info('Skipping "' . $entity->getEntityId() . '" - blacklisted.' . "\n");
+                    Logger::info('Skipping "'.$entity->getEntityId().'" - blacklisted.'."\n");
                     continue;
                 }
             }
 
             if (isset($source['whitelist'])) {
                 if (!empty($source['whitelist']) && !in_array($entity->getEntityId(), $source['whitelist'], true)) {
-                    Logger::info('Skipping "' . $entity->getEntityId() . '" - not in the whitelist.' . "\n");
+                    Logger::info('Skipping "'.$entity->getEntityId().'" - not in the whitelist.'."\n");
                     continue;
                 }
             }
@@ -185,13 +185,13 @@ 
                     /* No match found -> next IdP */
                     continue;
                 }
-                Logger::debug('Whitelisted entityID: ' . $entity->getEntityID());
+                Logger::debug('Whitelisted entityID: '.$entity->getEntityID());
             }
 
             if (array_key_exists('certificates', $source) && ($source['certificates'] !== null)) {
                 if (!$entity->validateSignature($source['certificates'])) {
                     Logger::info(
-                        'Skipping "' . $entity->getEntityId() . '" - could not verify signature using certificate.' . "\n"
+                        'Skipping "'.$entity->getEntityId().'" - could not verify signature using certificate.'."\n"
                     );
                     continue;
                 }
@@ -307,11 +307,11 @@ 
                 $sourceState = $this->state[$source['src']];
 
                 if (isset($sourceState['last-modified'])) {
-                    $rawheader .= 'If-Modified-Since: ' . $sourceState['last-modified'] . "\r\n";
+                    $rawheader .= 'If-Modified-Since: '.$sourceState['last-modified']."\r\n";
                 }
 
                 if (isset($sourceState['etag'])) {
-                    $rawheader .= 'If-None-Match: ' . $sourceState['etag'] . "\r\n";
+                    $rawheader .= 'If-None-Match: '.$sourceState['etag']."\r\n";
                 }
             }
         }
@@ -383,7 +383,7 @@ 
         try {
             $doc = \SAML2\DOMDocumentFactory::fromString($data);
         } catch (\Exception $e) {
-            throw new \Exception('Failed to read XML from ' . $source['src']);
+            throw new \Exception('Failed to read XML from '.$source['src']);
         }
         return \SimpleSAML\Metadata\SAMLParser::parseDescriptorsElement($doc->documentElement);
     }
@@ -397,12 +397,12 @@ 
     public function writeState(): void
     {
         if ($this->changed && !is_null($this->stateFile)) {
-            Logger::debug('Writing: ' . $this->stateFile);
+            Logger::debug('Writing: '.$this->stateFile);
             \SimpleSAML\Utils\System::writeFile(
                 $this->stateFile,
-                "<?php\n/* This file was generated by the metarefresh module at " . $this->getTime() . ".\n" .
-                " Do not update it manually as it will get overwritten. */\n" .
-                '$state = ' . var_export($this->state, true) . ";\n?>\n",
+                "<?php\n/* This file was generated by the metarefresh module at ".$this->getTime().".\n".
+                " Do not update it manually as it will get overwritten. */\n".
+                '$state = '.var_export($this->state, true).";\n?>\n",
                 0644
             );
         }
@@ -417,19 +417,19 @@ 
     public function dumpMetadataStdOut(): void
     {
         foreach ($this->metadata as $category => $elements) {
-            echo '/* The following data should be added to metadata/' . $category . '.php. */' . "\n";
+            echo '/* The following data should be added to metadata/'.$category.'.php. */'."\n";
 
             foreach ($elements as $m) {
                 $filename = $m['filename'];
                 $entityID = $m['metadata']['entityid'];
 
                 echo "\n";
-                echo '/* The following metadata was generated from ' . $filename . ' on ' . $this->getTime() . '. */' . "\n";
-                echo '$metadata[\'' . addslashes($entityID) . '\'] = ' . var_export($m['metadata'], true) . ';' . "\n";
+                echo '/* The following metadata was generated from '.$filename.' on '.$this->getTime().'. */'."\n";
+                echo '$metadata[\''.addslashes($entityID).'\'] = '.var_export($m['metadata'], true).';'."\n";
             }
 
             echo "\n";
-            echo '/* End of data which should be added to metadata/' . $category . '.php. */' . "\n";
+            echo '/* End of data which should be added to metadata/'.$category.'.php. */'."\n";
             echo "\n";
         }
     }
@@ -508,7 +508,7 @@ 
 
         $arpxml = $arp->getXML();
 
-        Logger::info('Writing ARP file: ' . $arpfile . "\n");
+        Logger::info('Writing ARP file: '.$arpfile."\n");
         file_put_contents($arpfile, $arpxml);
     }
 
@@ -526,37 +526,37 @@ 
         }
 
         if (!file_exists($outputDir)) {
-            Logger::info('Creating directory: ' . $outputDir . "\n");
+            Logger::info('Creating directory: '.$outputDir."\n");
             $res = @mkdir($outputDir, 0777, true);
             if ($res === false) {
-                throw new \Exception('Error creating directory: ' . $outputDir);
+                throw new \Exception('Error creating directory: '.$outputDir);
             }
         }
 
         foreach ($this->types as $type) {
-            $filename = $outputDir . '/' . $type . '.php';
+            $filename = $outputDir.'/'.$type.'.php';
 
             if (array_key_exists($type, $this->metadata)) {
                 $elements = $this->metadata[$type];
-                Logger::debug('Writing: ' . $filename);
+                Logger::debug('Writing: '.$filename);
 
-                $content  = '<?php' . "\n" . '/* This file was generated by the metarefresh module at ';
-                $content .= $this->getTime() . "\nDo not update it manually as it will get overwritten\n" . '*/' . "\n";
+                $content  = '<?php'."\n".'/* This file was generated by the metarefresh module at ';
+                $content .= $this->getTime()."\nDo not update it manually as it will get overwritten\n".'*/'."\n";
 
                 foreach ($elements as $m) {
                     $entityID = $m['metadata']['entityid'];
-                    $content .= "\n" . '$metadata[\'';
-                    $content .= addslashes($entityID) . '\'] = ' . var_export($m['metadata'], true) . ';' . "\n";
+                    $content .= "\n".'$metadata[\'';
+                    $content .= addslashes($entityID).'\'] = '.var_export($m['metadata'], true).';'."\n";
                 }
 
-                $content .= "\n" . '?>';
+                $content .= "\n".'?>';
 
                 \SimpleSAML\Utils\System::writeFile($filename, $content, 0644);
             } elseif (is_file($filename)) {
                 if (unlink($filename)) {
-                    Logger::debug('Deleting stale metadata file: ' . $filename);
+                    Logger::debug('Deleting stale metadata file: '.$filename);
                 } else {
-                    Logger::warning('Could not delete stale metadata file: ' . $filename);
+                    Logger::warning('Could not delete stale metadata file: '.$filename);
                 }
             }
         }
@@ -579,8 +579,8 @@ 
                 $entityId = $m['metadata']['entityid'];
 
                 Logger::debug(
-                    'metarefresh: Add metadata entry ' .
-                    var_export($entityId, true) . ' in set ' . var_export($set, true) . '.'
+                    'metarefresh: Add metadata entry '.
+                    var_export($entityId, true).' in set '.var_export($set, true).'.'
                 );
                 $metaHandler->saveMetadata($entityId, $set, $m['metadata']);
             }
@@ -592,19 +592,19 @@ 
             foreach ($metaHandler->getMetadataSet($set) as $entityId => $metadata) {
                 if (!array_key_exists('expire', $metadata)) {
                     Logger::warning(
-                        'metarefresh: Metadata entry without expire timestamp: ' . var_export($entityId, true) .
-                        ' in set ' . var_export($set, true) . '.'
+                        'metarefresh: Metadata entry without expire timestamp: '.var_export($entityId, true).
+                        ' in set '.var_export($set, true).'.'
                     );
                     continue;
                 }
                 if ($metadata['expire'] > $ct) {
                     continue;
                 }
-                Logger::debug('metarefresh: ' . $entityId . ' expired ' . date('l jS \of F Y h:i:s A', $metadata['expire']));
+                Logger::debug('metarefresh: '.$entityId.' expired '.date('l jS \of F Y h:i:s A', $metadata['expire']));
                 Logger::debug(
-                    'metarefresh: Delete expired metadata entry ' .
-                    var_export($entityId, true) . ' in set ' . var_export($set, true) .
-                    '. (' . ($ct - $metadata['expire']) . ' sec)'
+                    'metarefresh: Delete expired metadata entry '.
+                    var_export($entityId, true).' in set '.var_export($set, true).
+                    '. ('.($ct - $metadata['expire']).' sec)'
                 );
                 $metaHandler->deleteMetadata($entityId, $set);
             }