Skip to content

Commit a01f4fb

Browse files
mikaelcommikaelcom
committed
Merge branch 'release/2.0.5'
2 parents 131785c + fd10e59 commit a01f4fb

File tree

8 files changed

+40
-23
lines changed

8 files changed

+40
-23
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# CHANGELOG
22

3+
## 2.0.5 - 2022/05/05
4+
- Merged PR #15
5+
36
## 2.0.4 - 2022/03/24
47
- Upgrade PHP CS Fixer
58

‎composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
"name": "baijunyao",
3030
"email": "baijunyao@baijunyao.com",
3131
"role": "Contributor"
32+
},
33+
{
34+
"name": "liquid207",
35+
"role": "Contributor"
3236
}
3337
],
3438
"support" : {

‎src/Created.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Created extends Element
88
{
99
public const NAME = 'Created';
1010

11-
public function __construct(int $timestamp, string $namespace = self::NS_WSSU)
11+
public function __construct(int $timestamp, string $namespace = self::NS_WSU)
1212
{
1313
$this->setTimestampValue($timestamp);
1414
parent::__construct(self::NAME, $namespace, $this->getTimestampValue(true));

‎src/Element.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,20 @@ class Element
1919

2020
public const NS_WSSE_NAME = 'wsse';
2121

22+
/**
23+
* @deprecated
24+
*/
2225
public const NS_WSSU = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd';
2326

27+
public const NS_WSU = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd';
28+
29+
/**
30+
* @deprecated
31+
*/
2432
public const NS_WSSU_NAME = 'wssu';
2533

34+
public const NS_WSU_NAME = 'wsu';
35+
2636
protected string $name = '';
2737

2838
/**
@@ -262,10 +272,10 @@ protected function appendAttributesToElementToSend(DOMElement $element): self
262272

263273
foreach ($this->getAttributes() as $attributeName => $attributeValue) {
264274
$matches = [];
265-
if (0 === preg_match(sprintf('/(%s|%s):/', self::NS_WSSU_NAME, self::NS_WSSE_NAME), $attributeName, $matches)) {
275+
if (0 === preg_match(sprintf('/(%s|%s):/', self::NS_WSU_NAME, self::NS_WSSE_NAME), $attributeName, $matches)) {
266276
$element->setAttribute($attributeName, (string) $attributeValue);
267277
} else {
268-
$element->setAttributeNS(self::NS_WSSE_NAME === $matches[1] ? self::NS_WSSE : self::NS_WSSU, $attributeName, $attributeValue);
278+
$element->setAttributeNS(self::NS_WSSE_NAME === $matches[1] ? self::NS_WSSE : self::NS_WSU, $attributeName, $attributeValue);
269279
}
270280
}
271281

@@ -290,8 +300,8 @@ private function getNamespacePrefix(): string
290300

291301
break;
292302

293-
case self::NS_WSSU:
294-
$namespacePrefix = self::NS_WSSU_NAME;
303+
case self::NS_WSU:
304+
$namespacePrefix = self::NS_WSU_NAME;
295305

296306
break;
297307
}

‎src/Expires.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Expires extends Element
88
{
99
public const NAME = 'Expires';
1010

11-
public function __construct(int $timestamp, int $expiresIn = 3600, string $namespace = self::NS_WSSU)
11+
public function __construct(int $timestamp, int $expiresIn = 3600, string $namespace = self::NS_WSU)
1212
{
1313
$this->setTimestampValue($timestamp + $expiresIn);
1414
parent::__construct(self::NAME, $namespace, $this->getTimestampValue(true));

‎src/Timestamp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Timestamp extends Element
1414

1515
protected ?Expires $expires;
1616

17-
public function __construct(string $namespace = self::NS_WSSU)
17+
public function __construct(string $namespace = self::NS_WSU)
1818
{
1919
parent::__construct(self::NAME, $namespace);
2020
}

‎src/UsernameToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class UsernameToken extends Element
2323
public function __construct(?string $id = null, string $namespace = self::NS_WSSE)
2424
{
2525
parent::__construct(self::NAME, $namespace, null, empty($id) ? [] : [
26-
sprintf('%s:%s', parent::NS_WSSU_NAME, self::ATTRIBUTE_ID) => $id,
26+
sprintf('%s:%s', parent::NS_WSU_NAME, self::ATTRIBUTE_ID) => $id,
2727
]);
2828
}
2929

‎tests/WsSecurityTest.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public function testCreateWithExpiresIn()
2222
<wsse:UsernameToken>
2323
<wsse:Username>foo</wsse:Username>
2424
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
25-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
25+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
2626
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
2727
</wsse:UsernameToken>
28-
<wssu:Timestamp xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
29-
<wssu:Created>2016-03-31T19:17:04Z</wssu:Created>
30-
<wssu:Expires>2016-03-31T19:27:04Z</wssu:Expires>
31-
</wssu:Timestamp>
28+
<wsu:Timestamp xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
29+
<wsu:Created>2016-03-31T19:17:04Z</wsu:Created>
30+
<wsu:Expires>2016-03-31T19:27:04Z</wsu:Expires>
31+
</wsu:Timestamp>
3232
</wsse:Security>'), $header->data->enc_value);
3333
}
3434

@@ -41,7 +41,7 @@ public function testCreateWithoutExpiresIn()
4141
<wsse:UsernameToken>
4242
<wsse:Username>foo</wsse:Username>
4343
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
44-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
44+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
4545
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
4646
</wsse:UsernameToken>
4747
</wsse:Security>'), $header->data->enc_value);
@@ -56,7 +56,7 @@ public function testCreateWithMustUnderstand()
5656
<wsse:UsernameToken>
5757
<wsse:Username>foo</wsse:Username>
5858
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
59-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
59+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
6060
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
6161
</wsse:UsernameToken>
6262
</wsse:Security>'), $header->data->enc_value);
@@ -71,7 +71,7 @@ public function testCreateWithMustUnderstandAndActor()
7171
<wsse:UsernameToken>
7272
<wsse:Username>foo</wsse:Username>
7373
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
74-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
74+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
7575
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
7676
</wsse:UsernameToken>
7777
</wsse:Security>'), $header->data->enc_value);
@@ -86,7 +86,7 @@ public function testCreateSoapVar()
8686
<wsse:UsernameToken>
8787
<wsse:Username>foo</wsse:Username>
8888
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
89-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
89+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
9090
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
9191
</wsse:UsernameToken>
9292
</wsse:Security>'), $header->enc_value);
@@ -101,7 +101,7 @@ public function testCreateWithPasswordDigest()
101101
<wsse:UsernameToken>
102102
<wsse:Username>foo</wsse:Username>
103103
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">([a-zA-Z0-9=/+]*)</wsse:Password>
104-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
104+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
105105
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
106106
</wsse:UsernameToken>
107107
</wsse:Security>'), $header->enc_value);
@@ -113,10 +113,10 @@ public function testCreateWithUsernameId()
113113
$this->assertInstanceOf(SoapHeader::class, $header);
114114
$this->assertMatches(self::innerTrim('
115115
<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustunderstand="1" SOAP-ENV:actor="BAR">
116-
<wsse:UsernameToken xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wssu:Id="X90I3u8">
116+
<wsse:UsernameToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="X90I3u8">
117117
<wsse:Username>foo</wsse:Username>
118118
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
119-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
119+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
120120
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
121121
</wsse:UsernameToken>
122122
</wsse:Security>'), $header->data->enc_value);
@@ -128,10 +128,10 @@ public function testCreateWithoutNonce()
128128
$this->assertInstanceOf(SoapHeader::class, $header);
129129
$this->assertMatches(self::innerTrim('
130130
<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustunderstand="1" SOAP-ENV:actor="BAR">
131-
<wsse:UsernameToken xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wssu:Id="X90I3u8">
131+
<wsse:UsernameToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="X90I3u8">
132132
<wsse:Username>foo</wsse:Username>
133133
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
134-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
134+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
135135
</wsse:UsernameToken>
136136
</wsse:Security>'), $header->data->enc_value);
137137
}
@@ -158,7 +158,7 @@ public function testCreateWithEnvelopeNamespace()
158158
<wsse:UsernameToken>
159159
<wsse:Username>foo</wsse:Username>
160160
<wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
161-
<wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
161+
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wsu:Created>
162162
<wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
163163
</wsse:UsernameToken>
164164
</wsse:Security>'), $header->data->enc_value);

0 commit comments

Comments
 (0)