simplesamlphp / saml2

src/SAML2/EncryptedAssertion.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
                 break;
 
             default:
-                throw new \Exception('Unknown key type for encryption: ' . $key->type);
+                throw new \Exception('Unknown key type for encryption: '.$key->type);
         }
 
         $this->encryptedData = $enc->encryptNode($symmetricKey);
@@ -112,7 +112,7 @@ 
             $document = $parentElement->ownerDocument;
         }
 
-        $root = $document->createElementNS(Constants::NS_SAML, 'saml:' . 'EncryptedAssertion');
+        $root = $document->createElementNS(Constants::NS_SAML, 'saml:'.'EncryptedAssertion');
         $parentElement->appendChild($root);
 
         $root->appendChild($document->importNode($this->encryptedData, true));

src/SAML2/HTTPArtifact.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
         }
 
         $generatedId = pack('H*', ((string) SimpleSAML_Utilities::stringToHex(SimpleSAML_Utilities::generateRandomBytes(20))));
-        $artifact = base64_encode("\x00\x04\x00\x00" . sha1($message->getIssuer(), true) . $generatedId) ;
+        $artifact = base64_encode("\x00\x04\x00\x00".sha1($message->getIssuer(), true).$generatedId);
         $artifactData = $message->toUnsignedXML();
         $artifactDataString = $artifactData->ownerDocument->saveXML($artifactData);
 
@@ -77,7 +77,7 @@ 
     {
         if (array_key_exists('SAMLart', $_REQUEST)) {
             $artifact = base64_decode($_REQUEST['SAMLart']);
-            $endpointIndex =  bin2hex(substr($artifact, 2, 2));
+            $endpointIndex = bin2hex(substr($artifact, 2, 2));
             $sourceId = bin2hex(substr($artifact, 4, 20));
         } else {
             throw new \Exception('Missing SAMLArt parameter.');
@@ -88,12 +88,12 @@ 
         $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;
         foreach ($idpMetadata->getEndpoints('ArtifactResolutionService') as $ep) {
-            if ($ep['index'] ===  hexdec($endpointIndex)) {
+            if ($ep['index'] === hexdec($endpointIndex)) {
                 $endpoint = $ep;
                 break;
             }
@@ -103,7 +103,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/LogoutRequest.php

Spacing +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
         if ($this->encryptedNameId === null) {
             Utils::addNameId($root, $this->nameId);
         } else {
-            $eid = $root->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:' . 'EncryptedID');
+            $eid = $root->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:'.'EncryptedID');
             $root->appendChild($eid);
             $eid->appendChild($root->ownerDocument->importNode($this->encryptedNameId, true));
         }

src/SAML2/Message.php

Spacing +4 added lines, -4 removed lines

@@ -149,7 +149,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'));
@@ -401,7 +401,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. */
@@ -527,7 +527,7 @@ 
     public static function fromXML(\DOMElement $xml)
     {
         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) {
@@ -546,7 +546,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/SOAPClient.php

Spacing +7 added lines, -7 removed lines

@@ -51,8 +51,8 @@ 
             $privateKey = SimpleSAML_Utilities::loadPrivateKey($srcMetadata);
             $publicKey = SimpleSAML_Utilities::loadPublicKey($srcMetadata);
             if ($privateKey !== null && $publicKey !== null && isset($publicKey['PEM'])) {
-                $keyCertData = $privateKey['PEM'] . $publicKey['PEM'];
-                $file = SimpleSAML_Utilities::getTempDir() . '/' . sha1($keyCertData) . '.pem';
+                $keyCertData = $privateKey['PEM'].$publicKey['PEM'];
+                $file = SimpleSAML_Utilities::getTempDir().'/'.sha1($keyCertData).'.pem';
                 if (!file_exists($file)) {
                     SimpleSAML_Utilities::writeFile($file, $keyCertData);
                 }
@@ -71,11 +71,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 = SimpleSAML_Utilities::getTempDir() . '/' . sha1($certData) . '.pem';
+            $peerCertFile = SimpleSAML_Utilities::getTempDir().'/'.sha1($certData).'.pem';
             if (!file_exists($peerCertFile)) {
                 SimpleSAML_Utilities::writeFile($peerCertFile, $certData);
             }
@@ -100,7 +100,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;
 
         Utils::getContainer()->debugMessage($request, 'out');
 
@@ -225,7 +225,7 @@ 
         // There is a fault element but we haven't found out what the fault string is
         $soapFaultString = "Unknown fault string found";
         // find out the fault string
-        $faultStringElement =   Utils::xpQuery($soapFaultElement, './soap-env:faultstring') ;
+        $faultStringElement = Utils::xpQuery($soapFaultElement, './soap-env:faultstring');
         if (!empty($faultStringElement)) {
             return $faultStringElement[0]->textContent;
         }

src/SAML2/Signature/PublicKeyValidator.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         CertificateProvider $configuration
     ) {
         $logger = $this->logger;
-        $pemCandidates = $this->configuredKeys->filter(function (Key $key) use ($logger) {
+        $pemCandidates = $this->configuredKeys->filter(function(Key $key) use ($logger) {
             if (!$key instanceof X509) {
                 $logger->debug(sprintf('Skipping unknown key type: "%s"', $key['type']));
                 return false;

src/SAML2/Utilities/ArrayCollection.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     {
         if ($this->count() !== 1) {
             throw new RuntimeException(sprintf(
-                __CLASS__ . '::' . __METHOD__ . ' requires that the collection has exactly one element, '
+                __CLASS__.'::'.__METHOD__.' requires that the collection has exactly one element, '
                 . '"%d" elements found',
                 $this->count()
             ));

src/SAML2/Utils.php

Spacing +18 added lines, -18 removed lines

@@ -165,7 +165,7 @@ 
         }
 
         /* Check the signature. */
-        if (! $objXMLSecDSig->verify($key)) {
+        if (!$objXMLSecDSig->verify($key)) {
             throw new \Exception("Unable to validate Signature");
         }
     }
@@ -246,7 +246,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__');
         }
 
@@ -279,7 +279,7 @@ 
             case 'true':
                 return true;
             default:
-                throw new \Exception('Invalid value of boolean attribute ' . var_export($attributeName, true) . ': ' . var_export($value, true));
+                throw new \Exception('Invalid value of boolean attribute '.var_export($attributeName, true).': '.var_export($value, true));
         }
     }
 
@@ -411,7 +411,7 @@ 
             $symKeyInfoAlgo = $symmetricKeyInfo->getAlgorith();
 
             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) {
@@ -427,9 +427,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)
                 );
             }
@@ -443,20 +443,20 @@ 
                 /* To protect against "key oracle" attacks, we need to be able to create a
                  * 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));
+                throw new \Exception('Unknown key size for encryption algorithm: '.var_export($symmetricKey->type, true));
             }
 
             try {
                 $key = $encKey->decryptKey($symmetricKeyInfo);
                 if (strlen($key) != $keySize) {
                     throw new \Exception(
-                        'Unexpected key size (' . strlen($key) * 8 . 'bits) for encryption algorithm: ' .
+                        'Unexpected key size ('.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. */
 
                 /* We base the symmetric key on the encrypted key and private key, so that we always behave the
@@ -465,7 +465,7 @@ 
                 $encryptedKey = $encKey->getCipherValue();
                 $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) {
@@ -480,8 +480,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)
                 );
             }
@@ -490,7 +490,7 @@ 
 
         $algorithm = $symmetricKey->getAlgorith();
         if (in_array($algorithm, $blacklist, true)) {
-            throw new \Exception('Algorithm disabled: ' . var_export($algorithm, true));
+            throw new \Exception('Algorithm disabled: '.var_export($algorithm, true));
         }
 
         /** @var string $decrypted */
@@ -502,8 +502,8 @@ 
          * 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 .
+                     'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'.
+            $decrypted.
             '</root>';
 
         try {
@@ -542,7 +542,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);
         }
     }
@@ -704,7 +704,7 @@ 
         $regex = '/^(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d)T(\\d\\d):(\\d\\d):(\\d\\d)(?:\\.\\d+)?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/XML/md/ContactPerson.php

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
     {
         assert('is_string($name)');
 
-        $e = Utils::xpQuery($parent, './saml_metadata:' . $name);
+        $e = Utils::xpQuery($parent, './saml_metadata:'.$name);
 
         $ret = array();
         foreach ($e as $i) {
@@ -127,7 +127,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];