simplesamlphp / simplesamlphp-module-aggregator2

lib/Aggregator.php

Spacing +18 added lines, -18 removed lines

@@ -190,7 +190,7 @@ 
         assert('is_string($id)');
 
         $this->id = $id;
-        $this->logLoc = 'aggregator2:'.$this->id.': ';
+        $this->logLoc = 'aggregator2:' . $this->id . ': ';
 
         $this->cronTag = $config->getString('cron.tag', null);
 
@@ -221,7 +221,7 @@ 
             $signKey = System::resolvePath($signKey, $certDir);
             $this->signKey = @file_get_contents($signKey);
             if ($this->signKey === null) {
-                throw new Exception('Unable to load private key from '.var_export($signKey, true));
+                throw new Exception('Unable to load private key from ' . var_export($signKey, true));
             }
         }
 
@@ -232,13 +232,13 @@ 
             $signCert = System::resolvePath($signCert, $certDir);
             $this->signCert = @file_get_contents($signCert);
             if ($this->signCert === null) {
-                throw new Exception('Unable to load certificate file from '.var_export($signCert, true));
+                throw new Exception('Unable to load certificate file from ' . var_export($signCert, true));
             }
         }
 
         $this->signAlg = $config->getString('sign.algorithm', XMLSecurityKey::RSA_SHA1);
         if (!in_array($this->signAlg, self::$SUPPORTED_SIGNATURE_ALGORITHMS)) {
-            throw new Exception('Unsupported signature algorithm '.var_export($this->signAlg, true));
+            throw new Exception('Unsupported signature algorithm ' . var_export($this->signAlg, true));
         }
 
         $this->sslCAFile = $config->getString('ssl.cafile', null);
@@ -304,24 +304,24 @@ 
         assert('is_int($expires)');
         assert('is_null($tag) || is_string($tag)');
 
-        $cacheFile = $this->cacheDirectory.'/'.$id;
+        $cacheFile = $this->cacheDirectory . '/' . $id;
         try {
             System::writeFile($cacheFile, $data);
         } catch (\Exception $e) {
-            Logger::warning($this->logLoc.'Unable to write to cache file '.var_export($cacheFile, true));
+            Logger::warning($this->logLoc . 'Unable to write to cache file ' . var_export($cacheFile, true));
             return;
         }
 
-        $expireInfo = (string)$expires;
+        $expireInfo = (string) $expires;
         if ($tag !== null) {
-            $expireInfo .= ':'.$tag;
+            $expireInfo .= ':' . $tag;
         }
 
-        $expireFile = $cacheFile.'.expire';
+        $expireFile = $cacheFile . '.expire';
         try {
             System::writeFile($expireFile, $expireInfo);
         } catch (\Exception $e) {
-            Logger::warning($this->logLoc.'Unable to write expiration info to '.var_export($expireFile, true));
+            Logger::warning($this->logLoc . 'Unable to write expiration info to ' . var_export($expireFile, true));
         }
     }
 
@@ -338,12 +338,12 @@ 
         assert('is_string($id)');
         assert('is_null($tag) || is_string($tag)');
 
-        $cacheFile = $this->cacheDirectory.'/'.$id;
+        $cacheFile = $this->cacheDirectory . '/' . $id;
         if (!file_exists($cacheFile)) {
             return false;
         }
 
-        $expireFile = $cacheFile.'.expire';
+        $expireFile = $cacheFile . '.expire';
         if (!file_exists($expireFile)) {
             return false;
         }
@@ -389,7 +389,7 @@ 
             return null;
         }
 
-        $cacheFile = $this->cacheDirectory.'/'.$id;
+        $cacheFile = $this->cacheDirectory . '/' . $id;
         return @file_get_contents($cacheFile);
     }
 
@@ -404,7 +404,7 @@ 
     {
         assert('is_string($id)');
 
-        $cacheFile = $this->cacheDirectory.'/'.$id;
+        $cacheFile = $this->cacheDirectory . '/' . $id;
         if (!file_exists($cacheFile)) {
             return null;
         }
@@ -616,7 +616,7 @@ 
         }
         $this->excluded = $entities;
         sort($this->excluded);
-        $this->cacheId = sha1($this->cacheId.serialize($this->excluded));
+        $this->cacheId = sha1($this->cacheId . serialize($this->excluded));
     }
 
 
@@ -675,7 +675,7 @@ 
         $options = ['saml2', 'shib13', 'saml20-aa', 'shib13-aa'];
         $this->roles['SAML2_XML_md_AttributeAuthorityDescriptor'] = (array_intersect($set, $options) !== []);
 
-        $this->cacheId = sha1($this->cacheId.serialize($this->protocols).serialize($this->roles));
+        $this->cacheId = sha1($this->cacheId . serialize($this->protocols) . serialize($this->roles));
     }
 
 
@@ -698,7 +698,7 @@ 
         $xml = $xml->ownerDocument->saveXML($xml);
 
         if ($this->cacheGenerated !== null) {
-            Logger::debug($this->logLoc.'Saving generated metadata to cache.');
+            Logger::debug($this->logLoc . 'Saving generated metadata to cache.');
             $this->addCacheItem($this->cacheId, $xml, time() + $this->cacheGenerated, $this->cacheTag);
         }
 
@@ -716,7 +716,7 @@ 
         if ($this->cacheGenerated !== null) {
             $xml = $this->getCacheItem($this->cacheId, $this->cacheTag);
             if ($xml !== null) {
-                Logger::debug($this->logLoc.'Loaded generated metadata from cache.');
+                Logger::debug($this->logLoc . 'Loaded generated metadata from cache.');
                 return $xml;
             }
         }

templates/list.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 
 <?php
 if (count($this->data['sources']) === 0) {
-    echo "    <p>".$this->t('{aggregator2:aggregator:no_aggregators}')."</p>\n";
+    echo "    <p>" . $this->t('{aggregator2:aggregator:no_aggregators}') . "</p>\n";
 } else {
     echo "    <ul>";
 
@@ -15,17 +15,17 @@ 
         $params = [
             'id' => $encId,
         ];
-        echo str_repeat(' ', 8)."<li>\n";
-        echo str_repeat(' ', 12).'<a href="';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">'.htmlspecialchars($id)."</a>\n";
-        echo str_repeat(' ', 12).'<a href="';
+        echo str_repeat(' ', 8) . "<li>\n";
+        echo str_repeat(' ', 12) . '<a href="';
+        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params) . '">' . htmlspecialchars($id) . "</a>\n";
+        echo str_repeat(' ', 12) . '<a href="';
         $params['mimetype'] = 'text/plain';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">['.
-            $this->t('{aggregator2:aggregator:text}')."]</a>\n";
-        echo str_repeat(' ', 12).'<a href="';
+        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params) . '">[' .
+            $this->t('{aggregator2:aggregator:text}') . "]</a>\n";
+        echo str_repeat(' ', 12) . '<a href="';
         $params['mimetype'] = 'application/xml';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params)."\">[XML]</a>\n";
-        echo str_repeat(' ', 8)."</li>\n";
+        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params) . "\">[XML]</a>\n";
+        echo str_repeat(' ', 8) . "</li>\n";
     }
 
     echo "    </ul>\n";

tests/bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 $projectRoot = dirname(__DIR__);
-require_once($projectRoot.'/vendor/autoload.php');
+require_once($projectRoot . '/vendor/autoload.php');
 
 // Symlink module into ssp vendor lib so that templates and urls can resolve correctly
-$linkPath = $projectRoot.'/vendor/simplesamlphp/simplesamlphp/modules/aggregator2';
+$linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/aggregator2';
 if (file_exists($linkPath) === false) {
     echo "Linking '$linkPath' to '$projectRoot'\n";
     symlink($projectRoot, $linkPath);

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;