Skip to content

Commit a19bde6

Browse files
tvdijentvdijen
authored
Merge pull request #2 from simplesamlphp/feature/php83
Feature/php83
2 parents 364ab31 + 615f4a9 commit a19bde6

44 files changed

Lines changed: 84 additions & 179 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/php.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php-version: ['8.2', '8.3', '8.4', '8.5']
22+
php-version: ['8.3', '8.4', '8.5']
2323

24-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.6
24+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
2525
with:
2626
php-version: ${{ matrix.php-version }}
2727

@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232

33-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.6
33+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
3434
with:
3535
enable_eslinter: false
3636
enable_jsonlinter: true
@@ -45,15 +45,15 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
operating-system: [ubuntu-latest]
48-
php-versions: ['8.2', '8.3', '8.4', '8.5']
48+
php-versions: ['8.3', '8.4', '8.5']
4949

5050
steps:
5151
- name: Setup PHP, with composer and extensions
5252
# https://github.com/shivammathur/setup-php
5353
uses: shivammathur/setup-php@v2
5454
with:
5555
php-version: ${{ matrix.php-versions }}
56-
extensions: ctype, date, dom, pcre, spl, xml
56+
extensions: ctype, date, dom, intl, pcre, sodium, spl, xml
5757
tools: composer
5858
ini-values: error_reporting=E_ALL
5959
coverage: pcov
@@ -107,15 +107,15 @@ jobs:
107107
fail-fast: true
108108
matrix:
109109
operating-system: [windows-latest]
110-
php-versions: ['8.2', '8.3', '8.4', '8.5']
110+
php-versions: ['8.3', '8.4', '8.5']
111111

112112
steps:
113113
- name: Setup PHP, with composer and extensions
114114
# https://github.com/shivammathur/setup-php
115115
uses: shivammathur/setup-php@v2
116116
with:
117117
php-version: ${{ matrix.php-versions }}
118-
extensions: ctype, date, dom, pcre, spl, xml
118+
extensions: ctype, date, dom, intl, pcre, sodium, spl, xml
119119
tools: composer
120120
ini-values: error_reporting=E_ALL
121121
coverage: none
@@ -160,8 +160,8 @@ jobs:
160160
uses: shivammathur/setup-php@v2
161161
with:
162162
# Should be the lowest supported version
163-
php-version: '8.2'
164-
extensions: ctype, date, dom, pcre, spl, xml
163+
php-version: '8.3'
164+
extensions: ctype, date, dom, intl, pcre, sodium, spl, xml
165165
tools: composer
166166
coverage: none
167167

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.2",
13+
"php": "^8.3",
1414
"ext-dom": "*",
1515

1616
"simplesamlphp/assert": "~1.9",
@@ -19,7 +19,7 @@
1919
"simplesamlphp/xml-wss-core": "~1.0"
2020
},
2121
"require-dev": {
22-
"simplesamlphp/simplesamlphp-test-framework": "~1.10",
22+
"simplesamlphp/simplesamlphp-test-framework": "~1.11",
2323
"simplesamlphp/xml-soap": "~2.0"
2424
},
2525
"autoload": {

‎src/Constants.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,46 @@ class Constants extends \SimpleSAML\XML\Constants
1515
/**
1616
* The namespace for WS-Addressing protocol.
1717
*/
18-
public const NS_ADDR_200408 = 'http://schemas.xmlsoap.org/ws/2004/08/addressing';
18+
public const string NS_ADDR_200408 = 'http://schemas.xmlsoap.org/ws/2004/08/addressing';
1919

20-
public const NS_ADDR_200508 = 'http://www.w3.org/2005/08/addressing';
20+
public const string NS_ADDR_200508 = 'http://www.w3.org/2005/08/addressing';
2121

2222
/**
2323
* The namespace for the WS-Addressing - Metadata.
2424
*/
25-
public const NS_ADDR_METADATA = 'http://www.w3.org/2007/02/addressing/metadata';
25+
public const string NS_ADDR_METADATA = 'http://www.w3.org/2007/02/addressing/metadata';
2626

2727
/**
2828
* The namespace for the WS-Addressing - WSDL Binding.
2929
*/
30-
public const NS_ADDR_WSDL = 'http://www.w3.org/2006/05/addressing/wsdl';
30+
public const string NS_ADDR_WSDL = 'http://www.w3.org/2006/05/addressing/wsdl';
3131

3232
/**
3333
* The schema-defined wsa fault codes
3434
*/
35-
public const WSA_FAULT_INVALID_ADDRESSING_HEADER = 'InvalidAddressingHeader';
35+
public const string WSA_FAULT_INVALID_ADDRESSING_HEADER = 'InvalidAddressingHeader';
3636

37-
public const WSA_FAULT_INVALID_ADDRESS = 'InvalidAddress';
37+
public const string WSA_FAULT_INVALID_ADDRESS = 'InvalidAddress';
3838

39-
public const WSA_FAULT_INVALID_EPR = 'InvalidEPR';
39+
public const string WSA_FAULT_INVALID_EPR = 'InvalidEPR';
4040

41-
public const WSA_FAULT_INVALID_CARDINALITY = 'InvalidCardinality';
41+
public const string WSA_FAULT_INVALID_CARDINALITY = 'InvalidCardinality';
4242

43-
public const WSA_FAULT_MISSING_ADDRESS_IN_EPR = 'MissingAddressInEPR';
43+
public const string WSA_FAULT_MISSING_ADDRESS_IN_EPR = 'MissingAddressInEPR';
4444

45-
public const WSA_FAULT_DUPLICATE_MESSAGEID = 'DupicateMessageID';
45+
public const string WSA_FAULT_DUPLICATE_MESSAGEID = 'DupicateMessageID';
4646

47-
public const WSA_FAULT_ACTION_MISMATCH = 'ActionMismatch';
47+
public const string WSA_FAULT_ACTION_MISMATCH = 'ActionMismatch';
4848

49-
public const WSA_FAULT_MESSAGE_ADDRESSING_HEADER_REQUIRED = 'MessageAddressingHeaderRequired';
49+
public const string WSA_FAULT_MESSAGE_ADDRESSING_HEADER_REQUIRED = 'MessageAddressingHeaderRequired';
5050

51-
public const WSA_FAULT_DESTINATION_UNREACHABLE = 'DestinationUnreachable';
51+
public const string WSA_FAULT_DESTINATION_UNREACHABLE = 'DestinationUnreachable';
5252

53-
public const WSA_FAULT_ACTION_NOT_SUPPORTED = 'ActionNotSupported';
53+
public const string WSA_FAULT_ACTION_NOT_SUPPORTED = 'ActionNotSupported';
5454

55-
public const WSA_FAULT_ENDPOINT_UNAVAILABLE = 'EndpointUnavailable';
55+
public const string WSA_FAULT_ENDPOINT_UNAVAILABLE = 'EndpointUnavailable';
5656

57-
public const FAULT_CODES = [
57+
public const array FAULT_CODES = [
5858
self::WSA_FAULT_INVALID_ADDRESSING_HEADER,
5959
self::WSA_FAULT_INVALID_ADDRESS,
6060
self::WSA_FAULT_INVALID_EPR,

‎src/XML/wsa_200408/AbstractAttributedQNameType.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ abstract class AbstractAttributedQNameType extends AbstractWsaElement
2727
use TypedTextContentTrait;
2828

2929

30-
/** @var string */
31-
public const TEXTCONTENT_TYPE = QNameValue::class;
30+
public const string TEXTCONTENT_TYPE = QNameValue::class;
3231

3332
/** The namespace-attribute for the xs:anyElement element */
34-
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
33+
public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
3534

3635

3736
/**
@@ -51,7 +50,6 @@ final public function __construct(QNameValue $value, array $namespacedAttributes
5150
* Convert XML into a class instance
5251
*
5352
* @param \DOMElement $xml The XML element we should load
54-
* @return static
5553
*
5654
* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
5755
* If the qualified name of the supplied element is wrong
@@ -69,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
6967
* Convert this element to XML.
7068
*
7169
* @param \DOMElement|null $parent The element we should append this element to.
72-
* @return \DOMElement
7370
*/
7471
public function toXML(?DOMElement $parent = null): DOMElement
7572
{

‎src/XML/wsa_200408/AbstractAttributedURIType.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ abstract class AbstractAttributedURIType extends AbstractWsaElement
2727
use TypedTextContentTrait;
2828

2929

30-
/** @var string */
31-
public const TEXTCONTENT_TYPE = AnyURIValue::class;
30+
public const string TEXTCONTENT_TYPE = AnyURIValue::class;
3231

3332
/** The namespace-attribute for the xs:anyAttribute element */
34-
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
33+
public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
3534

3635

3736
/**
@@ -51,7 +50,6 @@ final public function __construct(AnyURIValue $value, array $namespacedAttribute
5150
* Convert XML into a class instance
5251
*
5352
* @param \DOMElement $xml The XML element we should load
54-
* @return static
5553
*
5654
* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
5755
* If the qualified name of the supplied element is wrong
@@ -69,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
6967
* Convert this element to XML.
7068
*
7169
* @param \DOMElement|null $parent The element we should append this element to.
72-
* @return \DOMElement
7370
*/
7471
public function toXML(?DOMElement $parent = null): DOMElement
7572
{

‎src/XML/wsa_200408/AbstractEndpointReferenceType.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ abstract class AbstractEndpointReferenceType extends AbstractWsaElement
3232

3333

3434
/** The namespace-attribute for the xs:any element */
35-
public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
35+
public const string XS_ANY_ELT_NAMESPACE = NS::OTHER;
3636

3737
/** The namespace-attribute for the xs:anyAttribute element */
38-
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
38+
public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
3939

4040

4141
/**
@@ -126,7 +126,6 @@ public function getServiceName(): ?ServiceName
126126
* Note: this method cannot be used when extending this class, if the constructor has a different signature.
127127
*
128128
* @param \DOMElement $xml The XML element we should load.
129-
* @return static
130129
*
131130
* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
132131
* if the qualified name of the supplied element is wrong
@@ -175,7 +174,6 @@ public static function fromXML(DOMElement $xml): static
175174
* Add this endpoint reference to an XML element.
176175
*
177176
* @param \DOMElement|null $parent The element we should append this endpoint to.
178-
* @return \DOMElement
179177
*/
180178
public function toXML(?DOMElement $parent = null): DOMElement
181179
{

‎src/XML/wsa_200408/AbstractRelationshipType.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ abstract class AbstractRelationshipType extends AbstractWsaElement
2828
use TypedTextContentTrait;
2929

3030

31-
/** @var string */
32-
public const TEXTCONTENT_TYPE = AnyURIValue::class;
31+
public const string TEXTCONTENT_TYPE = AnyURIValue::class;
3332

3433
/** The namespace-attribute for the xs:anyAttribute element */
35-
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
34+
public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
3635

3736

3837
/**
@@ -65,7 +64,6 @@ public function getRelationshipType(): ?QNameValue
6564
* Convert XML into a class instance
6665
*
6766
* @param \DOMElement $xml The XML element we should load
68-
* @return static
6967
*
7068
* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
7169
* If the qualified name of the supplied element is wrong
@@ -87,7 +85,6 @@ public static function fromXML(DOMElement $xml): static
8785
* Convert this element to XML.
8886
*
8987
* @param \DOMElement|null $parent The element we should append this element to.
90-
* @return \DOMElement
9188
*/
9289
public function toXML(?DOMElement $parent = null): DOMElement
9390
{

‎src/XML/wsa_200408/AbstractRetryAfterType.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ abstract class AbstractRetryAfterType extends AbstractWsaElement
2727
use TypedTextContentTrait;
2828

2929

30-
/** @var string */
31-
public const TEXTCONTENT_TYPE = NonNegativeIntegerValue::class;
30+
public const string TEXTCONTENT_TYPE = NonNegativeIntegerValue::class;
3231

3332
/** The namespace-attribute for the xs:anyAttribute element */
34-
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
33+
public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
3534

3635

3736
/**
@@ -53,7 +52,6 @@ final public function __construct(
5352
* Convert XML into a class instance
5453
*
5554
* @param \DOMElement $xml The XML element we should load
56-
* @return static
5755
*
5856
* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
5957
* If the qualified name of the supplied element is wrong
@@ -71,7 +69,6 @@ public static function fromXML(DOMElement $xml): static
7169
* Convert this element to XML.
7270
*
7371
* @param \DOMElement|null $parent The element we should append this element to.
74-
* @return \DOMElement
7572
*/
7673
public function toXML(?DOMElement $parent = null): DOMElement
7774
{

‎src/XML/wsa_200408/AbstractServiceNameType.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ abstract class AbstractServiceNameType extends AbstractWsaElement
2828
use TypedTextContentTrait;
2929

3030

31-
/** @var string */
32-
public const TEXTCONTENT_TYPE = QNameValue::class;
31+
public const string TEXTCONTENT_TYPE = QNameValue::class;
3332

3433
/** The namespace-attribute for the xs:anyElement element */
35-
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
34+
public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
3635

3736

3837
/**
@@ -65,7 +64,6 @@ public function getPortName(): ?NCNameValue
6564
* Convert XML into a class instance
6665
*
6766
* @param \DOMElement $xml The XML element we should load
68-
* @return static
6967
*
7068
* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
7169
* If the qualified name of the supplied element is wrong
@@ -87,7 +85,6 @@ public static function fromXML(DOMElement $xml): static
8785
* Convert this element to XML.
8886
*
8987
* @param \DOMElement|null $parent The element we should append this element to.
90-
* @return \DOMElement
9188
*/
9289
public function toXML(?DOMElement $parent = null): DOMElement
9390
{

‎src/XML/wsa_200408/AbstractWsaElement.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
1414
*/
1515
abstract class AbstractWsaElement extends AbstractElement
1616
{
17-
/** @var string */
18-
public const NS = C::NS_ADDR_200408;
17+
public const string NS = C::NS_ADDR_200408;
1918

20-
/** @var string */
21-
public const NS_PREFIX = 'wsa';
19+
public const string NS_PREFIX = 'wsa';
2220

23-
/** @var string */
24-
public const SCHEMA = 'resources/schemas/ws-addr-200408.xsd';
21+
public const string SCHEMA = 'resources/schemas/ws-addr-200408.xsd';
2522
}

0 commit comments

Comments
 (0)