@@ -48,12 +48,12 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | if (!$xml->hasAttribute('Binding')) { |
| 51 | - throw new Exception('Missing Binding on ' . $xml->tagName); |
|
| 51 | + throw new Exception('Missing Binding on '.$xml->tagName); |
|
| 52 | 52 | } |
| 53 | 53 | $this->Binding = $xml->getAttribute('Binding'); |
| 54 | 54 | |
| 55 | 55 | if (!$xml->hasAttribute('Location')) { |
| 56 | - throw new Exception('Missing Location on ' . $xml->tagName); |
|
| 56 | + throw new Exception('Missing Location on '.$xml->tagName); |
|
| 57 | 57 | } |
| 58 | 58 | $this->Location = $xml->getAttribute('Location'); |
| 59 | 59 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | if ($a->namespaceURI === NULL) { |
| 66 | 66 | continue; /* Not namespace-qualified -- skip. */ |
| 67 | 67 | } |
| 68 | - $fullName = '{' . $a->namespaceURI . '}' . $a->localName; |
|
| 68 | + $fullName = '{'.$a->namespaceURI.'}'.$a->localName; |
|
| 69 | 69 | $this->attributes[$fullName] = array( |
| 70 | 70 | 'qualifiedName' => $a->nodeName, |
| 71 | 71 | 'namespaceURI' => $a->namespaceURI, |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | assert('is_string($namespaceURI)'); |
| 87 | 87 | assert('is_string($localName)'); |
| 88 | 88 | |
| 89 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 89 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 90 | 90 | |
| 91 | 91 | return isset($this->attributes[$fullName]); |
| 92 | 92 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | assert('is_string($namespaceURI)'); |
| 104 | 104 | assert('is_string($localName)'); |
| 105 | 105 | |
| 106 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 106 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 107 | 107 | if (!isset($this->attributes[$fullName])) { |
| 108 | 108 | return ''; |
| 109 | 109 | } |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | $localName = $name[1]; |
| 132 | 132 | |
| 133 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 133 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 134 | 134 | $this->attributes[$fullName] = array( |
| 135 | 135 | 'qualifiedName' => $qualifiedName, |
| 136 | 136 | 'namespaceURI' => $namespaceURI, |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | assert('is_string($namespaceURI)'); |
| 150 | 150 | assert('is_string($localName)'); |
| 151 | 151 | |
| 152 | - $fullName = '{' . $namespaceURI . '}' . $localName; |
|
| 152 | + $fullName = '{'.$namespaceURI.'}'.$localName; |
|
| 153 | 153 | unset($this->attributes[$fullName]); |
| 154 | 154 | } |
| 155 | 155 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | { |
| 96 | 96 | assert('is_string($name)'); |
| 97 | 97 | |
| 98 | - $e = SAML2_Utils::xpQuery($parent, './saml_metadata:' . $name); |
|
| 98 | + $e = SAML2_Utils::xpQuery($parent, './saml_metadata:'.$name); |
|
| 99 | 99 | |
| 100 | 100 | $ret = array(); |
| 101 | 101 | foreach ($e as $i) { |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | return NULL; |
| 123 | 123 | } |
| 124 | 124 | if (count($e) > 1) { |
| 125 | - throw new Exception('More than one ' . $name . ' in ' . $parent->tagName); |
|
| 125 | + throw new Exception('More than one '.$name.' in '.$parent->tagName); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | return $e[0]; |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | if (strpos($keyword, "+") !== FALSE) { |
| 69 | 69 | throw new Exception('Keywords may not contain a "+" character.'); |
| 70 | 70 | } |
| 71 | - $value .= str_replace(' ', '+', $keyword) . ' '; |
|
| 71 | + $value .= str_replace(' ', '+', $keyword).' '; |
|
| 72 | 72 | } |
| 73 | 73 | $value = rtrim($value); |
| 74 | 74 | $e->appendChild($doc->createTextNode($value)); |
@@ -54,8 +54,8 @@ |
||
| 54 | 54 | return; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - $this->IPHint = SAML2_Utils::extractStrings($xml, self::NS, 'IPHint'); |
|
| 58 | - $this->DomainHint = SAML2_Utils::extractStrings($xml, self::NS, 'DomainHint'); |
|
| 57 | + $this->IPHint = SAML2_Utils::extractStrings($xml, self::NS, 'IPHint'); |
|
| 58 | + $this->DomainHint = SAML2_Utils::extractStrings($xml, self::NS, 'DomainHint'); |
|
| 59 | 59 | $this->GeolocationHint = SAML2_Utils::extractStrings($xml, self::NS, 'GeolocationHint'); |
| 60 | 60 | |
| 61 | 61 | foreach (SAML2_Utils::xpQuery($xml, "./*[namespace-uri()!='".self::NS."']") as $node) { |
@@ -173,8 +173,8 @@ |
||
| 173 | 173 | foreach ($this->certificates as $cert) { |
| 174 | 174 | |
| 175 | 175 | /* We have found a matching fingerprint. */ |
| 176 | - $pemCert = "-----BEGIN CERTIFICATE-----\n" . |
|
| 177 | - chunk_split($cert, 64) . |
|
| 176 | + $pemCert = "-----BEGIN CERTIFICATE-----\n". |
|
| 177 | + chunk_split($cert, 64). |
|
| 178 | 178 | "-----END CERTIFICATE-----\n"; |
| 179 | 179 | |
| 180 | 180 | /* Extract the public key from the certificate for validation. */ |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | throw SAML2_Exception_InvalidArgumentException::invalidType('string', $passphrase); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - $keyData = array ('PEM' => $keyContents, self::USAGE_ENCRYPTION => TRUE); |
|
| 15 | + $keyData = array('PEM' => $keyContents, self::USAGE_ENCRYPTION => TRUE); |
|
| 16 | 16 | if ($passphrase) { |
| 17 | 17 | $keyData['passphrase'] = $passphrase; |
| 18 | 18 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | public function emergency($message, array $context = array()) |
| 13 | 13 | { |
| 14 | - SimpleSAML_Logger::emergency($message . var_export($context, TRUE)); |
|
| 14 | + SimpleSAML_Logger::emergency($message.var_export($context, TRUE)); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | /** |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function alert($message, array $context = array()) |
| 28 | 28 | { |
| 29 | - SimpleSAML_Logger::alert($message . var_export($context, TRUE)); |
|
| 29 | + SimpleSAML_Logger::alert($message.var_export($context, TRUE)); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function critical($message, array $context = array()) |
| 42 | 42 | { |
| 43 | - SimpleSAML_Logger::critical($message . var_export($context, TRUE)); |
|
| 43 | + SimpleSAML_Logger::critical($message.var_export($context, TRUE)); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function error($message, array $context = array()) |
| 55 | 55 | { |
| 56 | - SimpleSAML_Logger::error($message . var_export($context, TRUE)); |
|
| 56 | + SimpleSAML_Logger::error($message.var_export($context, TRUE)); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function warning($message, array $context = array()) |
| 70 | 70 | { |
| 71 | - SimpleSAML_Logger::warning($message . var_export($context, TRUE)); |
|
| 71 | + SimpleSAML_Logger::warning($message.var_export($context, TRUE)); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | public function notice($message, array $context = array()) |
| 82 | 82 | { |
| 83 | - SimpleSAML_Logger::notice($message . var_export($context, TRUE)); |
|
| 83 | + SimpleSAML_Logger::notice($message.var_export($context, TRUE)); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | /** |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | public function info($message, array $context = array()) |
| 96 | 96 | { |
| 97 | - SimpleSAML_Logger::info($message . var_export($context, TRUE)); |
|
| 97 | + SimpleSAML_Logger::info($message.var_export($context, TRUE)); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | */ |
| 107 | 107 | public function debug($message, array $context = array()) |
| 108 | 108 | { |
| 109 | - SimpleSAML_Logger::debug($message . var_export($context, TRUE)); |
|
| 109 | + SimpleSAML_Logger::debug($message.var_export($context, TRUE)); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | break; |
| 71 | 71 | |
| 72 | 72 | default: |
| 73 | - throw new Exception('Unknown key type for encryption: ' . $key->type); |
|
| 73 | + throw new Exception('Unknown key type for encryption: '.$key->type); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $this->encryptedData = $enc->encryptNode($symmetricKey); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $document = $parentElement->ownerDocument; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - $root = $document->createElementNS(SAML2_Const::NS_SAML, 'saml:' . 'EncryptedAssertion'); |
|
| 110 | + $root = $document->createElementNS(SAML2_Const::NS_SAML, 'saml:'.'EncryptedAssertion'); |
|
| 111 | 111 | $parentElement->appendChild($root); |
| 112 | 112 | |
| 113 | 113 | $root->appendChild($document->importNode($this->encryptedData, TRUE)); |
@@ -53,8 +53,8 @@ |
||
| 53 | 53 | const CM_BEARER = 'urn:oasis:names:tc:SAML:2.0:cm:bearer'; |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | - * Holder-of-Key subject confirmation method. |
|
| 57 | - */ |
|
| 56 | + * Holder-of-Key subject confirmation method. |
|
| 57 | + */ |
|
| 58 | 58 | const CM_HOK = 'urn:oasis:names:tc:SAML:2.0:cm:holder-of-key'; |
| 59 | 59 | |
| 60 | 60 | /** |