simplesamlphp / saml2

src/SAML2/HTTPArtifact.php

Spacing +4 added lines, -4 removed lines

@@ -47,11 +47,11 @@ 
         if ($issuer === null) {
             throw new \Exception('Cannot get redirect URL, no Issuer set in the message.');
         }
-        $artifact = base64_encode("\x00\x04\x00\x00".sha1($issuer->getValue(), true).$generatedId);
+        $artifact = base64_encode("\x00\x04\x00\x00" . sha1($issuer->getValue(), true) . $generatedId);
         $artifactData = $message->toUnsignedXML();
         $artifactDataString = $artifactData->ownerDocument->saveXML($artifactData);
 
-        $store->set('artifact', $artifact, $artifactDataString, Temporal::getTime() + 15*60);
+        $store->set('artifact', $artifact, $artifactDataString, Temporal::getTime() + 15 * 60);
 
         $params = [
             'SAMLart' => $artifact,
@@ -109,7 +109,7 @@ 
         $idpMetadata = $metadataHandler->getMetaDataConfigForSha1($sourceId, 'saml20-idp-remote');
 
         if ($idpMetadata === null) {
-            throw new \Exception('No metadata found for remote provider with SHA1 ID: '.var_export($sourceId, true));
+            throw new \Exception('No metadata found for remote provider with SHA1 ID: ' . var_export($sourceId, true));
         }
 
         $endpoint = null;
@@ -124,7 +124,7 @@ 
             throw new \Exception('No ArtifactResolutionService with the correct index.');
         }
 
-        Utils::getContainer()->getLogger()->debug("ArtifactResolutionService endpoint being used is := ".$endpoint['Location']);
+        Utils::getContainer()->getLogger()->debug("ArtifactResolutionService endpoint being used is := " . $endpoint['Location']);
 
         //Construct the ArtifactResolve Request
         $ar = new ArtifactResolve();

src/SAML2/HTTPRedirect.php

Spacing +11 added lines, -11 removed lines

@@ -55,21 +55,21 @@ 
         $msg .= urlencode($msgStr);
 
         if ($relayState !== null) {
-            $msg .= '&RelayState='.urlencode($relayState);
+            $msg .= '&RelayState=' . urlencode($relayState);
         }
 
         if ($key !== null) { // add the signature
             /** @psalm-suppress PossiblyInvalidArgument */
-            $msg .= '&SigAlg='.urlencode($key->type);
+            $msg .= '&SigAlg=' . urlencode($key->type);
 
             $signature = $key->signData($msg);
-            $msg .= '&Signature='.urlencode(base64_encode($signature));
+            $msg .= '&Signature=' . urlencode(base64_encode($signature));
         }
 
         if (strpos($destination, '?') === false) {
-            $destination .= '?'.$msg;
+            $destination .= '?' . $msg;
         } else {
-            $destination .= '&'.$msg;
+            $destination .= '&' . $msg;
         }
 
         return $destination;
@@ -86,7 +86,7 @@ 
     public function send(Message $message) : void
     {
         $destination = $this->getRedirectURL($message);
-        Utils::getContainer()->getLogger()->debug('Redirect to '.strlen($destination).' byte URL: '.$destination);
+        Utils::getContainer()->getLogger()->debug('Redirect to ' . strlen($destination) . ' byte URL: ' . $destination);
         Utils::getContainer()->redirect($destination);
     }
 
@@ -113,7 +113,7 @@ 
         }
 
         if (isset($data['SAMLEncoding']) && $data['SAMLEncoding'] !== self::DEFLATE) {
-            throw new \Exception('Unknown SAMLEncoding: '.var_export($data['SAMLEncoding'], true));
+            throw new \Exception('Unknown SAMLEncoding: ' . var_export($data['SAMLEncoding'], true));
         }
 
         $message = base64_decode($message);
@@ -192,18 +192,18 @@ 
             switch ($name) {
                 case 'SAMLRequest':
                 case 'SAMLResponse':
-                    $sigQuery = $name.'='.$value;
+                    $sigQuery = $name . '=' . $value;
                     break;
                 case 'RelayState':
-                    $relayState = '&RelayState='.$value;
+                    $relayState = '&RelayState=' . $value;
                     break;
                 case 'SigAlg':
-                    $sigAlg = '&SigAlg='.$value;
+                    $sigAlg = '&SigAlg=' . $value;
                     break;
             }
         }
 
-        $data['SignedQuery'] = $sigQuery.$relayState.$sigAlg;
+        $data['SignedQuery'] = $sigQuery . $relayState . $sigAlg;
 
         return $data;
     }

src/SAML2/Utils.php

Spacing +18 added lines, -18 removed lines

@@ -271,7 +271,7 @@ 
         }
 
         foreach ($namespaces as $prefix => $uri) {
-            $newElement->setAttributeNS($uri, $prefix.':__ns_workaround__', 'tmp');
+            $newElement->setAttributeNS($uri, $prefix . ':__ns_workaround__', 'tmp');
             $newElement->removeAttributeNS($uri, '__ns_workaround__');
         }
 
@@ -301,7 +301,7 @@ 
             case 'true':
                 return true;
             default:
-                throw new \Exception('Invalid value of boolean attribute '.var_export($attributeName, true).': '.
+                throw new \Exception('Invalid value of boolean attribute ' . var_export($attributeName, true) . ': ' .
                     var_export($value, true));
         }
     }
@@ -389,7 +389,7 @@ 
             $symKeyInfoAlgo = $symmetricKeyInfo->getAlgorithm();
 
             if (in_array($symKeyInfoAlgo, $blacklist, true)) {
-                throw new \Exception('Algorithm disabled: '.var_export($symKeyInfoAlgo, true));
+                throw new \Exception('Algorithm disabled: ' . var_export($symKeyInfoAlgo, true));
             }
 
             if ($symKeyInfoAlgo === XMLSecurityKey::RSA_OAEP_MGF1P && $inputKeyAlgo === XMLSecurityKey::RSA_1_5) {
@@ -405,9 +405,9 @@ 
             /* Make sure that the input key format is the same as the one used to encrypt the key. */
             if ($inputKeyAlgo !== $symKeyInfoAlgo) {
                 throw new \Exception(
-                    'Algorithm mismatch between input key and key used to encrypt '.
-                    ' the symmetric key for the message. Key was: '.
-                    var_export($inputKeyAlgo, true).'; message was: '.
+                    'Algorithm mismatch between input key and key used to encrypt ' .
+                    ' the symmetric key for the message. Key was: ' .
+                    var_export($inputKeyAlgo, true) . '; message was: ' .
                     var_export($symKeyInfoAlgo, true)
                 );
             }
@@ -422,7 +422,7 @@ 
                  * symmetric key, and for that we need to know the key size.
                  */
                 throw new \Exception(
-                    'Unknown key size for encryption algorithm: '.var_export($symmetricKey->type, true)
+                    'Unknown key size for encryption algorithm: ' . var_export($symmetricKey->type, true)
                 );
             }
 
@@ -434,13 +434,13 @@ 
                 $key = $encKey->decryptKey($symmetricKeyInfo);
                 if (strlen($key) !== $keySize) {
                     throw new \Exception(
-                        'Unexpected key size ('.strval(strlen($key)*8).'bits) for encryption algorithm: '.
+                        'Unexpected key size (' . strval(strlen($key) * 8) . 'bits) for encryption algorithm: ' .
                         var_export($symmetricKey->type, true)
                     );
                 }
             } catch (\Exception $e) {
                 /* We failed to decrypt this key. Log it, and substitute a "random" key. */
-                Utils::getContainer()->getLogger()->error('Failed to decrypt symmetric key: '.$e->getMessage());
+                Utils::getContainer()->getLogger()->error('Failed to decrypt symmetric key: ' . $e->getMessage());
                 /* Create a replacement key, so that it looks like we fail in the same way as if the key was correctly
                  * padded. */
 
@@ -455,7 +455,7 @@ 
                 /** @psalm-suppress PossiblyNullArgument */
                 $pkey = openssl_pkey_get_details($symmetricKeyInfo->key);
                 $pkey = sha1(serialize($pkey), true);
-                $key = sha1($encryptedKey.$pkey, true);
+                $key = sha1($encryptedKey . $pkey, true);
 
                 /* Make sure that the key has the correct length. */
                 if (strlen($key) > $keySize) {
@@ -470,8 +470,8 @@ 
             /* Make sure that the input key has the correct format. */
             if ($inputKeyAlgo !== $symKeyAlgo) {
                 throw new \Exception(
-                    'Algorithm mismatch between input key and key in message. '.
-                    'Key was: '.var_export($inputKeyAlgo, true).'; message was: '.
+                    'Algorithm mismatch between input key and key in message. ' .
+                    'Key was: ' . var_export($inputKeyAlgo, true) . '; message was: ' .
                     var_export($symKeyAlgo, true)
                 );
             }
@@ -480,7 +480,7 @@ 
 
         $algorithm = $symmetricKey->getAlgorithm();
         if (in_array($algorithm, $blacklist, true)) {
-            throw new \Exception('Algorithm disabled: '.var_export($algorithm, true));
+            throw new \Exception('Algorithm disabled: ' . var_export($algorithm, true));
         }
 
         /**
@@ -494,9 +494,9 @@ 
          * tree was serialized for encryption. In that case, we may miss the
          * namespaces needed to parse the XML.
          */
-        $xml = '<root xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" '.
-                        'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'.
-            $decrypted.
+        $xml = '<root xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ' .
+                        'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' .
+            $decrypted .
             '</root>';
 
         try {
@@ -533,7 +533,7 @@ 
              * Something went wrong during decryption, but for security
              * reasons we cannot tell the user what failed.
              */
-            Utils::getContainer()->getLogger()->error('Decryption failed: '.$e->getMessage());
+            Utils::getContainer()->getLogger()->error('Decryption failed: ' . $e->getMessage());
             throw new \Exception('Failed to decrypt XML element.', 0, $e);
         }
     }
@@ -697,7 +697,7 @@ 
         $regex = '/^(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d)T(\\d\\d):(\\d\\d):(\\d\\d)(?:\\.\\d{1,9})?Z$/D';
         if (preg_match($regex, $time, $matches) == 0) {
             throw new \Exception(
-                'Invalid SAML2 timestamp passed to xsDateTimeToTimestamp: '.$time
+                'Invalid SAML2 timestamp passed to xsDateTimeToTimestamp: ' . $time
             );
         }
 

src/SAML2/Message.php

Spacing +4 added lines, -4 removed lines

@@ -156,7 +156,7 @@ 
 
         if ($xml->getAttribute('Version') !== '2.0') {
             /* Currently a very strict check. */
-            throw new \Exception('Unsupported version: '.$xml->getAttribute('Version'));
+            throw new \Exception('Unsupported version: ' . $xml->getAttribute('Version'));
         }
 
         $this->issueInstant = Utils::xsDateTimeToTimestamp($xml->getAttribute('IssueInstant'));
@@ -437,7 +437,7 @@ 
     {
         $this->document = DOMDocumentFactory::create();
 
-        $root = $this->document->createElementNS(Constants::NS_SAMLP, 'samlp:'.$this->tagName);
+        $root = $this->document->createElementNS(Constants::NS_SAMLP, 'samlp:' . $this->tagName);
         $this->document->appendChild($root);
 
         /* Ugly hack to add another namespace declaration to the root element. */
@@ -560,7 +560,7 @@ 
     public static function fromXML(\DOMElement $xml) : Message
     {
         if ($xml->namespaceURI !== Constants::NS_SAMLP) {
-            throw new \Exception('Unknown namespace of SAML message: '.var_export($xml->namespaceURI, true));
+            throw new \Exception('Unknown namespace of SAML message: ' . var_export($xml->namespaceURI, true));
         }
 
         switch ($xml->localName) {
@@ -579,7 +579,7 @@ 
             case 'ArtifactResolve':
                 return new ArtifactResolve($xml);
             default:
-                throw new \Exception('Unknown SAML message: '.var_export($xml->localName, true));
+                throw new \Exception('Unknown SAML message: ' . var_export($xml->localName, true));
         }
     }
 

src/SAML2/Binding.php

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
             case Constants::BINDING_PAOS:
                 return new SOAP();
             default:
-                throw new \Exception('Unsupported binding: '.var_export($urn, true));
+                throw new \Exception('Unsupported binding: ' . var_export($urn, true));
         }
     }
 
@@ -93,15 +93,15 @@ 
 
         $logger = Utils::getContainer()->getLogger();
         $logger->warning('Unable to find the SAML 2 binding used for this request.');
-        $logger->warning('Request method: '.var_export($_SERVER['REQUEST_METHOD'], true));
+        $logger->warning('Request method: ' . var_export($_SERVER['REQUEST_METHOD'], true));
         if (!empty($_GET)) {
-            $logger->warning("GET parameters: '".implode("', '", array_map('addslashes', array_keys($_GET)))."'");
+            $logger->warning("GET parameters: '" . implode("', '", array_map('addslashes', array_keys($_GET))) . "'");
         }
         if (!empty($_POST)) {
-            $logger->warning("POST parameters: '".implode("', '", array_map('addslashes', array_keys($_POST)))."'");
+            $logger->warning("POST parameters: '" . implode("', '", array_map('addslashes', array_keys($_POST))) . "'");
         }
         if (isset($_SERVER['CONTENT_TYPE'])) {
-            $logger->warning('Content-Type: '.var_export($_SERVER['CONTENT_TYPE'], true));
+            $logger->warning('Content-Type: ' . var_export($_SERVER['CONTENT_TYPE'], true));
         }
 
         throw new \Exception('Unable to find the SAML 2 binding used for this request.');

src/SAML2/XML/md/ContactPerson.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
      */
     private static function getStringElements(\DOMElement $parent, string $name) : array
     {
-        $e = Utils::xpQuery($parent, './saml_metadata:'.$name);
+        $e = Utils::xpQuery($parent, './saml_metadata:' . $name);
 
         $ret = [];
         foreach ($e as $i) {
@@ -146,7 +146,7 @@ 
             return null;
         }
         if (count($e) > 1) {
-            throw new \Exception('More than one '.$name.' in '.$parent->tagName);
+            throw new \Exception('More than one ' . $name . ' in ' . $parent->tagName);
         }
 
         return $e[0];

src/SAML2/XML/md/RoleDescriptor.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
         }
 
         if (!$xml->hasAttribute('protocolSupportEnumeration')) {
-            throw new \Exception('Missing protocolSupportEnumeration attribute on '.$xml->localName);
+            throw new \Exception('Missing protocolSupportEnumeration attribute on ' . $xml->localName);
         }
         $this->protocolSupportEnumeration = preg_split('/[\s]+/', $xml->getAttribute('protocolSupportEnumeration'));
 

src/SAML2/Compat/Ssp/Logger.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
     public function emergency($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::emergency($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::emergency($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 
@@ -43,7 +43,7 @@ 
     public function alert($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::alert($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::alert($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 
@@ -61,7 +61,7 @@ 
     public function critical($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::critical($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::critical($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 
@@ -78,7 +78,7 @@ 
     public function error($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::error($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::error($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 
@@ -97,7 +97,7 @@ 
     public function warning($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::warning($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::warning($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 
@@ -113,7 +113,7 @@ 
     public function notice($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::notice($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::notice($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 
@@ -131,7 +131,7 @@ 
     public function info($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::info($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::info($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 
@@ -147,7 +147,7 @@ 
     public function debug($message, array $context = []) : void
     {
         /** @psalm-suppress UndefinedClass */
-        SspLogger::debug($message.($context ? " ".var_export($context, true) : ""));
+        SspLogger::debug($message . ($context ? " " . var_export($context, true) : ""));
     }
 
 

src/SAML2/SOAPClient.php

Spacing +6 added lines, -6 removed lines

@@ -66,8 +66,8 @@ 
             $privateKey = Crypto::loadPrivateKey($srcMetadata);
             $publicKey = Crypto::loadPublicKey($srcMetadata);
             if ($privateKey !== null && $publicKey !== null && isset($publicKey['PEM'])) {
-                $keyCertData = $privateKey['PEM'].$publicKey['PEM'];
-                $file = $container->getTempDir().'/'.sha1($keyCertData).'.pem';
+                $keyCertData = $privateKey['PEM'] . $publicKey['PEM'];
+                $file = $container->getTempDir() . '/' . sha1($keyCertData) . '.pem';
                 if (!file_exists($file)) {
                     $container->writeFile($file, $keyCertData);
                 }
@@ -86,11 +86,11 @@ 
                 if ($key['type'] !== 'X509Certificate') {
                     continue;
                 }
-                $certData .= "-----BEGIN CERTIFICATE-----\n".
-                    chunk_split($key['X509Certificate'], 64).
+                $certData .= "-----BEGIN CERTIFICATE-----\n" .
+                    chunk_split($key['X509Certificate'], 64) .
                     "-----END CERTIFICATE-----\n";
             }
-            $peerCertFile = $container->getTempDir().'/'.sha1($certData).'.pem';
+            $peerCertFile = $container->getTempDir() . '/' . sha1($certData) . '.pem';
             if (!file_exists($peerCertFile)) {
                 $container->writeFile($peerCertFile, $certData);
             }
@@ -124,7 +124,7 @@ 
 
         // Add soap-envelopes
         $request = $msg->toSignedXML();
-        $request = self::START_SOAP_ENVELOPE.$request->ownerDocument->saveXML($request).self::END_SOAP_ENVELOPE;
+        $request = self::START_SOAP_ENVELOPE . $request->ownerDocument->saveXML($request) . self::END_SOAP_ENVELOPE;
 
         $container->debugMessage($request, 'out');