Skip to content

Commit 2d861b2

Browse files
authored
Merge pull request #592 from mrbrown8/master
Speling misteaks
2 parents 59475ba + 54e1450 commit 2d861b2

24 files changed

+73
-73
lines changed

CHANGELOG

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ v.2.19.0
3030
* [#433](https://github.com/onelogin/php-saml/issues/443) Fix Incorrect Destination in LogoutResponse when using responseUrl #443
3131
* Add support for SMARTCARD_PKI and RSA_TOKEN Auth Contexts
3232
* Support Statements with Attribute elements with the same name enabling the allowRepeatAttributeName setting
33-
* Get lib path dinamically
33+
* Get lib path dynamically
3434
* Check for x509Cert of the IdP when loading settings, even if the security index was not provided
3535

3636
v.2.18.1
@@ -53,7 +53,7 @@ v.2.17.1
5353
v.2.17.0
5454
* Set true as the default value for strict setting
5555
* Support 'x509cert' and 'privateKey' on signMetadata security settings
56-
* Relax comparision of false on SignMetadata
56+
* Relax comparison of false on SignMetadata
5757
* Fix CI
5858

5959
v.2.16.0
@@ -92,7 +92,7 @@ v.2.12.0
9292
* [#263](https://github.com/onelogin/php-saml/issues/263) Fix incompatibility with ADFS on SLO. When on php saml settings NameID Format is set as unspecified but the SAMLResponse has no NameID Format, no NameID Format should be specified on LogoutRequest.
9393

9494
v.2.11.0
95-
* [#236](https://github.com/onelogin/php-saml/pull/236) Exclude unnecesary files from Composer production downloads
95+
* [#236](https://github.com/onelogin/php-saml/pull/236) Exclude unnecessary files from Composer production downloads
9696
* [#226](https://github.com/onelogin/php-saml/pull/226) Add possibility to handle nameId NameQualifier attribute in SLO Request
9797
* Improve logout documentation on Readme.
9898
* Improve multi-certificate support
@@ -205,7 +205,7 @@ v.2.6.1
205205
-------
206206
* Fix bug on cacheDuration of the Metadata XML generated.
207207
* Make SPNameQualifier optional on the generateNameId method. Avoid the use of SPNameQualifier when generating the NameID on the LogoutRequest builder.
208-
* Allows the authn comparsion attribute to be set via config.
208+
* Allows the authn comparison attribute to be set via config.
209209
* Retrieve Session Timeout after processResponse with getSessionExpiration().
210210
* Improve readme readability.
211211
* Allow single log out to work for applications not leveraging php session_start. Added a callback parameter in order to close the session at processSLO.
@@ -223,8 +223,8 @@ v.2.6.0
223223

224224
v.2.5.0
225225
-------
226-
* Do accesible the ID of the object Logout Request (id attribute).
227-
* Add note about the fact that PHP 5.3 is unssuported.
226+
* Do accessible the ID of the object Logout Request (id attribute).
227+
* Add note about the fact that PHP 5.3 is unsupported.
228228
* Add fingerprint algorithm support.
229229
* Add dependences to composer.
230230

@@ -252,7 +252,7 @@ v.2.2.0
252252
-------
253253
* Fix bug with Encrypted nameID on LogoutRequest.
254254
* Fixed usability bug. SP will inform about AuthFail status after process a Response.
255-
* Added SessionIndex support on LogoutRequest, and know is accesible from the Auth class.
255+
* Added SessionIndex support on LogoutRequest, and know is accessible from the Auth class.
256256
* LogoutRequest and LogoutResponse classes now accept non deflated xml.
257257
* Improved the XML metadata/ Decrypted Assertion output. (prettyprint).
258258
* Fix bug in formatPrivateKey method, the key could be not RSA.

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,11 @@ $advancedSettings = array (
556556

557557
// If true, Destination URL should strictly match to the address to
558558
// which the response has been sent.
559-
// Notice that if 'relaxDestinationValidation' is true an empty Destintation
559+
// Notice that if 'relaxDestinationValidation' is true an empty Destination
560560
// will be accepted.
561561
'destinationStrictlyMatches' => false,
562562

563-
// If true, SAMLResponses with an InResponseTo value will be rejectd if not
563+
// If true, SAMLResponses with an InResponseTo value will be rejected if not
564564
// AuthNRequest ID provided to the validation method.
565565
'rejectUnsolicitedResponsesWithInResponseTo' => false,
566566

@@ -600,7 +600,7 @@ $advancedSettings = array (
600600
),
601601

602602
// Organization information template, the info in en_US lang is
603-
// recomended, add more if required.
603+
// v, add more if required.
604604
'organization' => array (
605605
'en-US' => array(
606606
'name' => '',
@@ -947,7 +947,7 @@ $auth->processSLO(false, $requestID);
947947
$errors = $auth->getErrors();
948948

949949
if (empty($errors)) {
950-
echo 'Sucessfully logged out';
950+
echo 'Successfully logged out';
951951
} else {
952952
echo implode(', ', $errors);
953953
}
@@ -1154,7 +1154,7 @@ if (isset($_GET['sso'])) { // SSO action. Will send an AuthNRequest to the I
11541154
echo '<p>', implode(', ', $errors), '</p>';
11551155
}
11561156
// This check if the response was
1157-
if (!$auth->isAuthenticated()) { // sucessfully validated and the user
1157+
if (!$auth->isAuthenticated()) { // successfully validated and the user
11581158
echo "<p>Not authenticated</p>"; // data retrieved or not
11591159
exit();
11601160
}
@@ -1169,7 +1169,7 @@ if (isset($_GET['sso'])) { // SSO action. Will send an AuthNRequest to the I
11691169
$auth->processSLO(); // Process the Logout Request & Logout Response
11701170
$errors = $auth->getErrors(); // Retrieves possible validation errors
11711171
if (empty($errors)) {
1172-
echo '<p>Sucessfully logged out</p>';
1172+
echo '<p>Successfully logged out</p>';
11731173
} else {
11741174
echo '<p>', implode(', ', $errors), '</p>';
11751175
}
@@ -1419,7 +1419,7 @@ SAML 2 Authentication Response class
14191419
SAML 2 Logout Request class
14201420

14211421
* `OneLogin_Saml2_LogoutRequest` - Constructs the Logout Request object.
1422-
* `getRequest` - Returns the Logout Request defated, base64encoded, unsigned
1422+
* `getRequest` - Returns the Logout Request deflated, base64encoded, unsigned
14231423
* `getID` - Returns the ID of the Logout Request. (If you have the object you can access to the id attribute)
14241424
* `getNameIdData` - Gets the NameID Data of the the Logout Request.
14251425
* `getNameId` - Gets the NameID of the Logout Request.
@@ -1486,7 +1486,7 @@ A class that contains functionality related to the metadata of the SP
14861486

14871487
* `builder` - Generates the metadata of the SP based on the settings.
14881488
* `signmetadata` - Signs the metadata with the key/cert provided
1489-
* `addX509KeyDescriptors` - Adds the x509 descriptors (sign/encriptation) to
1489+
* `addX509KeyDescriptors` - Adds the x509 descriptors (sign/encryption) to
14901490
the metadata
14911491

14921492
##### OneLogin_Saml2_Utils - `Utils.php` #####

advanced_settings_example.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@
9191

9292
// If true, Destination URL should strictly match to the address to
9393
// which the response has been sent.
94-
// Notice that if 'relaxDestinationValidation' is true an empty Destintation
94+
// Notice that if 'relaxDestinationValidation' is true an empty Destination
9595
// will be accepted.
9696
'destinationStrictlyMatches' => false,
9797

98-
// If true, SAMLResponses with an InResponseTo value will be rejectd if not
98+
// If true, SAMLResponses with an InResponseTo value will be rejected if not
9999
// AuthNRequest ID provided to the validation method.
100100
'rejectUnsolicitedResponsesWithInResponseTo' => false,
101101

@@ -121,7 +121,7 @@
121121
'lowercaseUrlencoding' => false,
122122
),
123123

124-
// Contact information template, it is recommended to suply a technical and support contacts
124+
// Contact information template, it is recommended to supply a technical and support contacts
125125
'contactPerson' => array (
126126
'technical' => array (
127127
'givenName' => '',
@@ -133,7 +133,7 @@
133133
),
134134
),
135135

136-
// Organization information template, the info in en_US lang is recomended, add more if required
136+
// Organization information template, the info in en_US lang is recommended, add more if required
137137
'organization' => array (
138138
'en-US' => array(
139139
'name' => '',

demo1/Readme.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ How it works
4343
notice that a RelayState parameter is set to the url that initiated the
4444
process, the index.php view.
4545

46-
2.2 in the second link we access to (attrs.php) have the same process described at 2.1 with the diference that as RelayState is set the attrs.php
46+
2.2 in the second link we access to (attrs.php) have the same process described at 2.1 with the difference that as RelayState is set the attrs.php
4747

4848
3. The SAML Response is processed in the ACS (index.php?acs), if the Response
4949
is not valid, the process stop here and a message is showed. Otherwise we
@@ -64,7 +64,7 @@ How it works
6464
side, the logout process is initiated at the idP, sends a Logout Request to the SP (SLS endpoint, index.php?sls). The SLS endpoint of the SP
6565
process the Logout Request and if is valid, close the session of the user
6666
at the local app and send a Logout Response to the IdP (to the SLS endpoint
67-
of the IdP). The IdP recieve the Logout Response, process it and close the
67+
of the IdP). The IdP receive the Logout Response, process it and close the
6868
session at of the IdP. Notice that the SLO Workflow starts and ends at the IdP.
6969

7070
Notice that all the SAML Requests and Responses are handler at a unique file,

demo1/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
$auth->processSLO(false, $requestID);
106106
$errors = $auth->getErrors();
107107
if (empty($errors)) {
108-
echo '<p>Sucessfully logged out</p>';
108+
echo '<p>Successfully logged out</p>';
109109
} else {
110110
echo '<p>', htmlentities(implode(', ', $errors)), '</p>';
111111
if ($auth->getSettings()->isDebugActive()) {

demo2/Readme.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ demo1, only changes the targets.
5454
3. We are logged in the app and the user attributes are showed.
5555
At this point, we can test the single log out functionality.
5656

57-
4. The single log out funcionality could be tested by 2 ways.
57+
4. The single log out functionality could be tested by 2 ways.
5858

5959
4.1 SLO Initiated by SP. Click on the "logout" link at the SP, after that
6060
we are redirected to the slo.php view and there a Logout Request is sent
@@ -69,7 +69,7 @@ demo1, only changes the targets.
6969
Request to the SP (SLS endpoint sls.php of the endpoint folder).
7070
The SLS endpoint of the SP process the Logout Request and if is valid,
7171
close the session of the user at the local app and sends a Logout Response
72-
to the IdP (to the SLS endpoint of the IdP).The IdP recieves the Logout
72+
to the IdP (to the SLS endpoint of the IdP).The IdP receives the Logout
7373
Response, process it and close the session at of the IdP. Notice that the
7474
SLO Workflow starts and ends at the IdP.
7575

docs/Saml2/files/Settings.php.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ class OneLogin_Saml2_Settings
684684
|| !isset($organization['displayname']) || empty($organization['displayname'])
685685
|| !isset($organization['url']) || empty($organization['url'])
686686
) {
687-
$errors[] = 'organization_not_enought_data';
687+
$errors[] = 'organization_not_enough_data';
688688
break;
689689
}
690690
}

endpoints/sls.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
$errors = $auth->getErrors();
1515

1616
if (empty($errors)) {
17-
echo 'Sucessfully logged out';
17+
echo 'Successfully logged out';
1818
} else {
1919
echo htmlentities(implode(', ', $errors));
2020
}

lib/Saml2/LogoutRequest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function __construct(OneLogin_Saml2_Settings $settings, $request = null,
136136

137137

138138
/**
139-
* Returns the Logout Request defated, base64encoded, unsigned
139+
* Returns the Logout Request deflated, base64encoded, unsigned
140140
*
141141
* @param bool|null $deflate Whether or not we should 'gzdeflate' the request body before we return it.
142142
*

lib/Saml2/LogoutResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public function isValid($requestId = null, $retrieveParametersFromServer = false
213213
}
214214

215215
/**
216-
* Extracts a node from the DOMDocument (Logout Response Menssage)
216+
* Extracts a node from the DOMDocument (Logout Response Message)
217217
*
218218
* @param string $query Xpath Expresion
219219
*

lib/Saml2/Response.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public function isValid($requestId = null)
218218
);
219219
}
220220

221-
// Validate Asserion timestamps
221+
// Validate Assertion timestamps
222222
$this->validateTimestamps();
223223

224224
// Validate AuthnStatement element exists and is unique
@@ -983,9 +983,9 @@ public function validateSignedElements($signedElements)
983983
$responseTag = '{'.OneLogin_Saml2_Constants::NS_SAMLP.'}Response';
984984
$assertionTag = '{'.OneLogin_Saml2_Constants::NS_SAML.'}Assertion';
985985

986-
$ocurrence = array_count_values($signedElements);
987-
if ((in_array($responseTag, $signedElements) && $ocurrence[$responseTag] > 1) ||
988-
(in_array($assertionTag, $signedElements) && $ocurrence[$assertionTag] > 1) ||
986+
$occurrence = array_count_values($signedElements);
987+
if ((in_array($responseTag, $signedElements) && $occurrence[$responseTag] > 1) ||
988+
(in_array($assertionTag, $signedElements) && $occurrence[$assertionTag] > 1) ||
989989
!in_array($responseTag, $signedElements) && !in_array($assertionTag, $signedElements)
990990
) {
991991
return false;
@@ -1068,7 +1068,7 @@ protected function _queryAssertion($assertionXpath)
10681068
}
10691069

10701070
/**
1071-
* Extracts nodes that match the query from the DOMDocument (Response Menssage)
1071+
* Extracts nodes that match the query from the DOMDocument (Response Message)
10721072
*
10731073
* @param string $query Xpath Expresion
10741074
*

lib/Saml2/Settings.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ public function checkSPSettings($settings)
672672
if (!isset($contact['givenName']) || empty($contact['givenName'])
673673
|| !isset($contact['emailAddress']) || empty($contact['emailAddress'])
674674
) {
675-
$errors[] = 'contact_not_enought_data';
675+
$errors[] = 'contact_not_enough_data';
676676
break;
677677
}
678678
}
@@ -684,7 +684,7 @@ public function checkSPSettings($settings)
684684
|| !isset($organization['displayname']) || empty($organization['displayname'])
685685
|| !isset($organization['url']) || empty($organization['url'])
686686
) {
687-
$errors[] = 'organization_not_enought_data';
687+
$errors[] = 'organization_not_enough_data';
688688
break;
689689
}
690690
}
@@ -1040,7 +1040,7 @@ public function formatIdPCert()
10401040
}
10411041

10421042
/**
1043-
* Formats the Multple IdP certs.
1043+
* Formats the Multiple IdP certs.
10441044
*/
10451045
public function formatIdPCertMulti()
10461046
{

lib/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<xs:element name="TechnicalProtection" type="TechnicalProtectionBaseType">
6464
<xs:annotation>
6565
<xs:documentation>
66-
Refers to those characterstics that describe how the
66+
Refers to those characteristics that describe how the
6767
'secret' (the knowledge or possession
6868
of which allows the Principal to authenticate to the
6969
Authentication Authority) is kept secure
@@ -429,7 +429,7 @@
429429
<xs:annotation>
430430
<xs:documentation>
431431
This element indicates that the Authenticator has been
432-
transmitted using a transport mechnanism protected by an SSL or TLS
432+
transmitted using a transport mechanism protected by an SSL or TLS
433433
session.
434434
</xs:documentation>
435435
</xs:annotation>

tests/ZendModStandard/Sniffs/Debug/CodeAnalyzerSniff.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
7575

7676
// There is the possibility to pass "--ide" as an option to the analyzer.
7777
// This would result in an output format which would be easier to parse.
78-
// The problem here is that no cleartext error messages are returnwd; only
78+
// The problem here is that no cleartext error messages are returned; only
7979
// error-code-labels. So for a start we go for cleartext output.
8080
$exitCode = exec($cmd, $output, $retval);
8181

82-
// $exitCode is the last line of $output if no error occures, on error it
82+
// $exitCode is the last line of $output if no error occurs, on error it
8383
// is numeric. Try to handle various error conditions and provide useful
8484
// error reporting.
8585
if (is_numeric($exitCode) === true && $exitCode > 0) {

tests/ZendModStandard/ruleset.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<ruleset name="ZendModStandard">
3-
<description>A coding standard based on an early Zend Framework coding standard. Note that this standard is out of date. And removed the line lenght limitation</description>
3+
<description>A coding standard based on an early Zend Framework coding standard. Note that this standard is out of date. And removed the line length limitation</description>
44

55
<!-- Include some sniffs from all around the place -->
66
<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>

tests/data/metadata/idp/idp_metadata_multi_certs.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.examle.com/saml/metadata">
2+
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.example.com/saml/metadata">
33
<IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
44
<KeyDescriptor use="signing">
55
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -68,8 +68,8 @@ WQO0LPxPqRiUqUzyhDhLo/xXNrHCu4VbMw==</ds:X509Certificate>
6868
</ds:X509Data>
6969
</ds:KeyInfo>
7070
</KeyDescriptor>
71-
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.examle.com/saml/slo"/>
71+
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.example.com/saml/slo"/>
7272
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
73-
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.examle.com/saml/sso"/>
73+
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.example.com/saml/sso"/>
7474
</IDPSSODescriptor>
75-
</EntityDescriptor>
75+
</EntityDescriptor>

tests/data/metadata/idp/idp_metadata_multi_signing_certs.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.examle.com/saml/metadata">
2+
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.example.com/saml/metadata">
33
<IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
44
<KeyDescriptor use="signing">
55
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -68,8 +68,8 @@ WQO0LPxPqRiUqUzyhDhLo/xXNrHCu4VbMw==</ds:X509Certificate>
6868
</ds:X509Data>
6969
</ds:KeyInfo>
7070
</KeyDescriptor>
71-
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.examle.com/saml/slo"/>
71+
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.example.com/saml/slo"/>
7272
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
73-
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.examle.com/saml/sso"/>
73+
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.example.com/saml/sso"/>
7474
</IDPSSODescriptor>
7575
</EntityDescriptor>

0 commit comments

Comments
 (0)