simplesamlphp / saml2

src/SAML2/Assertion.php

Doc Comments +7 added lines, -7 removed lines

@@ -651,7 +651,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()
     {
@@ -779,7 +779,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()
     {
@@ -806,7 +806,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()
     {
@@ -864,7 +864,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()
     {
@@ -1026,7 +1026,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 SAML2_XML_Chunk
      */
     public function getAuthnContextDecl()
     {
@@ -1056,7 +1056,7 @@ 
      *
      * The URI reference MAY directly resolve into an XML document containing the referenced declaration.
      *
-     * @return string
+     * @return SAML2_XML_Chunk
      */
     public function getAuthnContextDeclRef()
     {
@@ -1088,7 +1088,7 @@ 
     /**
      * Retrieve all attributes.
      *
-     * @return array All attributes, as an associative array.
+     * @return DOMElement[] All attributes, as an associative array.
      */
     public function getAttributes()
     {

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;
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -232,7 +232,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 = SAML2_Utils::xsDateTimeToTimestamp($xml->getAttribute('IssueInstant'));
@@ -332,7 +332,7 @@ 
                 continue;
             }
             if ($node->namespaceURI !== SAML2_Const::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':
@@ -356,7 +356,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));
             }
         }
 
@@ -1238,7 +1238,7 @@ 
             $document = $parentElement->ownerDocument;
         }
 
-        $root = $document->createElementNS(SAML2_Const::NS_SAML, 'saml:' . 'Assertion');
+        $root = $document->createElementNS(SAML2_Const::NS_SAML, 'saml:'.'Assertion');
         $parentElement->appendChild($root);
 
         /* Ugly hack to add another namespace declaration to the root element. */
@@ -1290,7 +1290,7 @@ 
         if ($this->encryptedNameId === NULL) {
             SAML2_Utils::addNameId($subject, $this->nameId);
         } else {
-            $eid = $subject->ownerDocument->createElementNS(SAML2_Const::NS_SAML, 'saml:' . 'EncryptedID');
+            $eid = $subject->ownerDocument->createElementNS(SAML2_Const::NS_SAML, 'saml:'.'EncryptedID');
             $subject->appendChild($eid);
             $eid->appendChild($subject->ownerDocument->importNode($this->encryptedNameId, TRUE));
         }

src/SAML2/AuthnRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -563,7 +563,7 @@
      * The returned NameId is in the format used by SAML2_Utils::addNameId().
      *
      * @see SAML2_Utils::addNameId()
-     * @return array|NULL The name identifier of the assertion.
+     * @return string The name identifier of the assertion.
      * @throws Exception
      */
     public function getNameId()

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/LogoutRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -102,7 +102,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

@@ -259,7 +259,7 @@
         if ($this->encryptedNameId === NULL) {
             SAML2_Utils::addNameId($root, $this->nameId);
         } else {
-            $eid = $root->ownerDocument->createElementNS(SAML2_Const::NS_SAML, 'saml:' . 'EncryptedID');
+            $eid = $root->ownerDocument->createElementNS(SAML2_Const::NS_SAML, 'saml:'.'EncryptedID');
             $root->appendChild($eid);
             $eid->appendChild($root->ownerDocument->importNode($this->encryptedNameId, TRUE));
         }

src/SAML2/Response.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     /**
      * Retrieve the assertions in this response.
      *
-     * @return SAML2_Assertion[]|SAML2_EncryptedAssertion[]
+     * @return SAML2_Utilities_ArrayCollection
      */
     public function getAssertions()
     {

src/SAML2/Response/Processor.php

Doc Comments +2 added lines, -2 removed lines

@@ -50,7 +50,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(
         SAML2_Configuration_ServiceProvider $serviceProviderConfiguration,
@@ -120,7 +120,7 @@ 
     /**
      * @param SAML2_Response $response
      *
-     * @return SAML2_Assertion[]
+     * @return SAML2_Utilities_ArrayCollection
      */
     private function processAssertions(SAML2_Response $response)
     {

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

@@ -153,7 +153,7 @@ 
         }
 
         /* Check the signature. */
-        if (! $objXMLSecDSig->verify($key)) {
+        if (!$objXMLSecDSig->verify($key)) {
             throw new Exception("Unable to validate Signature");
         }
     }
@@ -235,7 +235,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__');
         }
 
@@ -268,7 +268,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));
         }
     }
 
@@ -401,7 +401,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) {
@@ -417,9 +417,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)
                 );
             }
@@ -433,20 +433,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. */
-                SAML2_Utils::getContainer()->getLogger()->error('Failed to decrypt symmetric key: ' . $e->getMessage());
+                SAML2_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
@@ -455,7 +455,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) {
@@ -471,8 +471,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)
                 );
             }
@@ -481,7 +481,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 */
@@ -493,8 +493,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 {
@@ -533,7 +533,7 @@ 
              * Something went wrong during decryption, but for security
              * reasons we cannot tell the user what failed.
              */
-            SAML2_Utils::getContainer()->getLogger()->error('Decryption failed: ' . $e->getMessage());
+            SAML2_Utils::getContainer()->getLogger()->error('Decryption failed: '.$e->getMessage());
             throw new Exception('Failed to decrypt XML element.', 0, $e);
         }
     }
@@ -695,7 +695,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/HTTPArtifact.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,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);
 
@@ -72,7 +72,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 {
@@ -84,12 +84,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;
             }
@@ -99,7 +99,7 @@ 
             throw new Exception('No ArtifactResolutionService with the correct index.');
         }
 
-        SAML2_Utils::getContainer()->getLogger()->debug("ArtifactResolutionService endpoint being used is := " . $endpoint['Location']);
+        SAML2_Utils::getContainer()->getLogger()->debug("ArtifactResolutionService endpoint being used is := ".$endpoint['Location']);
 
         //Construct the ArtifactResolve Request
         $ar = new SAML2_ArtifactResolve();

src/SAML2/XML/md/IndexedEndpointType.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,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');