simplesamlphp / saml2

src/SAML2/XML/md/EndpointType.php

Spacing +7 added lines, -7 removed lines

@@ -52,12 +52,12 @@ 
         }
 
         if (!$xml->hasAttribute('Binding')) {
-            throw new \Exception('Missing Binding on ' . $xml->tagName);
+            throw new \Exception('Missing Binding on '.$xml->tagName);
         }
         $this->Binding = $xml->getAttribute('Binding');
 
         if (!$xml->hasAttribute('Location')) {
-            throw new \Exception('Missing Location on ' . $xml->tagName);
+            throw new \Exception('Missing Location on '.$xml->tagName);
         }
         $this->Location = $xml->getAttribute('Location');
 
@@ -69,7 +69,7 @@ 
             if ($a->namespaceURI === null) {
                 continue; /* Not namespace-qualified -- skip. */
             }
-            $fullName = '{' . $a->namespaceURI . '}' . $a->localName;
+            $fullName = '{'.$a->namespaceURI.'}'.$a->localName;
             $this->attributes[$fullName] = array(
                 'qualifiedName' => $a->nodeName,
                 'namespaceURI' => $a->namespaceURI,
@@ -90,7 +90,7 @@ 
         assert('is_string($namespaceURI)');
         assert('is_string($localName)');
 
-        $fullName = '{' . $namespaceURI . '}' . $localName;
+        $fullName = '{'.$namespaceURI.'}'.$localName;
 
         return isset($this->attributes[$fullName]);
     }
@@ -107,7 +107,7 @@ 
         assert('is_string($namespaceURI)');
         assert('is_string($localName)');
 
-        $fullName = '{' . $namespaceURI . '}' . $localName;
+        $fullName = '{'.$namespaceURI.'}'.$localName;
         if (!isset($this->attributes[$fullName])) {
             return '';
         }
@@ -134,7 +134,7 @@ 
         }
         $localName = $name[1];
 
-        $fullName = '{' . $namespaceURI . '}' . $localName;
+        $fullName = '{'.$namespaceURI.'}'.$localName;
         $this->attributes[$fullName] = array(
             'qualifiedName' => $qualifiedName,
             'namespaceURI' => $namespaceURI,
@@ -153,7 +153,7 @@ 
         assert('is_string($namespaceURI)');
         assert('is_string($localName)');
 
-        $fullName = '{' . $namespaceURI . '}' . $localName;
+        $fullName = '{'.$namespaceURI.'}'.$localName;
         unset($this->attributes[$fullName]);
     }
 

src/SAML2/XML/md/IndexedEndpointType.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         }
 
         if (!$xml->hasAttribute('index')) {
-            throw new \Exception('Missing index on ' . $xml->tagName);
+            throw new \Exception('Missing index on '.$xml->tagName);
         }
         $this->index = (int) $xml->getAttribute('index');
 

src/SAML2/XML/md/RoleDescriptor.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,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/HTTPRedirect.php

Spacing +11 added lines, -11 removed lines

@@ -49,21 +49,21 @@ 
         $msg .= urlencode($msgStr);
 
         if ($relayState !== null) {
-            $msg .= '&RelayState=' . urlencode($relayState);
+            $msg .= '&RelayState='.urlencode($relayState);
         }
 
         if ($key !== null) {
             /* Add the signature. */
-            $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;
@@ -79,7 +79,7 @@ 
     public function send(Message $message)
     {
         $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);
     }
 
@@ -106,7 +106,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);
@@ -182,18 +182,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/Compat/Ssp/Logger.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function emergency($message, array $context = array())
     {
-        \SimpleSAML\Logger::emergency($message . var_export($context, true));
+        \SimpleSAML\Logger::emergency($message.var_export($context, true));
     }
 
     /**
@@ -30,7 +30,7 @@ 
      */
     public function alert($message, array $context = array())
     {
-        \SimpleSAML\Logger::alert($message . var_export($context, true));
+        \SimpleSAML\Logger::alert($message.var_export($context, true));
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     public function critical($message, array $context = array())
     {
-        \SimpleSAML\Logger::critical($message . var_export($context, true));
+        \SimpleSAML\Logger::critical($message.var_export($context, true));
     }
 
     /**
@@ -57,7 +57,7 @@ 
      */
     public function error($message, array $context = array())
     {
-        \SimpleSAML\Logger::error($message . var_export($context, true));
+        \SimpleSAML\Logger::error($message.var_export($context, true));
     }
 
     /**
@@ -72,7 +72,7 @@ 
      */
     public function warning($message, array $context = array())
     {
-        \SimpleSAML\Logger::warning($message . var_export($context, true));
+        \SimpleSAML\Logger::warning($message.var_export($context, true));
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     public function notice($message, array $context = array())
     {
-        \SimpleSAML\Logger::notice($message . var_export($context, true));
+        \SimpleSAML\Logger::notice($message.var_export($context, true));
     }
 
     /**
@@ -98,7 +98,7 @@ 
      */
     public function info($message, array $context = array())
     {
-        \SimpleSAML\Logger::info($message . var_export($context, true));
+        \SimpleSAML\Logger::info($message.var_export($context, true));
     }
 
     /**
@@ -110,7 +110,7 @@ 
      */
     public function debug($message, array $context = array())
     {
-        \SimpleSAML\Logger::debug($message . var_export($context, true));
+        \SimpleSAML\Logger::debug($message.var_export($context, true));
     }
 
     /**

src/SAML2/Utils.php

Spacing +17 added lines, -17 removed lines

@@ -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));
         }
     }
 
@@ -415,7 +415,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) {
@@ -431,9 +431,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)
                 );
             }
@@ -447,20 +447,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
@@ -469,7 +469,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) {
@@ -484,8 +484,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)
                 );
             }
@@ -494,7 +494,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 */
@@ -506,8 +506,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 {
@@ -546,7 +546,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);
         }
     }
@@ -708,7 +708,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/mdui/DiscoHints.php

Spacing +2 added lines, -2 removed lines

@@ -54,8 +54,8 @@
             return;
         }
 
-        $this->IPHint =          Utils::extractStrings($xml, Common::NS, 'IPHint');
-        $this->DomainHint =      Utils::extractStrings($xml, Common::NS, 'DomainHint');
+        $this->IPHint = Utils::extractStrings($xml, Common::NS, 'IPHint');
+        $this->DomainHint = Utils::extractStrings($xml, Common::NS, 'DomainHint');
         $this->GeolocationHint = Utils::extractStrings($xml, Common::NS, 'GeolocationHint');
 
         foreach (Utils::xpQuery($xml, "./*[namespace-uri()!='".Common::NS."']") as $node) {

src/SAML2/Assertion.php

Spacing +6 added lines, -6 removed lines

@@ -260,7 +260,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'));
@@ -362,7 +362,7 @@ 
                 continue;
             }
             if ($node->namespaceURI !== Constants::NS_SAML) {
-                throw new \Exception('Unknown namespace of condition: ' . var_export($node->namespaceURI, true));
+                throw new \Exception('Unknown namespace of condition: '.var_export($node->namespaceURI, true));
             }
             switch ($node->localName) {
                 case 'AudienceRestriction':
@@ -385,7 +385,7 @@ 
                     /* Currently ignored. */
                     break;
                 default:
-                    throw new \Exception('Unknown condition: ' . var_export($node->localName, true));
+                    throw new \Exception('Unknown condition: '.var_export($node->localName, true));
             }
         }
     }
@@ -566,7 +566,7 @@ 
 
             $type = $value->getAttribute('xsi:type');
             if ($type === 'xs:integer') {
-                $this->attributes[$attributeName][] = (int)$value->textContent;
+                $this->attributes[$attributeName][] = (int) $value->textContent;
             } else {
                 $this->attributes[$attributeName][] = trim($value->textContent);
             }
@@ -1324,7 +1324,7 @@ 
             $document = $parentElement->ownerDocument;
         }
 
-        $root = $document->createElementNS(Constants::NS_SAML, 'saml:' . 'Assertion');
+        $root = $document->createElementNS(Constants::NS_SAML, 'saml:'.'Assertion');
         $parentElement->appendChild($root);
 
         /* Ugly hack to add another namespace declaration to the root element. */
@@ -1380,7 +1380,7 @@ 
         if ($this->encryptedNameId === null) {
             $this->nameId->toXML($subject);
         } else {
-            $eid = $subject->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:' . 'EncryptedID');
+            $eid = $subject->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:'.'EncryptedID');
             $subject->appendChild($eid);
             $eid->appendChild($subject->ownerDocument->importNode($this->encryptedNameId, true));
         }

src/SAML2/HTTPArtifact.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,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);
 
@@ -81,7 +81,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.');
@@ -92,12 +92,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;
             }
@@ -107,7 +107,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();