@@ -49,21 +49,21 @@ discard block |
||
49 | 49 | $msg .= urlencode($msgStr); |
50 | 50 | |
51 | 51 | if ($relayState !== null) { |
52 | - $msg .= '&RelayState=' . urlencode($relayState); |
|
52 | + $msg .= '&RelayState='.urlencode($relayState); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | if ($key !== null) { |
56 | 56 | /* Add the signature. */ |
57 | - $msg .= '&SigAlg=' . urlencode($key->type); |
|
57 | + $msg .= '&SigAlg='.urlencode($key->type); |
|
58 | 58 | |
59 | 59 | $signature = $key->signData($msg); |
60 | - $msg .= '&Signature=' . urlencode(base64_encode($signature)); |
|
60 | + $msg .= '&Signature='.urlencode(base64_encode($signature)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | if (strpos($destination, '?') === false) { |
64 | - $destination .= '?' . $msg; |
|
64 | + $destination .= '?'.$msg; |
|
65 | 65 | } else { |
66 | - $destination .= '&' . $msg; |
|
66 | + $destination .= '&'.$msg; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | return $destination; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | public function send(Message $message) |
80 | 80 | { |
81 | 81 | $destination = $this->getRedirectURL($message); |
82 | - Utils::getContainer()->getLogger()->debug('Redirect to ' . strlen($destination) . ' byte URL: ' . $destination); |
|
82 | + Utils::getContainer()->getLogger()->debug('Redirect to '.strlen($destination).' byte URL: '.$destination); |
|
83 | 83 | Utils::getContainer()->redirect($destination); |
84 | 84 | } |
85 | 85 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | } |
107 | 107 | |
108 | 108 | if (isset($data['SAMLEncoding']) && $data['SAMLEncoding'] !== self::DEFLATE) { |
109 | - throw new \Exception('Unknown SAMLEncoding: ' . var_export($data['SAMLEncoding'], true)); |
|
109 | + throw new \Exception('Unknown SAMLEncoding: '.var_export($data['SAMLEncoding'], true)); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | $message = base64_decode($message); |
@@ -182,18 +182,18 @@ discard block |
||
182 | 182 | switch ($name) { |
183 | 183 | case 'SAMLRequest': |
184 | 184 | case 'SAMLResponse': |
185 | - $sigQuery = $name . '=' . $value; |
|
185 | + $sigQuery = $name.'='.$value; |
|
186 | 186 | break; |
187 | 187 | case 'RelayState': |
188 | - $relayState = '&RelayState=' . $value; |
|
188 | + $relayState = '&RelayState='.$value; |
|
189 | 189 | break; |
190 | 190 | case 'SigAlg': |
191 | - $sigAlg = '&SigAlg=' . $value; |
|
191 | + $sigAlg = '&SigAlg='.$value; |
|
192 | 192 | break; |
193 | 193 | } |
194 | 194 | } |
195 | 195 | |
196 | - $data['SignedQuery'] = $sigQuery . $relayState . $sigAlg; |
|
196 | + $data['SignedQuery'] = $sigQuery.$relayState.$sigAlg; |
|
197 | 197 | |
198 | 198 | return $data; |
199 | 199 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public function emergency($message, array $context = array()) |
17 | 17 | { |
18 | - \SimpleSAML\Logger::emergency($message . var_export($context, true)); |
|
18 | + \SimpleSAML\Logger::emergency($message.var_export($context, true)); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | /** |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function alert($message, array $context = array()) |
32 | 32 | { |
33 | - \SimpleSAML\Logger::alert($message . var_export($context, true)); |
|
33 | + \SimpleSAML\Logger::alert($message.var_export($context, true)); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function critical($message, array $context = array()) |
46 | 46 | { |
47 | - \SimpleSAML\Logger::critical($message . var_export($context, true)); |
|
47 | + \SimpleSAML\Logger::critical($message.var_export($context, true)); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function error($message, array $context = array()) |
59 | 59 | { |
60 | - \SimpleSAML\Logger::error($message . var_export($context, true)); |
|
60 | + \SimpleSAML\Logger::error($message.var_export($context, true)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function warning($message, array $context = array()) |
74 | 74 | { |
75 | - \SimpleSAML\Logger::warning($message . var_export($context, true)); |
|
75 | + \SimpleSAML\Logger::warning($message.var_export($context, true)); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function notice($message, array $context = array()) |
86 | 86 | { |
87 | - \SimpleSAML\Logger::notice($message . var_export($context, true)); |
|
87 | + \SimpleSAML\Logger::notice($message.var_export($context, true)); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | */ |
99 | 99 | public function info($message, array $context = array()) |
100 | 100 | { |
101 | - \SimpleSAML\Logger::info($message . var_export($context, true)); |
|
101 | + \SimpleSAML\Logger::info($message.var_export($context, true)); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function debug($message, array $context = array()) |
112 | 112 | { |
113 | - \SimpleSAML\Logger::debug($message . var_export($context, true)); |
|
113 | + \SimpleSAML\Logger::debug($message.var_export($context, true)); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -355,7 +355,7 @@ |
||
355 | 355 | /** |
356 | 356 | * Retrieve the issuer if this message. |
357 | 357 | * |
358 | - * @return string|\SAML2\XML\saml\Issuer|null The issuer of this message, or NULL if no issuer is given |
|
358 | + * @return string The issuer of this message, or NULL if no issuer is given |
|
359 | 359 | */ |
360 | 360 | public function getIssuer() |
361 | 361 | { |
@@ -70,7 +70,6 @@ |
||
70 | 70 | /** |
71 | 71 | * Convert this BaseID to XML. |
72 | 72 | * |
73 | - * @param \DOMElement $element The element we are converting to XML. |
|
74 | 73 | * @return \DOMElement The XML element after adding the data corresponding to this BaseID. |
75 | 74 | */ |
76 | 75 | public function toXML(\DOMElement $parent = null) |
@@ -77,7 +77,6 @@ |
||
77 | 77 | /** |
78 | 78 | * Convert this NameIDType to XML. |
79 | 79 | * |
80 | - * @param \DOMElement $element The element we are converting to XML. |
|
81 | 80 | * |
82 | 81 | * @return \DOMElement The XML element after adding the data corresponding to this NameIDType. |
83 | 82 | */ |
@@ -54,8 +54,8 @@ |
||
54 | 54 | return; |
55 | 55 | } |
56 | 56 | |
57 | - $this->IPHint = Utils::extractStrings($xml, Common::NS, 'IPHint'); |
|
58 | - $this->DomainHint = Utils::extractStrings($xml, Common::NS, 'DomainHint'); |
|
57 | + $this->IPHint = Utils::extractStrings($xml, Common::NS, 'IPHint'); |
|
58 | + $this->DomainHint = Utils::extractStrings($xml, Common::NS, 'DomainHint'); |
|
59 | 59 | $this->GeolocationHint = Utils::extractStrings($xml, Common::NS, 'GeolocationHint'); |
60 | 60 | |
61 | 61 | foreach (Utils::xpQuery($xml, "./*[namespace-uri()!='".Common::NS."']") as $node) { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | $generatedId = pack('H*', ((string) SimpleSAML_Utilities::stringToHex(SimpleSAML_Utilities::generateRandomBytes(20)))); |
42 | - $artifact = base64_encode("\x00\x04\x00\x00" . sha1($message->getIssuer(), true) . $generatedId) ; |
|
42 | + $artifact = base64_encode("\x00\x04\x00\x00".sha1($message->getIssuer(), true).$generatedId); |
|
43 | 43 | $artifactData = $message->toUnsignedXML(); |
44 | 44 | $artifactDataString = $artifactData->ownerDocument->saveXML($artifactData); |
45 | 45 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | { |
82 | 82 | if (array_key_exists('SAMLart', $_REQUEST)) { |
83 | 83 | $artifact = base64_decode($_REQUEST['SAMLart']); |
84 | - $endpointIndex = bin2hex(substr($artifact, 2, 2)); |
|
84 | + $endpointIndex = bin2hex(substr($artifact, 2, 2)); |
|
85 | 85 | $sourceId = bin2hex(substr($artifact, 4, 20)); |
86 | 86 | } else { |
87 | 87 | throw new \Exception('Missing SAMLart parameter.'); |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | $idpMetadata = $metadataHandler->getMetaDataConfigForSha1($sourceId, 'saml20-idp-remote'); |
93 | 93 | |
94 | 94 | if ($idpMetadata === null) { |
95 | - throw new \Exception('No metadata found for remote provider with SHA1 ID: ' . var_export($sourceId, true)); |
|
95 | + throw new \Exception('No metadata found for remote provider with SHA1 ID: '.var_export($sourceId, true)); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | $endpoint = null; |
99 | 99 | foreach ($idpMetadata->getEndpoints('ArtifactResolutionService') as $ep) { |
100 | - if ($ep['index'] === hexdec($endpointIndex)) { |
|
100 | + if ($ep['index'] === hexdec($endpointIndex)) { |
|
101 | 101 | $endpoint = $ep; |
102 | 102 | break; |
103 | 103 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | throw new \Exception('No ArtifactResolutionService with the correct index.'); |
108 | 108 | } |
109 | 109 | |
110 | - Utils::getContainer()->getLogger()->debug("ArtifactResolutionService endpoint being used is := " . $endpoint['Location']); |
|
110 | + Utils::getContainer()->getLogger()->debug("ArtifactResolutionService endpoint being used is := ".$endpoint['Location']); |
|
111 | 111 | |
112 | 112 | //Construct the ArtifactResolve Request |
113 | 113 | $ar = new ArtifactResolve(); |
@@ -72,7 +72,7 @@ |
||
72 | 72 | if (strpos($keyword, "+") !== false) { |
73 | 73 | throw new \Exception('Keywords may not contain a "+" character.'); |
74 | 74 | } |
75 | - $value .= str_replace(' ', '+', $keyword) . ' '; |
|
75 | + $value .= str_replace(' ', '+', $keyword).' '; |
|
76 | 76 | } |
77 | 77 | $value = rtrim($value); |
78 | 78 | $e->appendChild($doc->createTextNode($value)); |
@@ -74,7 +74,7 @@ |
||
74 | 74 | |
75 | 75 | throw new MissingConfigurationException(sprintf( |
76 | 76 | 'No certificates or fingerprints have been configured%s', |
77 | - $configuration->has('entityid') ? ' for "' . $configuration->get('entityid') . '"' : '' |
|
77 | + $configuration->has('entityid') ? ' for "'.$configuration->get('entityid').'"' : '' |
|
78 | 78 | )); |
79 | 79 | } |
80 | 80 | } |