Skip to content

Commit 2ccbb81

Browse files
authored
Normalize the case of the SimpleXML requirement (#1881)
1 parent 7f172a1 commit 2ccbb81

File tree

22 files changed

+26
-13
lines changed

22 files changed

+26
-13
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"type": "project",
66
"require": {
77
"php": "^7.2.5 || ^8.0",
8-
"ext-SimpleXML": "*",
98
"ext-dom": "*",
109
"ext-filter": "*",
1110
"ext-hash": "*",
1211
"ext-json": "*",
12+
"ext-simplexml": "*",
1313
"psr/log": "^1.0 || ^2.0 || ^3.0",
1414
"symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0",
1515
"symfony/http-client-contracts": "^1.0 || ^2.0 || ^3.0",

src/CodeGenerator/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"type": "library",
66
"require": {
77
"php": "^8.2",
8-
"ext-SimpleXML": "*",
98
"ext-dom": "*",
109
"ext-json": "*",
10+
"ext-simplexml": "*",
1111
"friendsofphp/php-cs-fixer": "~3.60.0",
1212
"nette/php-generator": "^3.6 || ^4.1",
1313
"nette/utils": "^3.0 || ^4.0",

src/CodeGenerator/src/File/ComposerWriter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public function setRequirements(string $namespace, array $requirements, bool $cl
3636
unset(
3737
$content['require']['ext-json'],
3838
$content['require']['ext-dom'],
39-
$content['require']['ext-SimpleXML'],
39+
$content['require']['ext-SimpleXML'], // Older versions of the code generator were using that case. We keep cleaning it to avoid garbage.
40+
$content['require']['ext-simplexml'],
4041
$content['require']['ext-filter'],
4142
$content['require']['async-aws/core'],
4243
$content['require']['symfony/polyfill-uuid'],

src/CodeGenerator/src/Generator/ResponseParser/RestXmlParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function generate(StructureShape $shape, bool $throwOnError = true): Pars
9797
return new ParserResult('');
9898
}
9999

100-
$this->requirementsRegistry->addRequirement('ext-SimpleXML');
100+
$this->requirementsRegistry->addRequirement('ext-simplexml');
101101

102102
$body = '$data = new \SimpleXMLElement($response->getContent(' . ($throwOnError ? '' : 'false') . '));';
103103
if (!$throwOnError) {

src/Core/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
### Changed
1010

11+
- Normalize the composer requirements
1112
- Sort exception alphabetically.
1213

1314
## 1.25.0

src/Core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
],
1313
"require": {
1414
"php": "^7.2.5 || ^8.0",
15-
"ext-SimpleXML": "*",
1615
"ext-hash": "*",
1716
"ext-json": "*",
17+
"ext-simplexml": "*",
1818
"psr/cache": "^1.0 || ^2.0 || ^3.0",
1919
"psr/log": "^1.0 || ^2.0 || ^3.0",
2020
"symfony/deprecation-contracts": "^2.1 || ^3.0",

src/Service/CloudFormation/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
- AWS api-change: Added `eu-isoe-west-1` region
88

9+
### Changed
10+
11+
- Normalize the composer requirements
12+
913
## 1.8.1
1014

1115
### Changed

src/Service/CloudFormation/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
],
1313
"require": {
1414
"php": "^7.2.5 || ^8.0",
15-
"ext-SimpleXML": "*",
1615
"ext-filter": "*",
16+
"ext-simplexml": "*",
1717
"async-aws/core": "^1.9"
1818
},
1919
"autoload": {

src/Service/CloudFront/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Changed
66

7+
- Normalize the composer requirements
78
- Sort exception alphabetically.
89

910
## 1.0.3

src/Service/CloudFront/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
],
1313
"require": {
1414
"php": "^7.2.5 || ^8.0",
15-
"ext-SimpleXML": "*",
1615
"ext-dom": "*",
16+
"ext-simplexml": "*",
1717
"async-aws/core": "^1.9"
1818
},
1919
"autoload": {

0 commit comments

Comments
 (0)