simplesamlphp / simplesamlphp-module-aggregator2

lib/EntitySource.php

Spacing +13 added lines, -13 removed lines

@@ -92,7 +92,7 @@ 
      */
     public function __construct(Aggregator $aggregator, Configuration $config)
     {
-        $this->logLoc = 'aggregator2:'.$aggregator->getId().': ';
+        $this->logLoc = 'aggregator2:' . $aggregator->getId() . ': ';
         $this->aggregator = $aggregator;
 
         $this->url = $config->getString('url');
@@ -116,12 +116,12 @@ 
      */
     private function downloadMetadata()
     {
-        Logger::debug($this->logLoc.'Downloading metadata from '.var_export($this->url, true));
+        Logger::debug($this->logLoc . 'Downloading metadata from ' . var_export($this->url, true));
 
         $context = ['ssl' => []];
         if ($this->sslCAFile !== null) {
             $context['ssl']['cafile'] = Config::getCertPath($this->sslCAFile);
-            Logger::debug($this->logLoc.'Validating https connection against CA certificate(s) found in '.
+            Logger::debug($this->logLoc . 'Validating https connection against CA certificate(s) found in ' .
                 var_export($context['ssl']['cafile'], true));
             $context['ssl']['verify_peer'] = true;
             $context['ssl']['CN_match'] = parse_url($this->url, PHP_URL_HOST);
@@ -129,26 +129,26 @@ 
 
         $data = HTTP::fetch($this->url, $context);
         if ($data === false || $data === null) {
-            Logger::error($this->logLoc.'Unable to load metadata from '.var_export($this->url, true));
+            Logger::error($this->logLoc . 'Unable to load metadata from ' . var_export($this->url, true));
             return null;
         }
 
         $doc = new \DOMDocument();
         $res = $doc->loadXML($data);
         if (!$res) {
-            Logger::error($this->logLoc.'Error parsing XML from '.var_export($this->url, true));
+            Logger::error($this->logLoc . 'Error parsing XML from ' . var_export($this->url, true));
             return null;
         }
 
         $root = Utils::xpQuery($doc->firstChild, '/saml_metadata:EntityDescriptor|/saml_metadata:EntitiesDescriptor');
         if (count($root) === 0) {
-            Logger::error($this->logLoc.'No <EntityDescriptor> or <EntitiesDescriptor> in metadata from '.
+            Logger::error($this->logLoc . 'No <EntityDescriptor> or <EntitiesDescriptor> in metadata from ' .
                 var_export($this->url, true));
             return null;
         }
 
         if (count($root) > 1) {
-            Logger::error($this->logLoc.'More than one <EntityDescriptor> or <EntitiesDescriptor> in metadata from '.
+            Logger::error($this->logLoc . 'More than one <EntityDescriptor> or <EntitiesDescriptor> in metadata from ' .
                 var_export($this->url, true));
             return null;
         }
@@ -161,8 +161,8 @@ 
                 $md = new EntitiesDescriptor($root);
             }
         } catch (\Exception $e) {
-            Logger::error($this->logLoc.'Unable to parse metadata from '.
-                var_export($this->url, true).': '.$e->getMessage());
+            Logger::error($this->logLoc . 'Unable to parse metadata from ' .
+                var_export($this->url, true) . ': ' . $e->getMessage());
             return null;
         }
 
@@ -170,7 +170,7 @@ 
             $file = Config::getCertPath($this->certificate);
             $certData = file_get_contents($file);
             if ($certData === false) {
-                throw new Exception('Error loading certificate from '.var_export($file, true));
+                throw new Exception('Error loading certificate from ' . var_export($file, true));
             }
 
             // Extract the public key from the certificate for validation
@@ -178,10 +178,10 @@ 
             $key->loadKey($file, true);
 
             if (!$md->validate($key)) {
-                Logger::error($this->logLoc.'Error validating signature on metadata.');
+                Logger::error($this->logLoc . 'Error validating signature on metadata.');
                 return null;
             }
-            Logger::debug($this->logLoc.'Validated signature on metadata from '.var_export($this->url, true));
+            Logger::debug($this->logLoc . 'Validated signature on metadata from ' . var_export($this->url, true));
         }
 
         return $md;
@@ -244,7 +244,7 @@ 
             return null;
         }
 
-        Logger::debug($this->logLoc.'Using cached metadata from '.var_export($cacheFile, true));
+        Logger::debug($this->logLoc . 'Using cached metadata from ' . var_export($cacheFile, true));
 
         $metadata = file_get_contents($cacheFile);
         if ($metadata !== null) {

www/get.php

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
     $xml = \SimpleSAML\Utils\XML::formatXMLString($xml);
 }
 
-header('Content-Type: '.$mimetype);
+header('Content-Type: ' . $mimetype);
 header('Content-Length: ' . strlen($xml));
 
 /*
  * At this point, if the ID was forged, getMetadata() would
  * have failed to find a valid metadata set, so we can trust it.
  */
-header('Content-Disposition: filename='.$id.'.xml');
+header('Content-Disposition: filename=' . $id . '.xml');
 
 echo $xml;