Skip to content

Commit 0e7186c

Browse files
pitbulkpitbulk
committed
Fix code style
1 parent 461d724 commit 0e7186c

5 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎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
@@ -92,7 +92,7 @@ public function __construct(OneLogin_Saml2_Settings $settings, $request = null,
9292

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

95-
$sp_entity_id = htmlspecialchars($spData['entityId'], ENT_QUOTES);
95+
$spEntityId = htmlspecialchars($spData['entityId'], ENT_QUOTES);
9696
$logoutRequest = <<<LOGOUTREQUEST
9797
<samlp:LogoutRequest
9898
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
@@ -101,7 +101,7 @@ public function __construct(OneLogin_Saml2_Settings $settings, $request = null,
101101
Version="2.0"
102102
IssueInstant="{$issueInstant}"
103103
Destination="{$idpData['singleLogoutService']['url']}">
104-
<saml:Issuer>{$sp_entity_id}</saml:Issuer>
104+
<saml:Issuer>{$spEntityId}</saml:Issuer>
105105
{$nameIdObj}
106106
{$sessionIndexStr}
107107
</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
@@ -40,10 +40,10 @@ public static function builder($sp, $authnsign = false, $wsign = false, $validUn
4040
$sls = '';
4141

4242
if (isset($sp['singleLogoutService'])) {
43-
$sls_url = htmlspecialchars($sp['singleLogoutService']['url'], ENT_QUOTES);
43+
$slsUrl = htmlspecialchars($sp['singleLogoutService']['url'], ENT_QUOTES);
4444
$sls = <<<SLS_TEMPLATE
4545
<md:SingleLogoutService Binding="{$sp['singleLogoutService']['binding']}"
46-
Location="{$sls_url}" />
46+
Location="{$slsUrl}" />
4747
4848
SLS_TEMPLATE;
4949
}
@@ -152,18 +152,18 @@ public static function builder($sp, $authnsign = false, $wsign = false, $validUn
152152
METADATA_TEMPLATE;
153153
}
154154

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

‎lib/Saml2/Settings.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ public function __construct($settings = null, $spValidationOnly = false)
133133
array(implode(', ', $this->_errors))
134134
);
135135
} else {
136-
throw new OneLogin_Saml2_Error(
137-
'Invalid array settings: %s',
138-
OneLogin_Saml2_Error::SETTINGS_INVALID,
139-
array(implode(', ', $this->_errors))
140-
);
136+
throw new OneLogin_Saml2_Error(
137+
'Invalid array settings: %s',
138+
OneLogin_Saml2_Error::SETTINGS_INVALID,
139+
array(implode(', ', $this->_errors))
140+
);
141141
}
142142

143143
$this->formatIdPCert();
@@ -930,12 +930,12 @@ public function formatIdPCertMulti()
930930
{
931931
if (isset($this->_idp['x509certMulti'])) {
932932
if (isset($this->_idp['x509certMulti']['signing'])) {
933-
foreach($this->_idp['x509certMulti']['signing'] as $i => $cert) {
933+
foreach ($this->_idp['x509certMulti']['signing'] as $i => $cert) {
934934
$this->_idp['x509certMulti']['signing'][$i] = OneLogin_Saml2_Utils::formatCert($cert);
935935
}
936936
}
937937
if (isset($this->_idp['x509certMulti']['encryption'])) {
938-
foreach($this->_idp['x509certMulti']['encryption'] as $i => $cert) {
938+
foreach ($this->_idp['x509certMulti']['encryption'] as $i => $cert) {
939939
$this->_idp['x509certMulti']['encryption'][$i] = OneLogin_Saml2_Utils::formatCert($cert);
940940
}
941941
}

0 commit comments

Comments
 (0)