Skip to content

Commit 4eb3429

Browse files
authored
Merge ECC to jwt-core (#507)
Merge ECC to jwt-core
1 parent 1e1ab7a commit 4eb3429

Some content is hidden

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

74 files changed

+882
-1319
lines changed

composer.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,7 @@
4040
"Jose\\Component\\Checker\\": "src/Component/Checker/",
4141
"Jose\\Component\\Console\\": "src/Component/Console/",
4242
"Jose\\Component\\Core\\": "src/Component/Core/",
43-
"Jose\\Component\\Core\\Util\\Ecc\\": [
44-
"src/Ecc",
45-
"src/Ecc/"
46-
],
4743
"Jose\\Component\\Encryption\\": "src/Component/Encryption/",
48-
"Jose\\Component\\Encryption\\Algorithm\\": [
49-
"src/EncryptionAlgorithm/Experimental",
50-
"src/EncryptionAlgorithm/Experimental/"
51-
],
5244
"Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": [
5345
"src/EncryptionAlgorithm/ContentEncryption/AESCBC",
5446
"src/EncryptionAlgorithm/ContentEncryption/AESCBC/",
@@ -119,7 +111,6 @@
119111
"ext-curl": "*",
120112
"ext-gmp": "*",
121113
"bjeavons/zxcvbn-php": "^1.3",
122-
"blackfire/php-sdk": "^2.0",
123114
"ekino/phpstan-banned-code": "^1.0",
124115
"infection/infection": "^0.27",
125116
"matthiasnoback/symfony-config-test": "^5.0",
@@ -134,7 +125,7 @@
134125
"phpstan/phpstan-strict-rules": "^1.4",
135126
"phpunit/phpunit": "^10.1",
136127
"qossmic/deptrac-shim": "^1.0",
137-
"rector/rector": "^0.18",
128+
"rector/rector": "^0.19",
138129
"roave/security-advisories": "dev-latest",
139130
"symfony/browser-kit": "^6.1|^7.0",
140131
"symfony/finder": "^6.1|^7.0",

phpstan-baseline.neon

Lines changed: 844 additions & 979 deletions
Large diffs are not rendered by default.

rector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
declare(strict_types=1);
44

55
use Rector\Config\RectorConfig;
6-
use Rector\Core\ValueObject\PhpVersion;
76
use Rector\Doctrine\Set\DoctrineSetList;
87
use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
98
use Rector\PHPUnit\Set\PHPUnitLevelSetList;
@@ -12,6 +11,7 @@
1211
use Rector\Set\ValueObject\SetList;
1312
use Rector\Symfony\Set\SymfonyLevelSetList;
1413
use Rector\Symfony\Set\SymfonySetList;
14+
use Rector\ValueObject\PhpVersion;
1515

1616
return static function (RectorConfig $config): void {
1717
$config->import(SetList::DEAD_CODE);

src/Component/Checker/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2019 Spomky-Labs
3+
Copyright (c) 2014-2024 Spomky-Labs
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

src/Component/Console/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2019 Spomky-Labs
3+
Copyright (c) 2014-2024 Spomky-Labs
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

src/Component/Core/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2019 Spomky-Labs
3+
Copyright (c) 2014-2024 Spomky-Labs
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

src/Component/Core/Util/ECSignature.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ public static function fromAsn1(string $signature, int $length): string
7373
$pointR = self::retrievePositiveInteger(self::readAsn1Integer($message, $position));
7474
$pointS = self::retrievePositiveInteger(self::readAsn1Integer($message, $position));
7575

76-
$bin = hex2bin(str_pad($pointR, $length, '0', STR_PAD_LEFT) . str_pad($pointS, $length, '0', STR_PAD_LEFT));
76+
$bin = hex2bin(
77+
str_pad($pointR, $length, '0', STR_PAD_LEFT) . str_pad($pointS, $length, '0', STR_PAD_LEFT)
78+
);
7779
if (! is_string($bin)) {
7880
throw new InvalidArgumentException('Unable to parse the data');
7981
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)