Skip to content

Commit 383d62e

Browse files
committed
Fix code style
1 parent 4772b86 commit 383d62e

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

lib/Saml2/AuthnRequest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ public function __construct(OneLogin_Saml2_Settings $settings, $forceAuthn = fal
114114
}
115115
}
116116

117-
$sp_entity_id = htmlspecialchars($spData['entityId'], ENT_QUOTES);
118-
$acs_url = htmlspecialchars($spData['assertionConsumerService']['url'], ENT_QUOTES);
117+
$spEntityId = htmlspecialchars($spData['entityId'], ENT_QUOTES);
118+
$acsUrl = htmlspecialchars($spData['assertionConsumerService']['url'], ENT_QUOTES);
119119
$request = <<<AUTHNREQUEST
120120
<samlp:AuthnRequest
121121
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
@@ -126,8 +126,8 @@ public function __construct(OneLogin_Saml2_Settings $settings, $forceAuthn = fal
126126
IssueInstant="$issueInstant"
127127
Destination="{$idpData['singleSignOnService']['url']}"
128128
ProtocolBinding="{$spData['assertionConsumerService']['binding']}"
129-
AssertionConsumerServiceURL="{$acs_url}">
130-
<saml:Issuer>{$sp_entity_id}</saml:Issuer>
129+
AssertionConsumerServiceURL="{$acsUrl}">
130+
<saml:Issuer>{$spEntityId}</saml:Issuer>
131131
{$nameIdPolicyStr}
132132
{$requestedAuthnStr}
133133
</samlp:AuthnRequest>

lib/Saml2/LogoutRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function __construct(OneLogin_Saml2_Settings $settings, $request = null,
9090

9191
$sessionIndexStr = isset($sessionIndex) ? "<samlp:SessionIndex>{$sessionIndex}</samlp:SessionIndex>" : "";
9292

93-
$sp_entity_id = htmlspecialchars($spData['entityId'], ENT_QUOTES);
93+
$spEntityId = htmlspecialchars($spData['entityId'], ENT_QUOTES);
9494
$logoutRequest = <<<LOGOUTREQUEST
9595
<samlp:LogoutRequest
9696
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
@@ -99,7 +99,7 @@ public function __construct(OneLogin_Saml2_Settings $settings, $request = null,
9999
Version="2.0"
100100
IssueInstant="{$issueInstant}"
101101
Destination="{$idpData['singleLogoutService']['url']}">
102-
<saml:Issuer>{$sp_entity_id}</saml:Issuer>
102+
<saml:Issuer>{$spEntityId}</saml:Issuer>
103103
{$nameIdObj}
104104
{$sessionIndexStr}
105105
</samlp:LogoutRequest>

lib/Saml2/LogoutResponse.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function build($inResponseTo)
221221
$this->id = OneLogin_Saml2_Utils::generateUniqueID();
222222
$issueInstant = OneLogin_Saml2_Utils::parseTime2SAML(time());
223223

224-
$sp_entity_id = htmlspecialchars($spData['entityId'], ENT_QUOTES);
224+
$spEntityId = htmlspecialchars($spData['entityId'], ENT_QUOTES);
225225
$logoutResponse = <<<LOGOUTRESPONSE
226226
<samlp:LogoutResponse xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
227227
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
@@ -231,7 +231,7 @@ public function build($inResponseTo)
231231
Destination="{$idpData['singleLogoutService']['url']}"
232232
InResponseTo="{$inResponseTo}"
233233
>
234-
<saml:Issuer>{$sp_entity_id}</saml:Issuer>
234+
<saml:Issuer>{$spEntityId}</saml:Issuer>
235235
<samlp:Status>
236236
<samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" />
237237
</samlp:Status>

lib/Saml2/Metadata.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public static function builder($sp, $authnsign = false, $wsign = false, $validUn
3838
$sls = '';
3939

4040
if (isset($sp['singleLogoutService'])) {
41-
$sls_url = htmlspecialchars($sp['singleLogoutService']['url'], ENT_QUOTES);
41+
$slsUrl = htmlspecialchars($sp['singleLogoutService']['url'], ENT_QUOTES);
4242
$sls = <<<SLS_TEMPLATE
4343
<md:SingleLogoutService Binding="{$sp['singleLogoutService']['binding']}"
44-
Location="{$sls_url}" />
44+
Location="{$slsUrl}" />
4545
4646
SLS_TEMPLATE;
4747
}
@@ -150,18 +150,18 @@ public static function builder($sp, $authnsign = false, $wsign = false, $validUn
150150
METADATA_TEMPLATE;
151151
}
152152

153-
$sp_entity_id = htmlspecialchars($sp['entityId'], ENT_QUOTES);
154-
$acs_url = htmlspecialchars($sp['assertionConsumerService']['url'], ENT_QUOTES);
153+
$spEntityId = htmlspecialchars($sp['entityId'], ENT_QUOTES);
154+
$acsUrl = htmlspecialchars($sp['assertionConsumerService']['url'], ENT_QUOTES);
155155
$metadata = <<<METADATA_TEMPLATE
156156
<?xml version="1.0"?>
157157
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
158158
validUntil="{$validUntilTime}"
159159
cacheDuration="PT{$cacheDuration}S"
160-
entityID="{$sp_entity_id}">
160+
entityID="{$spEntityId}">
161161
<md:SPSSODescriptor AuthnRequestsSigned="{$strAuthnsign}" WantAssertionsSigned="{$strWsign}" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
162162
{$sls} <md:NameIDFormat>{$sp['NameIDFormat']}</md:NameIDFormat>
163163
<md:AssertionConsumerService Binding="{$sp['assertionConsumerService']['binding']}"
164-
Location="{$acs_url}"
164+
Location="{$acsUrl}"
165165
index="1" />
166166
{$strAttributeConsumingService}
167167
</md:SPSSODescriptor>{$strOrganization}{$strContacts}

lib/Saml2/Settings.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,12 +941,12 @@ public function formatIdPCertMulti()
941941
{
942942
if (isset($this->_idp['x509certMulti'])) {
943943
if (isset($this->_idp['x509certMulti']['signing'])) {
944-
foreach($this->_idp['x509certMulti']['signing'] as $i => $cert) {
944+
foreach ($this->_idp['x509certMulti']['signing'] as $i => $cert) {
945945
$this->_idp['x509certMulti']['signing'][$i] = OneLogin_Saml2_Utils::formatCert($cert);
946946
}
947947
}
948948
if (isset($this->_idp['x509certMulti']['encryption'])) {
949-
foreach($this->_idp['x509certMulti']['encryption'] as $i => $cert) {
949+
foreach ($this->_idp['x509certMulti']['encryption'] as $i => $cert) {
950950
$this->_idp['x509certMulti']['encryption'][$i] = OneLogin_Saml2_Utils::formatCert($cert);
951951
}
952952
}

0 commit comments

Comments
 (0)