simplesamlphp / saml2

src/SAML2/Assertion.php

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

Doc Comments +1 added lines, -1 removed lines

@@ -569,7 +569,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/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) {
             Utils::addNameId($root, $this->nameId);
         } 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.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     /**
      * Retrieve the assertions in this response.
      *
-     * @return \SAML2\Assertion[]|\SAML2\EncryptedAssertion[]
+     * @return Utilities\ArrayCollection
      */
     public function getAssertions()
     {

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

Doc Comments +4 added lines

@@ -212,6 +212,10 @@
      * @param $soapmessage Soap response needs to be type DOMDocument
      * @return $soapfaultstring string|null
      */
+
+    /**
+     * @param \DOMDocument $soapMessage
+     */
     private function getSOAPFault($soapMessage)
     {
         $soapFault = Utils::xpQuery($soapMessage->firstChild, '/soap-env:Envelope/soap-env:Body/soap-env:Fault');

Spacing +7 added lines, -7 removed lines

@@ -51,8 +51,8 @@ 
             $privateKey = SimpleSAML_Utilities::loadPrivateKey($srcMetadata);
             $publicKey = SimpleSAML_Utilities::loadPublicKey($srcMetadata);
             if ($privateKey !== null && $publicKey !== null && isset($publicKey['PEM'])) {
-                $keyCertData = $privateKey['PEM'] . $publicKey['PEM'];
-                $file = SimpleSAML_Utilities::getTempDir() . '/' . sha1($keyCertData) . '.pem';
+                $keyCertData = $privateKey['PEM'].$publicKey['PEM'];
+                $file = SimpleSAML_Utilities::getTempDir().'/'.sha1($keyCertData).'.pem';
                 if (!file_exists($file)) {
                     SimpleSAML_Utilities::writeFile($file, $keyCertData);
                 }
@@ -71,11 +71,11 @@ 
                 if ($key['type'] !== 'X509Certificate') {
                     continue;
                 }
-                $certData .= "-----BEGIN CERTIFICATE-----\n" .
-                    chunk_split($key['X509Certificate'], 64) .
+                $certData .= "-----BEGIN CERTIFICATE-----\n".
+                    chunk_split($key['X509Certificate'], 64).
                     "-----END CERTIFICATE-----\n";
             }
-            $peerCertFile = SimpleSAML_Utilities::getTempDir() . '/' . sha1($certData) . '.pem';
+            $peerCertFile = SimpleSAML_Utilities::getTempDir().'/'.sha1($certData).'.pem';
             if (!file_exists($peerCertFile)) {
                 SimpleSAML_Utilities::writeFile($peerCertFile, $certData);
             }
@@ -100,7 +100,7 @@ 
 
         // Add soap-envelopes
         $request = $msg->toSignedXML();
-        $request = self::START_SOAP_ENVELOPE . $request->ownerDocument->saveXML($request) . self::END_SOAP_ENVELOPE;
+        $request = self::START_SOAP_ENVELOPE.$request->ownerDocument->saveXML($request).self::END_SOAP_ENVELOPE;
 
         Utils::getContainer()->debugMessage($request, 'out');
 
@@ -225,7 +225,7 @@ 
         // There is a fault element but we haven't found out what the fault string is
         $soapFaultString = "Unknown fault string found";
         // find out the fault string
-        $faultStringElement =   Utils::xpQuery($soapFaultElement, './soap-env:faultstring') ;
+        $faultStringElement = Utils::xpQuery($soapFaultElement, './soap-env:faultstring');
         if (!empty($faultStringElement)) {
             return $faultStringElement[0]->textContent;
         }

src/SAML2/Binding.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
             case Constants::BINDING_HOK_SSO:
                 return new HTTPPost();
             default:
-                throw new \Exception('Unsupported binding: ' . var_export($urn, true));
+                throw new \Exception('Unsupported binding: '.var_export($urn, true));
         }
     }
 
@@ -85,15 +85,15 @@ 
 
         $logger = Utils::getContainer()->getLogger();
         $logger->warning('Unable to find the SAML 2 binding used for this request.');
-        $logger->warning('Request method: ' . var_export($_SERVER['REQUEST_METHOD'], true));
+        $logger->warning('Request method: '.var_export($_SERVER['REQUEST_METHOD'], true));
         if (!empty($_GET)) {
-            $logger->warning("GET parameters: '" . implode("', '", array_map('addslashes', array_keys($_GET))) . "'");
+            $logger->warning("GET parameters: '".implode("', '", array_map('addslashes', array_keys($_GET)))."'");
         }
         if (!empty($_POST)) {
-            $logger->warning("POST parameters: '" . implode("', '", array_map('addslashes', array_keys($_POST))) . "'");
+            $logger->warning("POST parameters: '".implode("', '", array_map('addslashes', array_keys($_POST)))."'");
         }
         if (isset($_SERVER['CONTENT_TYPE'])) {
-            $logger->warning('Content-Type: ' . var_export($_SERVER['CONTENT_TYPE'], true));
+            $logger->warning('Content-Type: '.var_export($_SERVER['CONTENT_TYPE'], true));
         }
 
         throw new \Exception('Unable to find the current binding.');

src/SAML2/Compat/Ssp/Logger.php

Spacing +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
      */
     public function emergency($message, array $context = array())
     {
-        SimpleSAML_Logger::emergency($message . var_export($context, true));
+        SimpleSAML_Logger::emergency($message.var_export($context, true));
     }
 
     /**
@@ -28,7 +28,7 @@ 
      */
     public function alert($message, array $context = array())
     {
-        SimpleSAML_Logger::alert($message . var_export($context, true));
+        SimpleSAML_Logger::alert($message.var_export($context, true));
     }
 
     /**
@@ -42,7 +42,7 @@ 
      */
     public function critical($message, array $context = array())
     {
-        SimpleSAML_Logger::critical($message . var_export($context, true));
+        SimpleSAML_Logger::critical($message.var_export($context, true));
     }
 
     /**
@@ -55,7 +55,7 @@ 
      */
     public function error($message, array $context = array())
     {
-        SimpleSAML_Logger::error($message . var_export($context, true));
+        SimpleSAML_Logger::error($message.var_export($context, true));
     }
 
     /**
@@ -70,7 +70,7 @@ 
      */
     public function warning($message, array $context = array())
     {
-        SimpleSAML_Logger::warning($message . var_export($context, true));
+        SimpleSAML_Logger::warning($message.var_export($context, true));
     }
 
     /**
@@ -82,7 +82,7 @@ 
      */
     public function notice($message, array $context = array())
     {
-        SimpleSAML_Logger::notice($message . var_export($context, true));
+        SimpleSAML_Logger::notice($message.var_export($context, true));
     }
 
     /**
@@ -96,7 +96,7 @@ 
      */
     public function info($message, array $context = array())
     {
-        SimpleSAML_Logger::info($message . var_export($context, true));
+        SimpleSAML_Logger::info($message.var_export($context, true));
     }
 
     /**
@@ -108,7 +108,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/Configuration/IdentityProvider.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     public function getPrivateKey($name, $required = false)
     {
         $privateKeys = $this->get('privateKeys');
-        $key = array_filter($privateKeys, function (PrivateKey $key) use ($name) {
+        $key = array_filter($privateKeys, function(PrivateKey $key) use ($name) {
             return $key->getName() === $name;
         });