@@ -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)); |
@@ -22,8 +22,8 @@ |
||
22 | 22 | return sprintf( |
23 | 23 | '%s%s%s', |
24 | 24 | $this->truncateStatus($responseStatus['Code']), |
25 | - $responseStatus['SubCode'] ? '/' . $this->truncateStatus($responseStatus['SubCode']) : '', |
|
26 | - $responseStatus['Message'] ? ' ' . $responseStatus['Message'] : '' |
|
25 | + $responseStatus['SubCode'] ? '/'.$this->truncateStatus($responseStatus['SubCode']) : '', |
|
26 | + $responseStatus['Message'] ? ' '.$responseStatus['Message'] : '' |
|
27 | 27 | ); |
28 | 28 | } |
29 | 29 |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | |
233 | 233 | if ($xml->getAttribute('Version') !== '2.0') { |
234 | 234 | /* Currently a very strict check. */ |
235 | - throw new Exception('Unsupported version: ' . $xml->getAttribute('Version')); |
|
235 | + throw new Exception('Unsupported version: '.$xml->getAttribute('Version')); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | $this->issueInstant = SAML2_Utils::xsDateTimeToTimestamp($xml->getAttribute('IssueInstant')); |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | continue; |
333 | 333 | } |
334 | 334 | if ($node->namespaceURI !== SAML2_Const::NS_SAML) { |
335 | - throw new Exception('Unknown namespace of condition: ' . var_export($node->namespaceURI, TRUE)); |
|
335 | + throw new Exception('Unknown namespace of condition: '.var_export($node->namespaceURI, TRUE)); |
|
336 | 336 | } |
337 | 337 | switch ($node->localName) { |
338 | 338 | case 'AudienceRestriction': |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | /* Currently ignored. */ |
357 | 357 | break; |
358 | 358 | default: |
359 | - throw new Exception('Unknown condition: ' . var_export($node->localName, TRUE)); |
|
359 | + throw new Exception('Unknown condition: '.var_export($node->localName, TRUE)); |
|
360 | 360 | } |
361 | 361 | } |
362 | 362 | |
@@ -1238,7 +1238,7 @@ discard block |
||
1238 | 1238 | $document = $parentElement->ownerDocument; |
1239 | 1239 | } |
1240 | 1240 | |
1241 | - $root = $document->createElementNS(SAML2_Const::NS_SAML, 'saml:' . 'Assertion'); |
|
1241 | + $root = $document->createElementNS(SAML2_Const::NS_SAML, 'saml:'.'Assertion'); |
|
1242 | 1242 | $parentElement->appendChild($root); |
1243 | 1243 | |
1244 | 1244 | /* Ugly hack to add another namespace declaration to the root element. */ |
@@ -1290,7 +1290,7 @@ discard block |
||
1290 | 1290 | if ($this->encryptedNameId === NULL) { |
1291 | 1291 | SAML2_Utils::addNameId($subject, $this->nameId); |
1292 | 1292 | } else { |
1293 | - $eid = $subject->ownerDocument->createElementNS(SAML2_Const::NS_SAML, 'saml:' . 'EncryptedID'); |
|
1293 | + $eid = $subject->ownerDocument->createElementNS(SAML2_Const::NS_SAML, 'saml:'.'EncryptedID'); |
|
1294 | 1294 | $subject->appendChild($eid); |
1295 | 1295 | $eid->appendChild($subject->ownerDocument->importNode($this->encryptedNameId, TRUE)); |
1296 | 1296 | } |
@@ -51,25 +51,25 @@ |
||
51 | 51 | |
52 | 52 | // ported from |
53 | 53 | // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1092 |
54 | - if ($configuration->hasValue($prefix . 'keys')) { |
|
55 | - $extracted['keys'] = $configuration->getArray($prefix . 'keys'); |
|
54 | + if ($configuration->hasValue($prefix.'keys')) { |
|
55 | + $extracted['keys'] = $configuration->getArray($prefix.'keys'); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | // ported from |
59 | 59 | // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1108 |
60 | - if ($configuration->hasValue($prefix . 'certData')) { |
|
61 | - $extracted['certificateData'] = $configuration->getString($prefix . 'certData'); |
|
60 | + if ($configuration->hasValue($prefix.'certData')) { |
|
61 | + $extracted['certificateData'] = $configuration->getString($prefix.'certData'); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | // ported from |
65 | 65 | // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1119 |
66 | - if ($configuration->hasValue($prefix . 'certificate')) { |
|
67 | - $extracted['certificateData'] = $configuration->getString($prefix . 'certificate'); |
|
66 | + if ($configuration->hasValue($prefix.'certificate')) { |
|
67 | + $extracted['certificateData'] = $configuration->getString($prefix.'certificate'); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | // ported from |
71 | 71 | // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/modules/saml/lib/Message.php#L161 |
72 | - if ($configuration->hasValue($prefix . 'certFingerprint')) { |
|
72 | + if ($configuration->hasValue($prefix.'certFingerprint')) { |
|
73 | 73 | $extracted['certificateFingerprint'] = $configuration->getArrayizeString('certFingerprint'); |
74 | 74 | } |
75 | 75 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | public function getPrivateKey($name, $required = FALSE) |
47 | 47 | { |
48 | 48 | $privateKeys = $this->get('privateKeys'); |
49 | - $key = array_filter($privateKeys, function (SAML2_Configuration_PrivateKey $key) use ($name) { |
|
49 | + $key = array_filter($privateKeys, function(SAML2_Configuration_PrivateKey $key) use ($name) { |
|
50 | 50 | return $key->getName() === $name; |
51 | 51 | }); |
52 | 52 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | public function getPrivateKey($name, $required = FALSE) |
47 | 47 | { |
48 | 48 | $privateKeys = $this->get('privateKeys'); |
49 | - $key = array_filter($privateKeys, function (SAML2_Configuration_PrivateKey $key) use ($name) { |
|
49 | + $key = array_filter($privateKeys, function(SAML2_Configuration_PrivateKey $key) use ($name) { |
|
50 | 50 | return $key->getName() === $name; |
51 | 51 | }); |
52 | 52 |
@@ -45,7 +45,7 @@ |
||
45 | 45 | SAML2_Configuration_CertificateProvider $configuration |
46 | 46 | ) { |
47 | 47 | $logger = $this->logger; |
48 | - $pemCandidates = $this->configuredKeys->filter(function (SAML2_Certificate_Key $key) use ($logger) { |
|
48 | + $pemCandidates = $this->configuredKeys->filter(function(SAML2_Certificate_Key $key) use ($logger) { |
|
49 | 49 | if (!$key instanceof SAML2_Certificate_X509) { |
50 | 50 | $logger->debug(sprintf('Skipping unknown key type: "%s"', $key['type'])); |
51 | 51 | return FALSE; |
@@ -68,7 +68,7 @@ |
||
68 | 68 | |
69 | 69 | throw new SAML2_Signature_MissingConfigurationException(sprintf( |
70 | 70 | 'No certificates or fingerprints have been configured%s', |
71 | - $configuration->has('entityid') ? ' for "' . $configuration->get('entityid') . '"' : '' |
|
71 | + $configuration->has('entityid') ? ' for "'.$configuration->get('entityid').'"' : '' |
|
72 | 72 | )); |
73 | 73 | } |
74 | 74 | } |