simplesamlphp / saml2

src/SAML2/Certificate/KeyLoader.php

Doc Comments +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
      * are not configured to be used with the usage given
      *
      * @param array $configuredKeys
-     * @param       $usage
+     * @param       null|string $usage
      */
     public function loadKeys(array $configuredKeys, $usage)
     {

src/SAML2/Utils.php

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
      *
      * @param  DOMElement $node          The element we should fetch the attribute from.
      * @param  string     $attributeName The name of the attribute.
-     * @param  mixed      $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
      */

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 +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/mdui/Keywords.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
             if (strpos($keyword, "+") !== FALSE) {
                 throw new Exception('Keywords may not contain a "+" character.');
             }
-            $value .= str_replace(' ', '+', $keyword) . ' ';
+            $value .= str_replace(' ', '+', $keyword).' ';
         }
         $value = rtrim($value);
         $e->appendChild($doc->createTextNode($value));

src/SAML2/SignedElementHelper.php

Spacing +2 added lines, -2 removed lines

@@ -173,8 +173,8 @@
         foreach ($this->certificates as $cert) {
 
             /* We have found a matching fingerprint. */
-            $pemCert = "-----BEGIN CERTIFICATE-----\n" .
-                chunk_split($cert, 64) .
+            $pemCert = "-----BEGIN CERTIFICATE-----\n".
+                chunk_split($cert, 64).
                 "-----END CERTIFICATE-----\n";
 
             /* Extract the public key from the certificate for validation. */

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 +7 added lines, -7 removed lines

@@ -657,7 +657,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()
     {
@@ -785,7 +785,7 @@ 
      * This function returns null if there are no restrictions on how early the
      * assertion can be used.
      *
-     * @return int|null The earliest timestamp this assertion is valid.
+     * @return integer The earliest timestamp this assertion is valid.
      */
     public function getNotBefore()
     {
@@ -812,7 +812,7 @@ 
      * This function returns null if there are no restrictions on how
      * late the assertion can be used.
      *
-     * @return int|null The latest timestamp this assertion is valid.
+     * @return integer The latest timestamp this assertion is valid.
      */
     public function getNotOnOrAfter()
     {
@@ -870,7 +870,7 @@ 
     /**
      * Retrieve the AuthnInstant of the assertion.
      *
-     * @return int|null The timestamp the user was authenticated, or NULL if the user isn't authenticated.
+     * @return integer The timestamp the user was authenticated, or NULL if the user isn't authenticated.
      */
     public function getAuthnInstant()
     {
@@ -1032,7 +1032,7 @@ 
      * See:
      * @url http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
      *
-     * @return \SAML2\XML\Chunk|null
+     * @return Chunk
      */
     public function getAuthnContextDecl()
     {
@@ -1062,7 +1062,7 @@ 
      *
      * The URI reference MAY directly resolve into an XML document containing the referenced declaration.
      *
-     * @return string
+     * @return Chunk
      */
     public function getAuthnContextDeclRef()
     {
@@ -1094,7 +1094,7 @@ 
     /**
      * Retrieve all attributes.
      *
-     * @return array All attributes, as an associative array.
+     * @return \DOMElement[] All attributes, as an associative array.
      */
     public function getAttributes()
     {

Spacing +5 added lines, -5 removed lines

@@ -240,7 +240,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'));
@@ -340,7 +340,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':
@@ -363,7 +363,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));
             }
         }
     }
@@ -1244,7 +1244,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. */
@@ -1296,7 +1296,7 @@ 
         if ($this->encryptedNameId === null) {
             Utils::addNameId($subject, $this->nameId);
         } 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/Configuration/SimpleSAMLConverter.php

Spacing +7 added lines, -7 removed lines

@@ -51,25 +51,25 @@
 
         // ported from
         // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1092
-        if ($configuration->hasValue($prefix . 'keys')) {
-            $extracted['keys'] = $configuration->getArray($prefix . 'keys');
+        if ($configuration->hasValue($prefix.'keys')) {
+            $extracted['keys'] = $configuration->getArray($prefix.'keys');
         }
 
         // ported from
         // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1108
-        if ($configuration->hasValue($prefix . 'certData')) {
-            $extracted['certificateData'] = $configuration->getString($prefix . 'certData');
+        if ($configuration->hasValue($prefix.'certData')) {
+            $extracted['certificateData'] = $configuration->getString($prefix.'certData');
         }
 
         // ported from
         // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1119
-        if ($configuration->hasValue($prefix . 'certificate')) {
-            $extracted['certificateData'] = $configuration->getString($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/Signature/ValidatorChain.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
         throw new SAML2_Signature_MissingConfigurationException(sprintf(
             'No certificates or fingerprints have been configured%s',
-            $configuration->has('entityid') ? ' for "' . $configuration->get('entityid') . '"' : ''
+            $configuration->has('entityid') ? ' for "'.$configuration->get('entityid').'"' : ''
         ));
     }
 }

src/SAML2/Signature/FingerprintValidator.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         SAML2_SignedElement $signedElement,
         SAML2_Configuration_CertificateProvider $configuration
     ) {
-        $this->certificates = array_map(function ($certificate) {
+        $this->certificates = array_map(function($certificate) {
             return SAML2_Certificate_X509::createFromCertificateData($certificate);
         }, $this->certificates);