Skip to content

Commit e9965a5

Browse files
authored
Add missing override attributes (#366)
* Add missing override attributes * Update spec update scripts to handle new Override attributes
1 parent 746b3f5 commit e9965a5

37 files changed

+107
-4
lines changed

dev/DataSource/Mapping/CountryCallingCodeMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace PrinsFrank\Standards\Dev\DataSource\Mapping;
44

5+
use Override;
56
use PrinsFrank\PdfParser\Exception\PdfParserException;
67
use PrinsFrank\PdfParser\PdfParser;
78
use PrinsFrank\Standards\CountryCallingCode\CountryCallingCode;
@@ -20,11 +21,13 @@
2021
* @implements Mapping<TDataSet>
2122
*/
2223
class CountryCallingCodeMapping implements Mapping {
24+
#[Override]
2325
public static function url(): string {
2426
return 'https://www.itu.int/dms_pub/itu-t/opb/sp/T-SP-E.164D-2016-PDF-E.pdf';
2527
}
2628

2729
/** @throws PdfParserException|RuntimeException */
30+
#[Override]
2831
public static function toDataSet(Client $client, Crawler $crawler): array {
2932
$document = (new PdfParser())
3033
->parseFile(self::url());
@@ -58,6 +61,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
5861
}
5962

6063
/** @throws TypeError|ValueError */
64+
#[Override]
6165
public static function toEnumMapping(array $dataSet): array {
6266
$countryCallingCode = new SpecFile(CountryCallingCode::class, KeySorting::class);
6367
foreach ($dataSet as $dataRow) {

dev/DataSource/Mapping/CountryMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Facebook\WebDriver\Exception\TimeoutException;
88
use Facebook\WebDriver\Remote\RemoteWebElement;
99
use Facebook\WebDriver\WebDriverBy;
10+
use Override;
1011
use PrinsFrank\Standards\Country\CountryAlpha2;
1112
use PrinsFrank\Standards\Country\CountryAlpha3;
1213
use PrinsFrank\Standards\Country\CountryName;
@@ -35,6 +36,7 @@
3536
* @implements Mapping<TDataSet>
3637
*/
3738
class CountryMapping implements Mapping {
39+
#[Override]
3840
public static function url(): string {
3941
return 'https://www.iso.org/obp/ui/#search/code/';
4042
}
@@ -47,6 +49,7 @@ public static function url(): string {
4749
* @throws TypeError
4850
* @return list<TDataSet>
4951
*/
52+
#[Override]
5053
public static function toDataSet(Client $client, Crawler $crawler): array {
5154
$client->waitForVisibility('.v-select-select');
5255
$client->waitForInvisibility('.v-window-modalitycurtain');
@@ -154,6 +157,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
154157
* @throws ShouldNotHappenException
155158
* @return array<SpecFile>
156159
*/
160+
#[Override]
157161
public static function toEnumMapping(array $dataSet): array {
158162
$countryName = new SpecFile(CountryName::class, KeySorting::class);
159163
$countryAlpha2 = (new SpecFile(CountryAlpha2::class, KeySorting::class))

dev/DataSource/Mapping/CurrencyMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use DOMElement;
88
use DOMNodeList;
99
use DOMXPath;
10+
use Override;
1011
use PrinsFrank\Enums\BackedEnum;
1112
use PrinsFrank\Enums\Exception\InvalidArgumentException;
1213
use PrinsFrank\Enums\Exception\NameNotFoundException;
@@ -34,6 +35,7 @@
3435
* @implements Mapping<TDataSet>
3536
*/
3637
class CurrencyMapping implements Mapping {
38+
#[Override]
3739
public static function url(): string {
3840
return 'https://www.six-group.com/en/products-services/financial-information/data-standards.html';
3941
}
@@ -42,6 +44,7 @@ public static function url(): string {
4244
* @throws DomElementNotFoundException|RuntimeException
4345
* @return list<TDataSet>
4446
*/
47+
#[Override]
4548
public static function toDataSet(Client $client, Crawler $crawler): array {
4649
$listLink = $crawler->filterXPath("//a[contains(@href, 'list-one.xml')]");
4750
$listUrl = $listLink->first()->getAttribute('href');
@@ -89,6 +92,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
8992
* @throws TransliterationException
9093
* @return array<SpecFile>
9194
*/
95+
#[Override]
9296
public static function toEnumMapping(array $dataSet): array {
9397
$currencyNameEnum = new SpecFile(CurrencyName::class, KeySorting::class);
9498
$currencyNumericEnum = new SpecFile(CurrencyNumeric::class, KeySorting::class);

dev/DataSource/Mapping/EUMapping.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Facebook\WebDriver\Exception\NoSuchElementException;
66
use Facebook\WebDriver\Exception\TimeoutException;
7+
use Override;
78
use PrinsFrank\Enums\BackedEnum;
89
use PrinsFrank\Enums\Exception\InvalidArgumentException;
910
use PrinsFrank\Enums\Exception\NameNotFoundException;
@@ -21,11 +22,13 @@
2122
* @implements Mapping<TDataSet>
2223
*/
2324
class EUMapping implements Mapping {
25+
#[Override]
2426
public static function url(): string {
2527
return 'https://european-union.europa.eu/principles-countries-history/eu-countries_en';
2628
}
2729

2830
/** @throws NoSuchElementException|TimeoutException */
31+
#[Override]
2932
public static function toDataSet(Client $client, Crawler $crawler): array {
3033
$client->waitFor('//a[contains(@class, "wt-ecl-button")]');
3134
$crawler->filterXPath('//a[contains(@class, "wt-ecl-button")]')->click();
@@ -55,9 +58,10 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
5558
}
5659

5760
/** @throws NameNotFoundException|InvalidArgumentException */
61+
#[Override]
5862
public static function toEnumMapping(array $dataSet): array {
5963
$EU = (new SpecFile(EU::class, KeySorting::class))
60-
->addMethod($allAlpha2 = new EnumListMethod('allAlpha2', 'array', '/** @return list<CountryAlpha2> */'));
64+
->addMethod($allAlpha2 = new EnumListMethod('allAlpha2', 'array', '/** @return list<CountryAlpha2> */' . PHP_EOL . ' #[Override]'));
6165

6266
foreach ($dataSet as $dataRow) {
6367
$allAlpha2->addItem('CountryAlpha2::' . BackedEnum::fromName(CountryAlpha2::class, $dataRow->name)->name);

dev/DataSource/Mapping/HttpMethodMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace PrinsFrank\Standards\Dev\DataSource\Mapping;
55

66
use Facebook\WebDriver\WebDriverBy;
7+
use Override;
78
use PrinsFrank\Standards\Dev\DataSource\Sorting\KeySorting;
89
use PrinsFrank\Standards\Dev\DataTarget\EnumCase;
910
use PrinsFrank\Standards\Dev\DataTarget\SpecFile;
@@ -18,6 +19,7 @@
1819
* @implements Mapping<TDataSet>
1920
*/
2021
class HttpMethodMapping implements Mapping {
22+
#[Override]
2123
public static function url(): string {
2224
return 'https://www.iana.org/assignments/http-methods/http-methods.xhtml';
2325
}
@@ -26,6 +28,7 @@ public static function url(): string {
2628
* @throws RuntimeException
2729
* @return list<TDataSet>
2830
*/
31+
#[Override]
2932
public static function toDataSet(Client $client, Crawler $crawler): array {
3033
$items = $crawler->filterXPath('//table[@id="table-methods"]/tbody/tr')->getIterator();
3134

@@ -56,6 +59,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
5659
* @param list<TDataSet> $dataSet
5760
* @return array<SpecFile>
5861
*/
62+
#[Override]
5963
public static function toEnumMapping(array $dataSet): array {
6064
$httpMethod = new SpecFile(HttpMethod::class, KeySorting::class);
6165
foreach ($dataSet as $dataRow) {

dev/DataSource/Mapping/HttpStatusCodeMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use DateTimeImmutable;
77
use Exception;
88
use Facebook\WebDriver\WebDriverBy;
9+
use Override;
910
use PrinsFrank\Standards\Dev\DataSource\Sorting\ValueSorting;
1011
use PrinsFrank\Standards\Dev\DataTarget\EnumCase;
1112
use PrinsFrank\Standards\Dev\DataTarget\EnumCaseAttribute;
@@ -23,6 +24,7 @@
2324
* @implements Mapping<TDataSet>
2425
*/
2526
class HttpStatusCodeMapping implements Mapping {
27+
#[Override]
2628
public static function url(): string {
2729
return 'https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml';
2830
}
@@ -31,6 +33,7 @@ public static function url(): string {
3133
* @throws RuntimeException
3234
* @return list<TDataSet>
3335
*/
36+
#[Override]
3437
public static function toDataSet(Client $client, Crawler $crawler): array {
3538
$items = $crawler->filterXPath('//table[@id="table-http-status-codes-1"]/tbody/tr')->getIterator();
3639

@@ -64,6 +67,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
6467
* @throws Exception
6568
* @return array<SpecFile>
6669
*/
70+
#[Override]
6771
public static function toEnumMapping(array $dataSet): array {
6872
$httpMethod = new SpecFile(HttpStatusCode::class, ValueSorting::class);
6973
foreach ($dataSet as $dataRow) {

dev/DataSource/Mapping/LanguageExtensiveMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace PrinsFrank\Standards\Dev\DataSource\Mapping;
55

6+
use Override;
67
use PrinsFrank\Standards\Dev\DataSource\Sorting\ValueSorting;
78
use PrinsFrank\Standards\Dev\DataTarget\EnumCase;
89
use PrinsFrank\Standards\Dev\DataTarget\SpecFile;
@@ -17,11 +18,13 @@
1718
* @implements Mapping<TDataSet>
1819
*/
1920
class LanguageExtensiveMapping implements Mapping {
21+
#[Override]
2022
public static function url(): string {
2123
return 'https://iso639-3.sil.org/sites/iso639-3/files/downloads/iso-639-3.tab';
2224
}
2325

2426
/** @throws DomElementNotFoundException */
27+
#[Override]
2528
public static function toDataSet(Client $client, Crawler $crawler): array {
2629
$dataSet = [];
2730
foreach (explode("\n", $client->getPageSource()) as $lineNumber => $line) {
@@ -48,6 +51,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
4851
return $dataSet;
4952
}
5053

54+
#[Override]
5155
public static function toEnumMapping(array $dataSet): array {
5256
$languageExtensive = new SpecFile(LanguageAlpha3Extensive::class, ValueSorting::class);
5357
foreach ($dataSet as $dataItem) {

dev/DataSource/Mapping/LanguageMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace PrinsFrank\Standards\Dev\DataSource\Mapping;
55

66
use Facebook\WebDriver\WebDriverBy;
7+
use Override;
78
use PrinsFrank\Standards\Dev\DataSource\Sorting\KeySorting;
89
use PrinsFrank\Standards\Dev\DataTarget\EnumCase;
910
use PrinsFrank\Standards\Dev\DataTarget\SpecFile;
@@ -39,6 +40,7 @@ class LanguageMapping implements Mapping {
3940
'Luiseño' => 'Luiseno',
4041
];
4142

43+
#[Override]
4244
public static function url(): string {
4345
return 'https://www.loc.gov/standards/iso639-2/php/code_list.php';
4446
}
@@ -47,6 +49,7 @@ public static function url(): string {
4749
* @throws RuntimeException
4850
* @return list<TDataSet>
4951
*/
52+
#[Override]
5053
public static function toDataSet(Client $client, Crawler $crawler): array {
5154
$items = $crawler->filterXPath('//table[@width="100%"]/tbody/tr')->getIterator();
5255

@@ -87,6 +90,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
8790
* @param list<TDataSet> $dataSet
8891
* @return array<SpecFile>
8992
*/
93+
#[Override]
9094
public static function toEnumMapping(array $dataSet): array {
9195
$languageAlpha2 = new SpecFile(LanguageAlpha2::class, KeySorting::class);
9296
$languageName = new SpecFile(LanguageName::class, KeySorting::class);

dev/DataSource/Mapping/LanguageSubTagMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace PrinsFrank\Standards\Dev\DataSource\Mapping;
55

6+
use Override;
67
use PrinsFrank\Standards\Dev\DataSource\Sorting\KeySorting;
78
use PrinsFrank\Standards\Dev\DataTarget\EnumCase;
89
use PrinsFrank\Standards\Dev\DataTarget\SpecFile;
@@ -17,6 +18,7 @@
1718
* @implements Mapping<TDataSet>
1819
*/
1920
class LanguageSubTagMapping implements Mapping {
21+
#[Override]
2022
public static function url(): string {
2123
return 'https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry';
2224
}
@@ -25,6 +27,7 @@ public static function url(): string {
2527
* @throws InvalidArgumentException
2628
* @return list<TDataSet>
2729
*/
30+
#[Override]
2831
public static function toDataSet(Client $client, Crawler $crawler): array {
2932
$dataSet = [];
3033
foreach (explode('%%', $client->getPageSource()) as $i => $item) {
@@ -68,6 +71,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
6871
* @param list<TDataSet> $dataSet
6972
* @return array<SpecFile>
7073
*/
74+
#[Override]
7175
public static function toEnumMapping(array $dataSet): array {
7276
$languageTagVariant = new SpecFile(LanguageTagVariant::class, KeySorting::class);
7377
foreach ($dataSet as $dataRow) {

dev/DataSource/Mapping/PHPRegexSupportedScriptsMapping.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace PrinsFrank\Standards\Dev\DataSource\Mapping;
55

6+
use Override;
67
use PrinsFrank\Standards\Dev\DataSource\Sorting\KeySorting;
78
use PrinsFrank\Standards\Dev\DataTarget\EnumCase;
89
use PrinsFrank\Standards\Dev\DataTarget\EnumCaseAttribute;
@@ -18,10 +19,12 @@
1819
* @implements Mapping<TDataSet>
1920
*/
2021
class PHPRegexSupportedScriptsMapping implements Mapping {
22+
#[Override]
2123
public static function url(): string {
2224
return 'https://www.php.net/manual/en/regexp.reference.unicode.php';
2325
}
2426

27+
#[Override]
2528
public static function toDataSet(Client $client, Crawler $crawler): array {
2629
$items = $crawler->filterXPath('//table[@class="doctable table"]/tbody/tr/td/code')->getIterator();
2730

@@ -41,6 +44,7 @@ public static function toDataSet(Client $client, Crawler $crawler): array {
4144
* @param list<TDataSet> $dataSet
4245
* @return array<SpecFile>
4346
*/
47+
#[Override]
4448
public static function toEnumMapping(array $dataSet): array {
4549
$scriptAliasStrings = array_map(static function (object $dataSetItem) {
4650
return $dataSetItem->name;

0 commit comments

Comments
 (0)