@@ -53,7 +53,7 @@ |
||
| 53 | 53 | CertificateProvider $configuration |
| 54 | 54 | ) { |
| 55 | 55 | $logger = $this->logger; |
| 56 | - $pemCandidates = $this->configuredKeys->filter(function (Key $key) use ($logger) { |
|
| 56 | + $pemCandidates = $this->configuredKeys->filter(function(Key $key) use ($logger) { |
|
| 57 | 57 | if (!$key instanceof X509) { |
| 58 | 58 | $logger->debug(sprintf('Skipping unknown key type: "%s"', $key['type'])); |
| 59 | 59 | return false; |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | { |
| 60 | 60 | if ($this->count() !== 1) { |
| 61 | 61 | throw new RuntimeException(sprintf( |
| 62 | - __CLASS__ . '::' . __METHOD__ . ' requires that the collection has exactly one element, ' |
|
| 62 | + __CLASS__.'::'.__METHOD__.' requires that the collection has exactly one element, ' |
|
| 63 | 63 | . '"%d" elements found', |
| 64 | 64 | $this->count() |
| 65 | 65 | )); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | { |
| 101 | 101 | assert('is_string($name)'); |
| 102 | 102 | |
| 103 | - $e = Utils::xpQuery($parent, './saml_metadata:' . $name); |
|
| 103 | + $e = Utils::xpQuery($parent, './saml_metadata:'.$name); |
|
| 104 | 104 | |
| 105 | 105 | $ret = array(); |
| 106 | 106 | foreach ($e as $i) { |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | return null; |
| 128 | 128 | } |
| 129 | 129 | if (count($e) > 1) { |
| 130 | - throw new \Exception('More than one ' . $name . ' in ' . $parent->tagName); |
|
| 130 | + throw new \Exception('More than one '.$name.' in '.$parent->tagName); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | return $e[0]; |
@@ -52,12 +52,12 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | if (!$xml->hasAttribute('Binding')) { |
| 55 | - throw new \Exception('Missing Binding on ' . $xml->tagName); |
|
| 55 | + throw new \Exception('Missing Binding on '.$xml->tagName); |
|
| 56 | 56 | } |
| 57 | 57 | $this->Binding = $xml->getAttribute('Binding'); |
| 58 | 58 | |
| 59 | 59 | if (!$xml->hasAttribute('Location')) { |
| 60 | - throw new \Exception('Missing Location on ' . $xml->tagName); |
|
| 60 | + throw new \Exception('Missing Location on '.$xml->tagName); |
|
| 61 | 61 | } |
| 62 | 62 | $this->Location = $xml->getAttribute('Location'); |
| 63 | 63 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($a->namespaceURI === null) { |
| 70 | 70 | continue; /* Not namespace-qualified -- skip. */ |
| 71 | 71 | } |
| 72 | - $fullName = '{' . $a->namespaceURI . '}' . $a->localName; |
|
| 72 | + $fullName = '{'.$a->namespaceURI.'}'.$a->localName; |
|
| 73 | 73 | $this->attributes[$fullName] = array( |
| 74 | 74 | 'qualifiedName' => $a->nodeName, |
| 75 | 75 | 'namespaceURI' => $a->namespaceURI, |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | assert('is_string($namespaceURI)'); |
| 91 | 91 | assert('is_string($localName)'); |
| 92 | 92 | |
| 93 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 93 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 94 | 94 | |
| 95 | 95 | return isset($this->attributes[$fullName]); |
| 96 | 96 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | assert('is_string($namespaceURI)'); |
| 108 | 108 | assert('is_string($localName)'); |
| 109 | 109 | |
| 110 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 110 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 111 | 111 | if (!isset($this->attributes[$fullName])) { |
| 112 | 112 | return ''; |
| 113 | 113 | } |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | $localName = $name[1]; |
| 136 | 136 | |
| 137 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 137 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 138 | 138 | $this->attributes[$fullName] = array( |
| 139 | 139 | 'qualifiedName' => $qualifiedName, |
| 140 | 140 | 'namespaceURI' => $namespaceURI, |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | assert('is_string($namespaceURI)'); |
| 154 | 154 | assert('is_string($localName)'); |
| 155 | 155 | |
| 156 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 156 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 157 | 157 | unset($this->attributes[$fullName]); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | if (!$xml->hasAttribute('index')) { |
| 43 | - throw new \Exception('Missing index on ' . $xml->tagName); |
|
| 43 | + throw new \Exception('Missing index on '.$xml->tagName); |
|
| 44 | 44 | } |
| 45 | 45 | $this->index = (int) $xml->getAttribute('index'); |
| 46 | 46 | |
@@ -118,7 +118,7 @@ |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | if (!$xml->hasAttribute('protocolSupportEnumeration')) { |
| 121 | - throw new \Exception('Missing protocolSupportEnumeration attribute on ' . $xml->localName); |
|
| 121 | + throw new \Exception('Missing protocolSupportEnumeration attribute on '.$xml->localName); |
|
| 122 | 122 | } |
| 123 | 123 | $this->protocolSupportEnumeration = preg_split('/[\s]+/', $xml->getAttribute('protocolSupportEnumeration')); |
| 124 | 124 | |
@@ -59,8 +59,8 @@ |
||
| 59 | 59 | return; |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - $this->IPHint = Utils::extractStrings($xml, self::NS, 'IPHint'); |
|
| 63 | - $this->DomainHint = Utils::extractStrings($xml, self::NS, 'DomainHint'); |
|
| 62 | + $this->IPHint = Utils::extractStrings($xml, self::NS, 'IPHint'); |
|
| 63 | + $this->DomainHint = Utils::extractStrings($xml, self::NS, 'DomainHint'); |
|
| 64 | 64 | $this->GeolocationHint = Utils::extractStrings($xml, self::NS, 'GeolocationHint'); |
| 65 | 65 | |
| 66 | 66 | foreach (Utils::xpQuery($xml, "./*[namespace-uri()!='".self::NS."']") as $node) { |
@@ -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 | /** |