Skip to content

Commit 28f125b

Browse files
SpomkySpomky
committed
Revert stimulus changes
1 parent 131ebfe commit 28f125b

Some content is hidden

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

42 files changed

+85
-756
lines changed

‎.github/workflows/tests.yml

-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,3 @@ jobs:
3030
3131
- name: Run tests (PHP)
3232
run: make ci-cc
33-
34-
- name: Run tests (JS)
35-
run: make js

‎.gitsplit.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
splits:
22
- prefix: "src/webauthn"
33
target: "https://${GH_TOKEN}@github.com/web-auth/webauthn-lib.git"
4-
- prefix: "src/stimulus"
5-
target: "https://${GH_TOKEN}@github.com/web-auth/webauthn-stimulus.git"
64
- prefix: "src/symfony"
75
target: "https://${GH_TOKEN}@github.com/web-auth/webauthn-symfony-bundle.git"
86
- prefix: "src/metadata-service"

‎Makefile

-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mu: vendor ## Mutation tests
44

55
tests: vendor ## Run all tests
66
vendor/bin/phpunit --color
7-
yarn test
87

98
cc: vendor ## Show test coverage rates (HTML)
109
vendor/bin/phpunit --coverage-html ./build
@@ -39,15 +38,9 @@ ci-cs: vendor ## Check all files using defined ECS rules (for CI/CD only)
3938
################################################
4039

4140

42-
js: node_modules ## Execute JS tests
43-
yarn test
44-
4541
rector: vendor ## Check all files using Rector
4642
vendor/bin/rector process --ansi --dry-run --xdebug
4743

48-
node_modules: package.json
49-
yarn install --force
50-
5144
vendor: composer.json
5245
composer validate
5346
composer install

‎babel.config.js

-6
This file was deleted.

‎jest.config.js

-15
This file was deleted.

‎package.json

-73
This file was deleted.

‎rector.php

+21-22
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,35 @@
22

33
declare(strict_types=1);
44

5-
use Rector\Core\Configuration\Option;
5+
use Rector\Config\RectorConfig;
66
use Rector\Core\ValueObject\PhpVersion;
77
use Rector\Doctrine\Set\DoctrineSetList;
88
use Rector\Php74\Rector\Property\TypedPropertyRector;
99
use Rector\PHPUnit\Set\PHPUnitSetList;
10+
use Rector\Set\ValueObject\LevelSetList;
1011
use Rector\Set\ValueObject\SetList;
1112
use Rector\Symfony\Set\SymfonyLevelSetList;
1213
use Rector\Symfony\Set\SymfonySetList;
13-
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
1414

15-
return static function (ContainerConfigurator $containerConfigurator): void {
16-
$containerConfigurator->import(SetList::DEAD_CODE);
17-
$containerConfigurator->import(SetList::PHP_81);
18-
$containerConfigurator->import(SymfonyLevelSetList::UP_TO_SYMFONY_60);
19-
$containerConfigurator->import(SymfonySetList::SYMFONY_CODE_QUALITY);
20-
$containerConfigurator->import(SymfonySetList::SYMFONY_52_VALIDATOR_ATTRIBUTES);
21-
$containerConfigurator->import(SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION);
22-
$containerConfigurator->import(SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES);
23-
$containerConfigurator->import(DoctrineSetList::DOCTRINE_CODE_QUALITY);
24-
$containerConfigurator->import(DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES);
25-
$containerConfigurator->import(PHPUnitSetList::PHPUNIT_EXCEPTION);
26-
$containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
27-
$containerConfigurator->import(PHPUnitSetList::PHPUNIT_91);
28-
$containerConfigurator->import(PHPUnitSetList::PHPUNIT_YIELD_DATA_PROVIDER);
29-
$parameters = $containerConfigurator->parameters();
30-
$parameters->set(Option::PATHS, [__DIR__ . '/src']);
31-
$parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
32-
$parameters->set(Option::AUTO_IMPORT_NAMES, true);
33-
$parameters->set(Option::IMPORT_SHORT_CLASSES, true);
15+
return static function (RectorConfig $rectorConfig): void {
16+
$rectorConfig->import(SetList::DEAD_CODE);
17+
$rectorConfig->import(LevelSetList::UP_TO_PHP_81);
18+
$rectorConfig->import(SymfonyLevelSetList::UP_TO_SYMFONY_60);
19+
$rectorConfig->import(SymfonySetList::SYMFONY_CODE_QUALITY);
20+
$rectorConfig->import(SymfonySetList::SYMFONY_52_VALIDATOR_ATTRIBUTES);
21+
$rectorConfig->import(SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION);
22+
$rectorConfig->import(SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES);
23+
$rectorConfig->import(DoctrineSetList::DOCTRINE_CODE_QUALITY);
24+
$rectorConfig->import(DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES);
25+
$rectorConfig->import(PHPUnitSetList::PHPUNIT_EXCEPTION);
26+
$rectorConfig->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
27+
$rectorConfig->import(PHPUnitSetList::PHPUNIT_91);
28+
$rectorConfig->import(PHPUnitSetList::PHPUNIT_YIELD_DATA_PROVIDER);
29+
$rectorConfig->paths([__DIR__ . '/src']);
30+
$rectorConfig->phpVersion(PhpVersion::PHP_81);
31+
$rectorConfig->importNames();
32+
$rectorConfig->importShortClasses();
3433

35-
$services = $containerConfigurator->services();
34+
$services = $rectorConfig->services();
3635
$services->set(TypedPropertyRector::class);
3736
};

‎rollup.config.js

-64
This file was deleted.

‎src/metadata-service/src/Service/MetadataBLOBPayload.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,10 @@ public function jsonSerialize(): array
9090
'legalHeader' => $this->legalHeader,
9191
'nextUpdate' => $this->nextUpdate,
9292
'no' => $this->no,
93-
'entries' => array_map(static function (MetadataBLOBPayloadEntry $object): array {
94-
return $object->jsonSerialize();
95-
}, $this->entries),
93+
'entries' => array_map(
94+
static fn (MetadataBLOBPayloadEntry $object): array => $object->jsonSerialize(),
95+
$this->entries
96+
),
9697
];
9798

9899
return Utils::filterNullValues($data);

‎src/metadata-service/src/Service/MetadataBLOBPayloadEntry.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,10 @@ public function jsonSerialize(): array
191191
'aaid' => $this->aaid,
192192
'aaguid' => $this->aaguid,
193193
'attestationCertificateKeyIdentifiers' => $this->attestationCertificateKeyIdentifiers,
194-
'statusReports' => array_map(static function (StatusReport $object): array {
195-
return $object->jsonSerialize();
196-
}, $this->statusReports),
194+
'statusReports' => array_map(
195+
static fn (StatusReport $object): array => $object->jsonSerialize(),
196+
$this->statusReports
197+
),
197198
'timeOfLastStatusChange' => $this->timeOfLastStatusChange,
198199
'rogueListURL' => $this->rogueListURL,
199200
'rogueListHash' => $this->rogueListHash,

‎src/metadata-service/src/Statement/BiometricStatusReport.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ public function jsonSerialize(): array
8989
'certificationRequirementsVersion' => $this->certificationRequirementsVersion,
9090
];
9191

92-
return array_filter($data, static function ($var): bool {return $var !== null; });
92+
return array_filter($data, static fn ($var): bool => $var !== null);
9393
}
9494
}

‎src/metadata-service/src/Statement/MetadataStatement.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -512,20 +512,20 @@ public function jsonSerialize(): array
512512
'tcDisplay' => $this->tcDisplay,
513513
'tcDisplayContentType' => $this->tcDisplayContentType,
514514
'tcDisplayPNGCharacteristics' => array_map(
515-
static function (DisplayPNGCharacteristicsDescriptor $object): array {
516-
return $object->jsonSerialize();
517-
},
515+
static fn (DisplayPNGCharacteristicsDescriptor $object): array => $object->jsonSerialize(),
518516
$this->tcDisplayPNGCharacteristics
519517
),
520518
'attestationRootCertificates' => $this->attestationRootCertificates,
521-
'ecdaaTrustAnchors' => array_map(static function (EcdaaTrustAnchor $object): array {
522-
return $object->jsonSerialize();
523-
}, $this->ecdaaTrustAnchors),
519+
'ecdaaTrustAnchors' => array_map(
520+
static fn (EcdaaTrustAnchor $object): array => $object->jsonSerialize(),
521+
$this->ecdaaTrustAnchors
522+
),
524523
'icon' => $this->icon,
525524
'authenticatorGetInfo' => $this->authenticatorGetInfo,
526-
'supportedExtensions' => array_map(static function (ExtensionDescriptor $object): array {
527-
return $object->jsonSerialize();
528-
}, $this->supportedExtensions),
525+
'supportedExtensions' => array_map(
526+
static fn (ExtensionDescriptor $object): array => $object->jsonSerialize(),
527+
$this->supportedExtensions
528+
),
529529
];
530530

531531
return Utils::filterNullValues($data);

‎src/metadata-service/src/Statement/VerificationMethodANDCombinations.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ public static function createFromArray(array $data): self
4949
*/
5050
public function jsonSerialize(): array
5151
{
52-
return array_map(static function (VerificationMethodDescriptor $object): array {
53-
return $object->jsonSerialize();
54-
}, $this->verificationMethods);
52+
return array_map(
53+
static fn (VerificationMethodDescriptor $object): array => $object->jsonSerialize(),
54+
$this->verificationMethods
55+
);
5556
}
5657
}

‎src/metadata-service/src/Utils.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ abstract class Utils
1616
*/
1717
public static function filterNullValues(array $data): array
1818
{
19-
return array_filter($data, static function ($var): bool {return $var !== null; });
19+
return array_filter($data, static fn ($var): bool => $var !== null);
2020
}
2121
}

‎src/stimulus/.gitattributes

-4
This file was deleted.

‎src/stimulus/.github/CONTRIBUTING.md

-4
This file was deleted.

‎src/stimulus/.github/FUNDING.yml

-2
This file was deleted.

‎src/stimulus/.github/PULL_REQUEST_TEMPLATE.md

-3
This file was deleted.

‎src/stimulus/.github/stale.yml

-8
This file was deleted.

‎src/stimulus/.gitignore

-2
This file was deleted.

‎src/stimulus/LICENSE

-21
This file was deleted.

0 commit comments

Comments
 (0)