@@ -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)); |
@@ -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. */ |
@@ -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 |
@@ -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 |
@@ -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 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | SAML2_SignedElement $signedElement, |
58 | 58 | SAML2_Configuration_CertificateProvider $configuration |
59 | 59 | ) { |
60 | - $this->certificates = array_map(function ($certificate) { |
|
60 | + $this->certificates = array_map(function($certificate) { |
|
61 | 61 | return SAML2_Certificate_X509::createFromCertificateData($certificate); |
62 | 62 | }, $this->certificates); |
63 | 63 |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | |
241 | 241 | if ($xml->getAttribute('Version') !== '2.0') { |
242 | 242 | /* Currently a very strict check. */ |
243 | - throw new \Exception('Unsupported version: ' . $xml->getAttribute('Version')); |
|
243 | + throw new \Exception('Unsupported version: '.$xml->getAttribute('Version')); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | $this->issueInstant = Utils::xsDateTimeToTimestamp($xml->getAttribute('IssueInstant')); |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | continue; |
341 | 341 | } |
342 | 342 | if ($node->namespaceURI !== Constants::NS_SAML) { |
343 | - throw new \Exception('Unknown namespace of condition: ' . var_export($node->namespaceURI, true)); |
|
343 | + throw new \Exception('Unknown namespace of condition: '.var_export($node->namespaceURI, true)); |
|
344 | 344 | } |
345 | 345 | switch ($node->localName) { |
346 | 346 | case 'AudienceRestriction': |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | /* Currently ignored. */ |
364 | 364 | break; |
365 | 365 | default: |
366 | - throw new \Exception('Unknown condition: ' . var_export($node->localName, true)); |
|
366 | + throw new \Exception('Unknown condition: '.var_export($node->localName, true)); |
|
367 | 367 | } |
368 | 368 | } |
369 | 369 | } |
@@ -1244,7 +1244,7 @@ discard block |
||
1244 | 1244 | $document = $parentElement->ownerDocument; |
1245 | 1245 | } |
1246 | 1246 | |
1247 | - $root = $document->createElementNS(Constants::NS_SAML, 'saml:' . 'Assertion'); |
|
1247 | + $root = $document->createElementNS(Constants::NS_SAML, 'saml:'.'Assertion'); |
|
1248 | 1248 | $parentElement->appendChild($root); |
1249 | 1249 | |
1250 | 1250 | /* Ugly hack to add another namespace declaration to the root element. */ |
@@ -1296,7 +1296,7 @@ discard block |
||
1296 | 1296 | if ($this->encryptedNameId === null) { |
1297 | 1297 | Utils::addNameId($subject, $this->nameId); |
1298 | 1298 | } else { |
1299 | - $eid = $subject->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:' . 'EncryptedID'); |
|
1299 | + $eid = $subject->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:'.'EncryptedID'); |
|
1300 | 1300 | $subject->appendChild($eid); |
1301 | 1301 | $eid->appendChild($subject->ownerDocument->importNode($this->encryptedNameId, true)); |
1302 | 1302 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | case Constants::BINDING_HOK_SSO: |
40 | 40 | return new HTTPPost(); |
41 | 41 | default: |
42 | - throw new \Exception('Unsupported binding: ' . var_export($urn, true)); |
|
42 | + throw new \Exception('Unsupported binding: '.var_export($urn, true)); |
|
43 | 43 | } |
44 | 44 | } |
45 | 45 | |
@@ -85,15 +85,15 @@ discard block |
||
85 | 85 | |
86 | 86 | $logger = Utils::getContainer()->getLogger(); |
87 | 87 | $logger->warning('Unable to find the SAML 2 binding used for this request.'); |
88 | - $logger->warning('Request method: ' . var_export($_SERVER['REQUEST_METHOD'], true)); |
|
88 | + $logger->warning('Request method: '.var_export($_SERVER['REQUEST_METHOD'], true)); |
|
89 | 89 | if (!empty($_GET)) { |
90 | - $logger->warning("GET parameters: '" . implode("', '", array_map('addslashes', array_keys($_GET))) . "'"); |
|
90 | + $logger->warning("GET parameters: '".implode("', '", array_map('addslashes', array_keys($_GET)))."'"); |
|
91 | 91 | } |
92 | 92 | if (!empty($_POST)) { |
93 | - $logger->warning("POST parameters: '" . implode("', '", array_map('addslashes', array_keys($_POST))) . "'"); |
|
93 | + $logger->warning("POST parameters: '".implode("', '", array_map('addslashes', array_keys($_POST)))."'"); |
|
94 | 94 | } |
95 | 95 | if (isset($_SERVER['CONTENT_TYPE'])) { |
96 | - $logger->warning('Content-Type: ' . var_export($_SERVER['CONTENT_TYPE'], true)); |
|
96 | + $logger->warning('Content-Type: '.var_export($_SERVER['CONTENT_TYPE'], true)); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | throw new \Exception('Unable to find the current binding.'); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function emergency($message, array $context = array()) |
15 | 15 | { |
16 | - SimpleSAML_Logger::emergency($message . var_export($context, true)); |
|
16 | + SimpleSAML_Logger::emergency($message.var_export($context, true)); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | /** |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function alert($message, array $context = array()) |
30 | 30 | { |
31 | - SimpleSAML_Logger::alert($message . var_export($context, true)); |
|
31 | + SimpleSAML_Logger::alert($message.var_export($context, true)); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function critical($message, array $context = array()) |
44 | 44 | { |
45 | - SimpleSAML_Logger::critical($message . var_export($context, true)); |
|
45 | + SimpleSAML_Logger::critical($message.var_export($context, true)); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function error($message, array $context = array()) |
57 | 57 | { |
58 | - SimpleSAML_Logger::error($message . var_export($context, true)); |
|
58 | + SimpleSAML_Logger::error($message.var_export($context, true)); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function warning($message, array $context = array()) |
72 | 72 | { |
73 | - SimpleSAML_Logger::warning($message . var_export($context, true)); |
|
73 | + SimpleSAML_Logger::warning($message.var_export($context, true)); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function notice($message, array $context = array()) |
84 | 84 | { |
85 | - SimpleSAML_Logger::notice($message . var_export($context, true)); |
|
85 | + SimpleSAML_Logger::notice($message.var_export($context, true)); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function info($message, array $context = array()) |
98 | 98 | { |
99 | - SimpleSAML_Logger::info($message . var_export($context, true)); |
|
99 | + SimpleSAML_Logger::info($message.var_export($context, true)); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | */ |
109 | 109 | public function debug($message, array $context = array()) |
110 | 110 | { |
111 | - SimpleSAML_Logger::debug($message . var_export($context, true)); |
|
111 | + SimpleSAML_Logger::debug($message.var_export($context, true)); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |