@@ -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 | } |
@@ -70,7 +70,7 @@ |
||
70 | 70 | SignedElement $signedElement, |
71 | 71 | CertificateProvider $configuration |
72 | 72 | ) { |
73 | - $this->certificates = array_map(function ($certificate) { |
|
73 | + $this->certificates = array_map(function($certificate) { |
|
74 | 74 | return X509::createFromCertificateData($certificate); |
75 | 75 | }, $this->certificates); |
76 | 76 |
@@ -176,8 +176,8 @@ |
||
176 | 176 | foreach ($this->certificates as $cert) { |
177 | 177 | |
178 | 178 | /* Construct a PEM formatted certificate */ |
179 | - $pemCert = "-----BEGIN CERTIFICATE-----\n" . |
|
180 | - chunk_split($cert, 64) . |
|
179 | + $pemCert = "-----BEGIN CERTIFICATE-----\n". |
|
180 | + chunk_split($cert, 64). |
|
181 | 181 | "-----END CERTIFICATE-----\n"; |
182 | 182 | |
183 | 183 | /* Extract the public key from the certificate for validation. */ |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace SAML2; |
4 | 4 | |
5 | 5 | use DOMDocument; |
6 | - |
|
7 | 6 | use SAML2\XML\ecp\Response as ECPResponse; |
8 | 7 | |
9 | 8 | /** |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | case Constants::BINDING_PAOS: |
45 | 45 | return new SOAP(); |
46 | 46 | default: |
47 | - throw new \Exception('Unsupported binding: ' . var_export($urn, true)); |
|
47 | + throw new \Exception('Unsupported binding: '.var_export($urn, true)); |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 | |
@@ -90,15 +90,15 @@ discard block |
||
90 | 90 | |
91 | 91 | $logger = Utils::getContainer()->getLogger(); |
92 | 92 | $logger->warning('Unable to find the SAML 2 binding used for this request.'); |
93 | - $logger->warning('Request method: ' . var_export($_SERVER['REQUEST_METHOD'], true)); |
|
93 | + $logger->warning('Request method: '.var_export($_SERVER['REQUEST_METHOD'], true)); |
|
94 | 94 | if (!empty($_GET)) { |
95 | - $logger->warning("GET parameters: '" . implode("', '", array_map('addslashes', array_keys($_GET))) . "'"); |
|
95 | + $logger->warning("GET parameters: '".implode("', '", array_map('addslashes', array_keys($_GET)))."'"); |
|
96 | 96 | } |
97 | 97 | if (!empty($_POST)) { |
98 | - $logger->warning("POST parameters: '" . implode("', '", array_map('addslashes', array_keys($_POST))) . "'"); |
|
98 | + $logger->warning("POST parameters: '".implode("', '", array_map('addslashes', array_keys($_POST)))."'"); |
|
99 | 99 | } |
100 | 100 | if (isset($_SERVER['CONTENT_TYPE'])) { |
101 | - $logger->warning('Content-Type: ' . var_export($_SERVER['CONTENT_TYPE'], true)); |
|
101 | + $logger->warning('Content-Type: '.var_export($_SERVER['CONTENT_TYPE'], true)); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | throw new \Exception('Unable to find the current binding.'); |
@@ -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 |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | { |
116 | 116 | assert(is_string($name)); |
117 | 117 | |
118 | - $e = Utils::xpQuery($parent, './saml_metadata:' . $name); |
|
118 | + $e = Utils::xpQuery($parent, './saml_metadata:'.$name); |
|
119 | 119 | |
120 | 120 | $ret = array(); |
121 | 121 | foreach ($e as $i) { |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | return null; |
143 | 143 | } |
144 | 144 | if (count($e) > 1) { |
145 | - throw new \Exception('More than one ' . $name . ' in ' . $parent->tagName); |
|
145 | + throw new \Exception('More than one '.$name.' in '.$parent->tagName); |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | return $e[0]; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function emergency($message, array $context = []) |
18 | 18 | { |
19 | - \SimpleSAML\Logger::emergency($message . ($context ? " " . var_export($context, true) : "")); |
|
19 | + \SimpleSAML\Logger::emergency($message.($context ? " ".var_export($context, true) : "")); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function alert($message, array $context = []) |
33 | 33 | { |
34 | - \SimpleSAML\Logger::alert($message . ($context ? " " . var_export($context, true) : "")); |
|
34 | + \SimpleSAML\Logger::alert($message.($context ? " ".var_export($context, true) : "")); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function critical($message, array $context = []) |
47 | 47 | { |
48 | - \SimpleSAML\Logger::critical($message . ($context ? " " . var_export($context, true) : "")); |
|
48 | + \SimpleSAML\Logger::critical($message.($context ? " ".var_export($context, true) : "")); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function error($message, array $context = []) |
60 | 60 | { |
61 | - \SimpleSAML\Logger::error($message . ($context ? " " . var_export($context, true) : "")); |
|
61 | + \SimpleSAML\Logger::error($message.($context ? " ".var_export($context, true) : "")); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function warning($message, array $context = []) |
75 | 75 | { |
76 | - \SimpleSAML\Logger::warning($message . ($context ? " " . var_export($context, true) : "")); |
|
76 | + \SimpleSAML\Logger::warning($message.($context ? " ".var_export($context, true) : "")); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public function notice($message, array $context = []) |
87 | 87 | { |
88 | - \SimpleSAML\Logger::notice($message . ($context ? " " . var_export($context, true) : "")); |
|
88 | + \SimpleSAML\Logger::notice($message.($context ? " ".var_export($context, true) : "")); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function info($message, array $context = []) |
101 | 101 | { |
102 | - \SimpleSAML\Logger::info($message . ($context ? " " . var_export($context, true) : "")); |
|
102 | + \SimpleSAML\Logger::info($message.($context ? " ".var_export($context, true) : "")); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | */ |
112 | 112 | public function debug($message, array $context = []) |
113 | 113 | { |
114 | - \SimpleSAML\Logger::debug($message . ($context ? " " . var_export($context, true) : "")); |
|
114 | + \SimpleSAML\Logger::debug($message.($context ? " ".var_export($context, true) : "")); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -159,7 +159,7 @@ |
||
159 | 159 | $type = null; |
160 | 160 | } |
161 | 161 | |
162 | - $attributeValue = Utils::addString($attribute, Constants::NS_SAML, 'saml:AttributeValue', (string)$value); |
|
162 | + $attributeValue = Utils::addString($attribute, Constants::NS_SAML, 'saml:AttributeValue', (string) $value); |
|
163 | 163 | if ($type !== null) { |
164 | 164 | $attributeValue->setAttributeNS(Constants::NS_XSI, 'xsi:type', $type); |
165 | 165 | } |