Skip to content

Commit b6b0ced

Browse files
jrfnljrfnl
committed
PHP 8.1 | NewFunctions: handle new Sodium functions
Includes unit tests. Refs: * https://www.php.net/manual/en/migration81.new-functions.php#migration81.new-functions.sodium * php/php-src#6868 * php/php-src@f7f1f7f * php/php-src#6922 * php/php-src@9b794f8
1 parent 0854f5e commit b6b0ced

File tree

3 files changed

+126
-0
lines changed

3 files changed

+126
-0
lines changed

‎PHPCompatibility/Sniffs/FunctionUse/NewFunctionsSniff.php

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4553,6 +4553,96 @@ class NewFunctionsSniff extends AbstractNewFeatureSniff
45534553
'8.0' => false,
45544554
'8.1' => true,
45554555
],
4556+
'sodium_crypto_stream_xchacha20' => [
4557+
'8.0' => false,
4558+
'8.1' => true,
4559+
'extension' => 'sodium',
4560+
],
4561+
'sodium_crypto_stream_xchacha20_keygen' => [
4562+
'8.0' => false,
4563+
'8.1' => true,
4564+
'extension' => 'sodium',
4565+
],
4566+
'sodium_crypto_stream_xchacha20_xor' => [
4567+
'8.0' => false,
4568+
'8.1' => true,
4569+
'extension' => 'sodium',
4570+
],
4571+
'sodium_crypto_core_ristretto255_add' => [
4572+
'8.0' => false,
4573+
'8.1' => true,
4574+
'extension' => 'sodium',
4575+
],
4576+
'sodium_crypto_core_ristretto255_from_hash' => [
4577+
'8.0' => false,
4578+
'8.1' => true,
4579+
'extension' => 'sodium',
4580+
],
4581+
'sodium_crypto_core_ristretto255_is_valid_point' => [
4582+
'8.0' => false,
4583+
'8.1' => true,
4584+
'extension' => 'sodium',
4585+
],
4586+
'sodium_crypto_core_ristretto255_random' => [
4587+
'8.0' => false,
4588+
'8.1' => true,
4589+
'extension' => 'sodium',
4590+
],
4591+
'sodium_crypto_core_ristretto255_scalar_add' => [
4592+
'8.0' => false,
4593+
'8.1' => true,
4594+
'extension' => 'sodium',
4595+
],
4596+
'sodium_crypto_core_ristretto255_scalar_complement' => [
4597+
'8.0' => false,
4598+
'8.1' => true,
4599+
'extension' => 'sodium',
4600+
],
4601+
'sodium_crypto_core_ristretto255_scalar_invert' => [
4602+
'8.0' => false,
4603+
'8.1' => true,
4604+
'extension' => 'sodium',
4605+
],
4606+
'sodium_crypto_core_ristretto255_scalar_mul' => [
4607+
'8.0' => false,
4608+
'8.1' => true,
4609+
'extension' => 'sodium',
4610+
],
4611+
'sodium_crypto_core_ristretto255_scalar_negate' => [
4612+
'8.0' => false,
4613+
'8.1' => true,
4614+
'extension' => 'sodium',
4615+
],
4616+
'sodium_crypto_core_ristretto255_scalar_random' => [
4617+
'8.0' => false,
4618+
'8.1' => true,
4619+
'extension' => 'sodium',
4620+
],
4621+
'sodium_crypto_core_ristretto255_scalar_reduce' => [
4622+
'8.0' => false,
4623+
'8.1' => true,
4624+
'extension' => 'sodium',
4625+
],
4626+
'sodium_crypto_core_ristretto255_scalar_sub' => [
4627+
'8.0' => false,
4628+
'8.1' => true,
4629+
'extension' => 'sodium',
4630+
],
4631+
'sodium_crypto_core_ristretto255_sub' => [
4632+
'8.0' => false,
4633+
'8.1' => true,
4634+
'extension' => 'sodium',
4635+
],
4636+
'sodium_crypto_scalarmult_ristretto255' => [
4637+
'8.0' => false,
4638+
'8.1' => true,
4639+
'extension' => 'sodium',
4640+
],
4641+
'sodium_crypto_scalarmult_ristretto255_base' => [
4642+
'8.0' => false,
4643+
'8.1' => true,
4644+
'extension' => 'sodium',
4645+
],
45564646
];
45574647

45584648

‎PHPCompatibility/Tests/FunctionUse/NewFunctionsUnitTest.inc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,3 +1005,21 @@ imagecreatefromavif();
10051005
imageavif();
10061006
mysqli_fetch_column();
10071007
pcntl_rfork();
1008+
sodium_crypto_stream_xchacha20();
1009+
sodium_crypto_stream_xchacha20_keygen();
1010+
sodium_crypto_stream_xchacha20_xor();
1011+
sodium_crypto_core_ristretto255_add();
1012+
sodium_crypto_core_ristretto255_from_hash();
1013+
sodium_crypto_core_ristretto255_is_valid_point();
1014+
sodium_crypto_core_ristretto255_random();
1015+
sodium_crypto_core_ristretto255_scalar_add();
1016+
sodium_crypto_core_ristretto255_scalar_complement();
1017+
sodium_crypto_core_ristretto255_scalar_invert();
1018+
sodium_crypto_core_ristretto255_scalar_mul();
1019+
sodium_crypto_core_ristretto255_scalar_negate();
1020+
sodium_crypto_core_ristretto255_scalar_random();
1021+
sodium_crypto_core_ristretto255_scalar_reduce();
1022+
sodium_crypto_core_ristretto255_scalar_sub();
1023+
sodium_crypto_core_ristretto255_sub();
1024+
sodium_crypto_scalarmult_ristretto255();
1025+
sodium_crypto_scalarmult_ristretto255_base();

‎PHPCompatibility/Tests/FunctionUse/NewFunctionsUnitTest.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,24 @@ public function dataNewFunction()
10701070
['imageavif', '8.0', [1005], '8.1'],
10711071
['mysqli_fetch_column', '8.0', [1006], '8.1'],
10721072
['pcntl_rfork', '8.0', [1007], '8.1'],
1073+
['sodium_crypto_stream_xchacha20', '8.0', [1008], '8.1'],
1074+
['sodium_crypto_stream_xchacha20_keygen', '8.0', [1009], '8.1'],
1075+
['sodium_crypto_stream_xchacha20_xor', '8.0', [1010], '8.1'],
1076+
['sodium_crypto_core_ristretto255_add', '8.0', [1011], '8.1'],
1077+
['sodium_crypto_core_ristretto255_from_hash', '8.0', [1012], '8.1'],
1078+
['sodium_crypto_core_ristretto255_is_valid_point', '8.0', [1013], '8.1'],
1079+
['sodium_crypto_core_ristretto255_random', '8.0', [1014], '8.1'],
1080+
['sodium_crypto_core_ristretto255_scalar_add', '8.0', [1015], '8.1'],
1081+
['sodium_crypto_core_ristretto255_scalar_complement', '8.0', [1016], '8.1'],
1082+
['sodium_crypto_core_ristretto255_scalar_invert', '8.0', [1017], '8.1'],
1083+
['sodium_crypto_core_ristretto255_scalar_mul', '8.0', [1018], '8.1'],
1084+
['sodium_crypto_core_ristretto255_scalar_negate', '8.0', [1019], '8.1'],
1085+
['sodium_crypto_core_ristretto255_scalar_random', '8.0', [1020], '8.1'],
1086+
['sodium_crypto_core_ristretto255_scalar_reduce', '8.0', [1021], '8.1'],
1087+
['sodium_crypto_core_ristretto255_scalar_sub', '8.0', [1022], '8.1'],
1088+
['sodium_crypto_core_ristretto255_sub', '8.0', [1023], '8.1'],
1089+
['sodium_crypto_scalarmult_ristretto255', '8.0', [1024], '8.1'],
1090+
['sodium_crypto_scalarmult_ristretto255_base', '8.0', [1025], '8.1'],
10731091
];
10741092
}
10751093

0 commit comments

Comments
 (0)