simplesamlphp / saml2

src/SAML2/Utils.php

Indentation +1 added lines, -1 removed lines

@@ -493,7 +493,7 @@
          * 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">' .
+                        'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' .
             $decrypted .
             '</root>';
 

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
             );
         }
 

Doc Comments +1 added lines, -1 removed lines

@@ -269,7 +269,7 @@
      *
      * @param  \DOMElement $node          The element we should fetch the attribute from.
      * @param  string     $attributeName The name of the attribute.
-     * @param  mixed|null $default       The value that should be returned if the attribute doesn't exist.
+     * @param  false|null $default       The value that should be returned if the attribute doesn't exist.
      * @return bool|mixed The value of the attribute, or $default if the attribute doesn't exist.
      * @throws \Exception
      */

src/SAML2/Response/Validation/ConstraintValidator/IsSuccessful.php

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
         return sprintf(
             '%s%s%s',
             $this->truncateStatus($responseStatus['Code']),
-            $responseStatus['SubCode'] ? '/' . $this->truncateStatus($responseStatus['SubCode']) : '',
-            $responseStatus['Message'] ? ' ' . $responseStatus['Message'] : ''
+            $responseStatus['SubCode'] ? '/'.$this->truncateStatus($responseStatus['SubCode']) : '',
+            $responseStatus['Message'] ? ' '.$responseStatus['Message'] : ''
         );
     }
 

src/SAML2/Assertion.php

Indentation +5 added lines, -5 removed lines

@@ -62,11 +62,11 @@
      */
     private $encryptionKey;
 
-     /**
-     * The earliest time this assertion is valid, as an UNIX timestamp.
-     *
-     * @var int
-     */
+        /**
+         * The earliest time this assertion is valid, as an UNIX timestamp.
+         *
+         * @var int
+         */
     private $notBefore;
 
     /**

Doc Comments +2 added lines, -2 removed lines

@@ -694,7 +694,7 @@ 
     /**
      * Check whether the NameId is encrypted.
      *
-     * @return true if the NameId is encrypted, false if not.
+     * @return boolean if the NameId is encrypted, false if not.
      */
     public function isNameIdEncrypted()
     {
@@ -1096,7 +1096,7 @@ 
      *
      * The URI reference MAY directly resolve into an XML document containing the referenced declaration.
      *
-     * @return string
+     * @return Chunk
      */
     public function getAuthnContextDeclRef()
     {

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use RobRichards\XMLSecLibs\XMLSecEnc;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
-use SAML2\Exception\RuntimeException;
 use SAML2\Utilities\Temporal;
 use SAML2\XML\Chunk;
 use SAML2\XML\saml\SubjectConfirmation;

Spacing +6 added lines, -6 removed lines

@@ -282,7 +282,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'));
@@ -384,7 +384,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':
@@ -407,7 +407,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));
             }
         }
     }
@@ -1305,7 +1305,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. */
@@ -1361,7 +1361,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));
         }
@@ -1513,7 +1513,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/LogoutRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
     /**
      * Check whether the NameId is encrypted.
      *
-     * @return true if the NameId is encrypted, false if not.
+     * @return boolean if the NameId is encrypted, false if not.
      */
     public function isNameIdEncrypted()
     {

Spacing +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
         if ($this->encryptedNameId === 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->encryptedNameId, true));
         }

src/SAML2/Response/Processor.php

Doc Comments +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
      * @param \SAML2\Configuration\Destination      $currentDestination
      * @param \SAML2\Response                       $response
      *
-     * @return \SAML2\Assertion[] Collection (\SAML2\Utilities\ArrayCollection) of \SAML2\Assertion objects
+     * @return \SAML2\Utilities\ArrayCollection Collection (\SAML2\Utilities\ArrayCollection) of \SAML2\Assertion objects
      */
     public function process(
         ServiceProvider $serviceProviderConfiguration,
@@ -134,7 +134,7 @@ 
     /**
      * @param \SAML2\Response $response
      *
-     * @return \SAML2\Assertion[]
+     * @return \SAML2\Utilities\ArrayCollection
      */
     private function processAssertions(Response $response)
     {

src/SAML2/Constants.php

Indentation +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
     const CM_BEARER = 'urn:oasis:names:tc:SAML:2.0:cm:bearer';
 
     /**
-    * Holder-of-Key subject confirmation method.
-    */
+     * Holder-of-Key subject confirmation method.
+     */
     const CM_HOK = 'urn:oasis:names:tc:SAML:2.0:cm:holder-of-key';
     
     /**

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/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()
             ));