simplesamlphp / saml2

src/SAML2/Assertion.php

Spacing +7 added lines, -7 removed lines

@@ -277,7 +277,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'));
@@ -379,7 +379,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':
@@ -402,7 +402,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));
             }
         }
     }
@@ -589,7 +589,7 @@ 
             }
             
             if ($type === 'xs:integer') {
-                $this->attributes[$attributeName][] = (int)$value->textContent;
+                $this->attributes[$attributeName][] = (int) $value->textContent;
             } else {
                 $this->attributes[$attributeName][] = trim($value->textContent);
             }
@@ -1367,7 +1367,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. */
@@ -1423,7 +1423,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));
         }
@@ -1575,7 +1575,7 @@ 
             if (is_array($this->attributesValueTypes) && array_key_exists($name, $this->attributesValueTypes)) {
                 $valueTypes = $this->attributesValueTypes[$name];
                 if (is_array($valueTypes) && count($valueTypes) != count($values)) {
-                    throw new \Exception('Array of value types and array of values have different size for attribute '. var_export($name, true));
+                    throw new \Exception('Array of value types and array of values have different size for attribute '.var_export($name, true));
                 }
             } else {
                 // if no type(s), default behaviour

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));
         }
     }
 
@@ -423,7 +423,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) {
@@ -439,9 +439,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)
                 );
             }
@@ -455,20 +455,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
@@ -477,7 +477,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) {
@@ -492,8 +492,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)
                 );
             }
@@ -502,7 +502,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));
         }
 
         /** @var string $decrypted */
@@ -514,8 +514,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 {
@@ -554,7 +554,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);
         }
     }
@@ -716,7 +716,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/Compat/Ssp/Logger.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function emergency($message, array $context = [])
     {
-        \SimpleSAML\Logger::emergency($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::emergency($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**
@@ -31,7 +31,7 @@ 
      */
     public function alert($message, array $context = [])
     {
-        \SimpleSAML\Logger::alert($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::alert($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**
@@ -45,7 +45,7 @@ 
      */
     public function critical($message, array $context = [])
     {
-        \SimpleSAML\Logger::critical($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::critical($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**
@@ -58,7 +58,7 @@ 
      */
     public function error($message, array $context = [])
     {
-        \SimpleSAML\Logger::error($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::error($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**
@@ -73,7 +73,7 @@ 
      */
     public function warning($message, array $context = [])
     {
-        \SimpleSAML\Logger::warning($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::warning($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**
@@ -85,7 +85,7 @@ 
      */
     public function notice($message, array $context = [])
     {
-        \SimpleSAML\Logger::notice($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::notice($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**
@@ -99,7 +99,7 @@ 
      */
     public function info($message, array $context = [])
     {
-        \SimpleSAML\Logger::info($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::info($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**
@@ -111,7 +111,7 @@ 
      */
     public function debug($message, array $context = [])
     {
-        \SimpleSAML\Logger::debug($message . ($context ? " " . var_export($context, true) : ""));
+        \SimpleSAML\Logger::debug($message.($context ? " ".var_export($context, true) : ""));
     }
 
     /**

src/SAML2/AttributeQuery.php

Spacing +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
                     $type = null;
                 }
 
-                $attributeValue = Utils::addString($attribute, Constants::NS_SAML, 'saml:AttributeValue', (string)$value);
+                $attributeValue = Utils::addString($attribute, Constants::NS_SAML, 'saml:AttributeValue', (string) $value);
                 if ($type !== null) {
                     $attributeValue->setAttributeNS(Constants::NS_XSI, 'xsi:type', $type);
                 }

src/SAML2/Configuration/SimpleSAMLConverter.php

Spacing +2 added lines, -2 removed lines

@@ -67,13 +67,13 @@
 
         // ported from
         // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1119
-        if ($configuration->hasValue($prefix . 'certificate')) {
+        if ($configuration->hasValue($prefix.'certificate')) {
             $extracted['certificateData'] = $configuration->getString($prefix.'certificate');
         }
 
         // ported from
         // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/modules/saml/lib/Message.php#L161
-        if ($configuration->hasValue($prefix . 'certFingerprint')) {
+        if ($configuration->hasValue($prefix.'certFingerprint')) {
             $extracted['certificateFingerprint'] = $configuration->getArrayizeString('certFingerprint');
         }
 

src/SAML2/HTTPArtifact.php

Spacing +2 added lines, -2 removed lines

@@ -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.');
@@ -97,7 +97,7 @@ 
 
         $endpoint = null;
         foreach ($idpMetadata->getEndpoints('ArtifactResolutionService') as $ep) {
-            if ($ep['index'] ===  hexdec($endpointIndex)) {
+            if ($ep['index'] === hexdec($endpointIndex)) {
                 $endpoint = $ep;
                 break;
             }

src/SAML2/LogoutRequest.php

Spacing +1 added lines, -1 removed lines

@@ -284,7 +284,7 @@
         if ($this->getEncryptedNameId() === null) {
             $this->nameId->toXML($root);
         } 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->getEncryptedNameId(), true));
         }

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->setIndex(intval($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->setProtocolSupportEnumeration(preg_split('/[\s]+/', $xml->getAttribute('protocolSupportEnumeration')));