@@ -38,8 +38,7 @@ |
||
38 | 38 | * |
39 | 39 | * @return int |
40 | 40 | */ |
41 | - function random_int($min, $max) |
|
42 | - { |
|
41 | + function random_int($min, $max) { |
|
43 | 42 | /** |
44 | 43 | * Type and input logic checks |
45 | 44 | * |
@@ -40,8 +40,7 @@ |
||
40 | 40 | * |
41 | 41 | * @return string |
42 | 42 | */ |
43 | - function random_bytes($bytes) |
|
44 | - { |
|
43 | + function random_bytes($bytes) { |
|
45 | 44 | try { |
46 | 45 | /** @var int $bytes */ |
47 | 46 | $bytes = RandomCompat_intval($bytes); |
@@ -45,8 +45,7 @@ |
||
45 | 45 | * |
46 | 46 | * @throws TypeError |
47 | 47 | */ |
48 | - function RandomCompat_intval($number, $fail_open = false) |
|
49 | - { |
|
48 | + function RandomCompat_intval($number, $fail_open = false) { |
|
50 | 49 | if (is_int($number) || is_float($number)) { |
51 | 50 | $number += 0; |
52 | 51 | } elseif (is_numeric($number)) { |
@@ -208,8 +208,7 @@ |
||
208 | 208 | * @throws Exception |
209 | 209 | * @return string |
210 | 210 | */ |
211 | - function random_bytes($length) |
|
212 | - { |
|
211 | + function random_bytes($length) { |
|
213 | 212 | unset($length); // Suppress "variable not used" warnings. |
214 | 213 | throw new Exception( |
215 | 214 | 'There is no suitable CSPRNG installed on your system' |
@@ -28,21 +28,18 @@ |
||
28 | 28 | |
29 | 29 | if (!class_exists('Error', false)) { |
30 | 30 | // We can't really avoid making this extend Exception in PHP 5. |
31 | - class Error extends Exception |
|
32 | - { |
|
31 | + class Error extends Exception { |
|
33 | 32 | |
34 | 33 | } |
35 | 34 | } |
36 | 35 | |
37 | 36 | if (!class_exists('TypeError', false)) { |
38 | 37 | if (is_subclass_of('Error', 'Exception')) { |
39 | - class TypeError extends Error |
|
40 | - { |
|
38 | + class TypeError extends Error { |
|
41 | 39 | |
42 | 40 | } |
43 | 41 | } else { |
44 | - class TypeError extends Exception |
|
45 | - { |
|
42 | + class TypeError extends Exception { |
|
46 | 43 | |
47 | 44 | } |
48 | 45 | } |
@@ -44,8 +44,7 @@ discard block |
||
44 | 44 | * |
45 | 45 | * @return int |
46 | 46 | */ |
47 | - function RandomCompat_strlen($binary_string) |
|
48 | - { |
|
47 | + function RandomCompat_strlen($binary_string) { |
|
49 | 48 | if (!is_string($binary_string)) { |
50 | 49 | throw new TypeError( |
51 | 50 | 'RandomCompat_strlen() expects a string' |
@@ -67,8 +66,7 @@ discard block |
||
67 | 66 | * |
68 | 67 | * @return int |
69 | 68 | */ |
70 | - function RandomCompat_strlen($binary_string) |
|
71 | - { |
|
69 | + function RandomCompat_strlen($binary_string) { |
|
72 | 70 | if (!is_string($binary_string)) { |
73 | 71 | throw new TypeError( |
74 | 72 | 'RandomCompat_strlen() expects a string' |
@@ -100,8 +98,7 @@ discard block |
||
100 | 98 | * |
101 | 99 | * @return string |
102 | 100 | */ |
103 | - function RandomCompat_substr($binary_string, $start, $length = null) |
|
104 | - { |
|
101 | + function RandomCompat_substr($binary_string, $start, $length = null) { |
|
105 | 102 | if (!is_string($binary_string)) { |
106 | 103 | throw new TypeError( |
107 | 104 | 'RandomCompat_substr(): First argument should be a string' |
@@ -158,8 +155,7 @@ discard block |
||
158 | 155 | * |
159 | 156 | * @return string |
160 | 157 | */ |
161 | - function RandomCompat_substr($binary_string, $start, $length = null) |
|
162 | - { |
|
158 | + function RandomCompat_substr($binary_string, $start, $length = null) { |
|
163 | 159 | if (!is_string($binary_string)) { |
164 | 160 | throw new TypeError( |
165 | 161 | 'RandomCompat_substr(): First argument should be a string' |
@@ -9,8 +9,7 @@ |
||
9 | 9 | * |
10 | 10 | * @return bool Stop autoloading? |
11 | 11 | */ |
12 | - function sodiumCompatAutoloader($class) |
|
13 | - { |
|
12 | + function sodiumCompatAutoloader($class) { |
|
14 | 13 | $namespace = 'ParagonIE_Sodium_'; |
15 | 14 | // Does the class use the namespace prefix? |
16 | 15 | $len = strlen($namespace); |
@@ -12,8 +12,7 @@ discard block |
||
12 | 12 | * If you are using this library, you should be using |
13 | 13 | * ParagonIE_Sodium_Compat in your code, not this class. |
14 | 14 | */ |
15 | -abstract class ParagonIE_Sodium_Crypto |
|
16 | -{ |
|
15 | +abstract class ParagonIE_Sodium_Crypto { |
|
17 | 16 | const aead_chacha20poly1305_KEYBYTES = 32; |
18 | 17 | const aead_chacha20poly1305_NSECBYTES = 0; |
19 | 18 | const aead_chacha20poly1305_NPUBBYTES = 8; |
@@ -381,8 +380,7 @@ discard block |
||
381 | 380 | * @return string |
382 | 381 | * @throws TypeError |
383 | 382 | */ |
384 | - public static function auth($message, $key) |
|
385 | - { |
|
383 | + public static function auth($message, $key) { |
|
386 | 384 | return ParagonIE_Sodium_Core_Util::substr( |
387 | 385 | hash_hmac('sha512', $message, $key, true), |
388 | 386 | 0, |
@@ -402,8 +400,7 @@ discard block |
||
402 | 400 | * @throws SodiumException |
403 | 401 | * @throws TypeError |
404 | 402 | */ |
405 | - public static function auth_verify($mac, $message, $key) |
|
406 | - { |
|
403 | + public static function auth_verify($mac, $message, $key) { |
|
407 | 404 | return ParagonIE_Sodium_Core_Util::hashEquals( |
408 | 405 | $mac, |
409 | 406 | self::auth($message, $key) |
@@ -422,8 +419,7 @@ discard block |
||
422 | 419 | * @throws SodiumException |
423 | 420 | * @throws TypeError |
424 | 421 | */ |
425 | - public static function box($plaintext, $nonce, $keypair) |
|
426 | - { |
|
422 | + public static function box($plaintext, $nonce, $keypair) { |
|
427 | 423 | $c = self::secretbox( |
428 | 424 | $plaintext, |
429 | 425 | $nonce, |
@@ -446,8 +442,7 @@ discard block |
||
446 | 442 | * @throws SodiumException |
447 | 443 | * @throws TypeError |
448 | 444 | */ |
449 | - public static function box_seal($message, $publicKey) |
|
450 | - { |
|
445 | + public static function box_seal($message, $publicKey) { |
|
451 | 446 | /** @var string $ephemeralKeypair */ |
452 | 447 | $ephemeralKeypair = self::box_keypair(); |
453 | 448 | |
@@ -492,8 +487,7 @@ discard block |
||
492 | 487 | * @throws SodiumException |
493 | 488 | * @throws TypeError |
494 | 489 | */ |
495 | - public static function box_seal_open($message, $keypair) |
|
496 | - { |
|
490 | + public static function box_seal_open($message, $keypair) { |
|
497 | 491 | /** @var string $ephemeralPK */ |
498 | 492 | $ephemeralPK = ParagonIE_Sodium_Core_Util::substr($message, 0, 32); |
499 | 493 | |
@@ -541,8 +535,7 @@ discard block |
||
541 | 535 | * @throws SodiumException |
542 | 536 | * @throws TypeError |
543 | 537 | */ |
544 | - public static function box_beforenm($sk, $pk) |
|
545 | - { |
|
538 | + public static function box_beforenm($sk, $pk) { |
|
546 | 539 | return ParagonIE_Sodium_Core_HSalsa20::hsalsa20( |
547 | 540 | str_repeat("\x00", 16), |
548 | 541 | self::scalarmult($sk, $pk) |
@@ -557,8 +550,7 @@ discard block |
||
557 | 550 | * @throws SodiumException |
558 | 551 | * @throws TypeError |
559 | 552 | */ |
560 | - public static function box_keypair() |
|
561 | - { |
|
553 | + public static function box_keypair() { |
|
562 | 554 | $sKey = random_bytes(32); |
563 | 555 | $pKey = self::scalarmult_base($sKey); |
564 | 556 | return $sKey . $pKey; |
@@ -570,8 +562,7 @@ discard block |
||
570 | 562 | * @throws SodiumException |
571 | 563 | * @throws TypeError |
572 | 564 | */ |
573 | - public static function box_seed_keypair($seed) |
|
574 | - { |
|
565 | + public static function box_seed_keypair($seed) { |
|
575 | 566 | $sKey = ParagonIE_Sodium_Core_Util::substr( |
576 | 567 | hash('sha512', $seed, true), |
577 | 568 | 0, |
@@ -589,8 +580,7 @@ discard block |
||
589 | 580 | * @return string |
590 | 581 | * @throws TypeError |
591 | 582 | */ |
592 | - public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey) |
|
593 | - { |
|
583 | + public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey) { |
|
594 | 584 | return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) . |
595 | 585 | ParagonIE_Sodium_Core_Util::substr($pKey, 0, 32); |
596 | 586 | } |
@@ -603,8 +593,7 @@ discard block |
||
603 | 593 | * @throws RangeException |
604 | 594 | * @throws TypeError |
605 | 595 | */ |
606 | - public static function box_secretkey($keypair) |
|
607 | - { |
|
596 | + public static function box_secretkey($keypair) { |
|
608 | 597 | if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== 64) { |
609 | 598 | throw new RangeException( |
610 | 599 | 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.' |
@@ -621,8 +610,7 @@ discard block |
||
621 | 610 | * @throws RangeException |
622 | 611 | * @throws TypeError |
623 | 612 | */ |
624 | - public static function box_publickey($keypair) |
|
625 | - { |
|
613 | + public static function box_publickey($keypair) { |
|
626 | 614 | if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) { |
627 | 615 | throw new RangeException( |
628 | 616 | 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.' |
@@ -640,8 +628,7 @@ discard block |
||
640 | 628 | * @throws SodiumException |
641 | 629 | * @throws TypeError |
642 | 630 | */ |
643 | - public static function box_publickey_from_secretkey($sKey) |
|
644 | - { |
|
631 | + public static function box_publickey_from_secretkey($sKey) { |
|
645 | 632 | if (ParagonIE_Sodium_Core_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) { |
646 | 633 | throw new RangeException( |
647 | 634 | 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.' |
@@ -662,8 +649,7 @@ discard block |
||
662 | 649 | * @throws SodiumException |
663 | 650 | * @throws TypeError |
664 | 651 | */ |
665 | - public static function box_open($ciphertext, $nonce, $keypair) |
|
666 | - { |
|
652 | + public static function box_open($ciphertext, $nonce, $keypair) { |
|
667 | 653 | return self::secretbox_open( |
668 | 654 | $ciphertext, |
669 | 655 | $nonce, |
@@ -687,8 +673,7 @@ discard block |
||
687 | 673 | * @throws SodiumException |
688 | 674 | * @throws TypeError |
689 | 675 | */ |
690 | - public static function generichash($message, $key = '', $outlen = 32) |
|
691 | - { |
|
676 | + public static function generichash($message, $key = '', $outlen = 32) { |
|
692 | 677 | // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized |
693 | 678 | ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor(); |
694 | 679 | |
@@ -728,8 +713,7 @@ discard block |
||
728 | 713 | * @throws SodiumException |
729 | 714 | * @throws TypeError |
730 | 715 | */ |
731 | - public static function generichash_final($ctx, $outlen = 32) |
|
732 | - { |
|
716 | + public static function generichash_final($ctx, $outlen = 32) { |
|
733 | 717 | if (!is_string($ctx)) { |
734 | 718 | throw new TypeError('Context must be a string'); |
735 | 719 | } |
@@ -758,8 +742,7 @@ discard block |
||
758 | 742 | * @throws SodiumException |
759 | 743 | * @throws TypeError |
760 | 744 | */ |
761 | - public static function generichash_init($key = '', $outputLength = 32) |
|
762 | - { |
|
745 | + public static function generichash_init($key = '', $outputLength = 32) { |
|
763 | 746 | // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized |
764 | 747 | ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor(); |
765 | 748 | |
@@ -835,8 +818,7 @@ discard block |
||
835 | 818 | * @throws SodiumException |
836 | 819 | * @throws TypeError |
837 | 820 | */ |
838 | - public static function generichash_update($ctx, $message) |
|
839 | - { |
|
821 | + public static function generichash_update($ctx, $message) { |
|
840 | 822 | // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized |
841 | 823 | ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor(); |
842 | 824 | |
@@ -864,8 +846,7 @@ discard block |
||
864 | 846 | * @throws SodiumException |
865 | 847 | * @throws TypeError |
866 | 848 | */ |
867 | - public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk) |
|
868 | - { |
|
849 | + public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk) { |
|
869 | 850 | return ParagonIE_Sodium_Compat::crypto_generichash( |
870 | 851 | ParagonIE_Sodium_Compat::crypto_scalarmult($my_sk, $their_pk) . |
871 | 852 | $client_pk . |
@@ -885,8 +866,7 @@ discard block |
||
885 | 866 | * @throws SodiumException |
886 | 867 | * @throws TypeError |
887 | 868 | */ |
888 | - public static function scalarmult($sKey, $pKey) |
|
889 | - { |
|
869 | + public static function scalarmult($sKey, $pKey) { |
|
890 | 870 | $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey); |
891 | 871 | self::scalarmult_throw_if_zero($q); |
892 | 872 | return $q; |
@@ -902,8 +882,7 @@ discard block |
||
902 | 882 | * @throws SodiumException |
903 | 883 | * @throws TypeError |
904 | 884 | */ |
905 | - public static function scalarmult_base($secret) |
|
906 | - { |
|
885 | + public static function scalarmult_base($secret) { |
|
907 | 886 | $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base($secret); |
908 | 887 | self::scalarmult_throw_if_zero($q); |
909 | 888 | return $q; |
@@ -917,8 +896,7 @@ discard block |
||
917 | 896 | * @throws SodiumException |
918 | 897 | * @throws TypeError |
919 | 898 | */ |
920 | - protected static function scalarmult_throw_if_zero($q) |
|
921 | - { |
|
899 | + protected static function scalarmult_throw_if_zero($q) { |
|
922 | 900 | $d = 0; |
923 | 901 | for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) { |
924 | 902 | $d |= ParagonIE_Sodium_Core_Util::chrToInt($q[$i]); |
@@ -942,8 +920,7 @@ discard block |
||
942 | 920 | * @throws SodiumException |
943 | 921 | * @throws TypeError |
944 | 922 | */ |
945 | - public static function secretbox($plaintext, $nonce, $key) |
|
946 | - { |
|
923 | + public static function secretbox($plaintext, $nonce, $key) { |
|
947 | 924 | /** @var string $subkey */ |
948 | 925 | $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key); |
949 | 926 | |
@@ -1017,8 +994,7 @@ discard block |
||
1017 | 994 | * @throws SodiumException |
1018 | 995 | * @throws TypeError |
1019 | 996 | */ |
1020 | - public static function secretbox_open($ciphertext, $nonce, $key) |
|
1021 | - { |
|
997 | + public static function secretbox_open($ciphertext, $nonce, $key) { |
|
1022 | 998 | /** @var string $mac */ |
1023 | 999 | $mac = ParagonIE_Sodium_Core_Util::substr( |
1024 | 1000 | $ciphertext, |
@@ -1090,8 +1066,7 @@ discard block |
||
1090 | 1066 | * @throws SodiumException |
1091 | 1067 | * @throws TypeError |
1092 | 1068 | */ |
1093 | - public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key) |
|
1094 | - { |
|
1069 | + public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key) { |
|
1095 | 1070 | /** @var string $subkey */ |
1096 | 1071 | $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20( |
1097 | 1072 | ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16), |
@@ -1169,8 +1144,7 @@ discard block |
||
1169 | 1144 | * @throws SodiumException |
1170 | 1145 | * @throws TypeError |
1171 | 1146 | */ |
1172 | - public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key) |
|
1173 | - { |
|
1147 | + public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key) { |
|
1174 | 1148 | /** @var string $mac */ |
1175 | 1149 | $mac = ParagonIE_Sodium_Core_Util::substr( |
1176 | 1150 | $ciphertext, |
@@ -1238,8 +1212,7 @@ discard block |
||
1238 | 1212 | * @throws Exception |
1239 | 1213 | * @throws SodiumException |
1240 | 1214 | */ |
1241 | - public static function secretstream_xchacha20poly1305_init_push($key) |
|
1242 | - { |
|
1215 | + public static function secretstream_xchacha20poly1305_init_push($key) { |
|
1243 | 1216 | # randombytes_buf(out, crypto_secretstream_xchacha20poly1305_HEADERBYTES); |
1244 | 1217 | $out = random_bytes(24); |
1245 | 1218 | |
@@ -1268,8 +1241,7 @@ discard block |
||
1268 | 1241 | * @return string Returns a state. |
1269 | 1242 | * @throws Exception |
1270 | 1243 | */ |
1271 | - public static function secretstream_xchacha20poly1305_init_pull($key, $header) |
|
1272 | - { |
|
1244 | + public static function secretstream_xchacha20poly1305_init_pull($key, $header) { |
|
1273 | 1245 | # crypto_core_hchacha20(state->k, in, k, NULL); |
1274 | 1246 | $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20( |
1275 | 1247 | ParagonIE_Sodium_Core_Util::substr($header, 0, 16), |
@@ -1295,8 +1267,7 @@ discard block |
||
1295 | 1267 | * @return string |
1296 | 1268 | * @throws SodiumException |
1297 | 1269 | */ |
1298 | - public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0) |
|
1299 | - { |
|
1270 | + public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0) { |
|
1300 | 1271 | $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state); |
1301 | 1272 | # crypto_onetimeauth_poly1305_state poly1305_state; |
1302 | 1273 | # unsigned char block[64U]; |
@@ -1424,8 +1395,7 @@ discard block |
||
1424 | 1395 | * @return bool|array{0: string, 1: int} |
1425 | 1396 | * @throws SodiumException |
1426 | 1397 | */ |
1427 | - public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '') |
|
1428 | - { |
|
1398 | + public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '') { |
|
1429 | 1399 | $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state); |
1430 | 1400 | |
1431 | 1401 | $cipherlen = ParagonIE_Sodium_Core_Util::strlen($cipher); |
@@ -1547,8 +1517,7 @@ discard block |
||
1547 | 1517 | * @return void |
1548 | 1518 | * @throws SodiumException |
1549 | 1519 | */ |
1550 | - public static function secretstream_xchacha20poly1305_rekey(&$state) |
|
1551 | - { |
|
1520 | + public static function secretstream_xchacha20poly1305_rekey(&$state) { |
|
1552 | 1521 | $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state); |
1553 | 1522 | # unsigned char new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + |
1554 | 1523 | # crypto_secretstream_xchacha20poly1305_INONCEBYTES]; |
@@ -1599,8 +1568,7 @@ discard block |
||
1599 | 1568 | * @throws SodiumException |
1600 | 1569 | * @throws TypeError |
1601 | 1570 | */ |
1602 | - public static function sign_detached($message, $sk) |
|
1603 | - { |
|
1571 | + public static function sign_detached($message, $sk) { |
|
1604 | 1572 | return ParagonIE_Sodium_Core_Ed25519::sign_detached($message, $sk); |
1605 | 1573 | } |
1606 | 1574 | |
@@ -1615,8 +1583,7 @@ discard block |
||
1615 | 1583 | * @throws SodiumException |
1616 | 1584 | * @throws TypeError |
1617 | 1585 | */ |
1618 | - public static function sign($message, $sk) |
|
1619 | - { |
|
1586 | + public static function sign($message, $sk) { |
|
1620 | 1587 | return ParagonIE_Sodium_Core_Ed25519::sign($message, $sk); |
1621 | 1588 | } |
1622 | 1589 | |
@@ -1631,8 +1598,7 @@ discard block |
||
1631 | 1598 | * @throws SodiumException |
1632 | 1599 | * @throws TypeError |
1633 | 1600 | */ |
1634 | - public static function sign_open($signedMessage, $pk) |
|
1635 | - { |
|
1601 | + public static function sign_open($signedMessage, $pk) { |
|
1636 | 1602 | return ParagonIE_Sodium_Core_Ed25519::sign_open($signedMessage, $pk); |
1637 | 1603 | } |
1638 | 1604 | |
@@ -1648,8 +1614,7 @@ discard block |
||
1648 | 1614 | * @throws SodiumException |
1649 | 1615 | * @throws TypeError |
1650 | 1616 | */ |
1651 | - public static function sign_verify_detached($signature, $message, $pk) |
|
1652 | - { |
|
1617 | + public static function sign_verify_detached($signature, $message, $pk) { |
|
1653 | 1618 | return ParagonIE_Sodium_Core_Ed25519::verify_detached($signature, $message, $pk); |
1654 | 1619 | } |
1655 | 1620 | } |
@@ -23,8 +23,7 @@ discard block |
||
23 | 23 | * SplFixedArray constructor. |
24 | 24 | * @param int $size |
25 | 25 | */ |
26 | - public function __construct($size = 0) |
|
27 | - { |
|
26 | + public function __construct($size = 0) { |
|
28 | 27 | $this->size = $size; |
29 | 28 | $this->internalArray = array(); |
30 | 29 | } |
@@ -32,16 +31,14 @@ discard block |
||
32 | 31 | /** |
33 | 32 | * @return int |
34 | 33 | */ |
35 | - public function count() |
|
36 | - { |
|
34 | + public function count() { |
|
37 | 35 | return count($this->internalArray); |
38 | 36 | } |
39 | 37 | |
40 | 38 | /** |
41 | 39 | * @return array |
42 | 40 | */ |
43 | - public function toArray() |
|
44 | - { |
|
41 | + public function toArray() { |
|
45 | 42 | ksort($this->internalArray); |
46 | 43 | return (array) $this->internalArray; |
47 | 44 | } |
@@ -52,8 +49,7 @@ discard block |
||
52 | 49 | * @return SplFixedArray |
53 | 50 | * @psalm-suppress MixedAssignment |
54 | 51 | */ |
55 | - public static function fromArray(array $array, $save_indexes = true) |
|
56 | - { |
|
52 | + public static function fromArray(array $array, $save_indexes = true) { |
|
57 | 53 | $self = new SplFixedArray(count($array)); |
58 | 54 | if($save_indexes) { |
59 | 55 | foreach($array as $key => $value) { |
@@ -72,8 +68,7 @@ discard block |
||
72 | 68 | /** |
73 | 69 | * @return int |
74 | 70 | */ |
75 | - public function getSize() |
|
76 | - { |
|
71 | + public function getSize() { |
|
77 | 72 | return $this->size; |
78 | 73 | } |
79 | 74 | |
@@ -81,8 +76,7 @@ discard block |
||
81 | 76 | * @param int $size |
82 | 77 | * @return bool |
83 | 78 | */ |
84 | - public function setSize($size) |
|
85 | - { |
|
79 | + public function setSize($size) { |
|
86 | 80 | $this->size = $size; |
87 | 81 | return true; |
88 | 82 | } |
@@ -91,8 +85,7 @@ discard block |
||
91 | 85 | * @param string|int $index |
92 | 86 | * @return bool |
93 | 87 | */ |
94 | - public function offsetExists($index) |
|
95 | - { |
|
88 | + public function offsetExists($index) { |
|
96 | 89 | return array_key_exists((int) $index, $this->internalArray); |
97 | 90 | } |
98 | 91 | |
@@ -100,8 +93,7 @@ discard block |
||
100 | 93 | * @param string|int $index |
101 | 94 | * @return mixed |
102 | 95 | */ |
103 | - public function offsetGet($index) |
|
104 | - { |
|
96 | + public function offsetGet($index) { |
|
105 | 97 | /** @psalm-suppress MixedReturnStatement */ |
106 | 98 | return $this->internalArray[(int) $index]; |
107 | 99 | } |
@@ -111,16 +103,14 @@ discard block |
||
111 | 103 | * @param mixed $newval |
112 | 104 | * @psalm-suppress MixedAssignment |
113 | 105 | */ |
114 | - public function offsetSet($index, $newval) |
|
115 | - { |
|
106 | + public function offsetSet($index, $newval) { |
|
116 | 107 | $this->internalArray[(int) $index] = $newval; |
117 | 108 | } |
118 | 109 | |
119 | 110 | /** |
120 | 111 | * @param string|int $index |
121 | 112 | */ |
122 | - public function offsetUnset($index) |
|
123 | - { |
|
113 | + public function offsetUnset($index) { |
|
124 | 114 | unset($this->internalArray[(int) $index]); |
125 | 115 | } |
126 | 116 | |
@@ -130,8 +120,7 @@ discard block |
||
130 | 120 | * @return void |
131 | 121 | * @since 5.3.0 |
132 | 122 | */ |
133 | - public function rewind() |
|
134 | - { |
|
123 | + public function rewind() { |
|
135 | 124 | reset($this->internalArray); |
136 | 125 | } |
137 | 126 | |
@@ -141,8 +130,7 @@ discard block |
||
141 | 130 | * @return mixed The current element value. |
142 | 131 | * @since 5.3.0 |
143 | 132 | */ |
144 | - public function current() |
|
145 | - { |
|
133 | + public function current() { |
|
146 | 134 | /** @psalm-suppress MixedReturnStatement */ |
147 | 135 | return current($this->internalArray); |
148 | 136 | } |
@@ -151,16 +139,14 @@ discard block |
||
151 | 139 | * Return current array index |
152 | 140 | * @return int The current array index. |
153 | 141 | */ |
154 | - public function key() |
|
155 | - { |
|
142 | + public function key() { |
|
156 | 143 | return key($this->internalArray); |
157 | 144 | } |
158 | 145 | |
159 | 146 | /** |
160 | 147 | * @return void |
161 | 148 | */ |
162 | - public function next() |
|
163 | - { |
|
149 | + public function next() { |
|
164 | 150 | next($this->internalArray); |
165 | 151 | } |
166 | 152 | |
@@ -169,8 +155,7 @@ discard block |
||
169 | 155 | * @link https://php.net/manual/en/splfixedarray.valid.php |
170 | 156 | * @return bool true if the array contains any more elements, false otherwise. |
171 | 157 | */ |
172 | - public function valid() |
|
173 | - { |
|
158 | + public function valid() { |
|
174 | 159 | if (empty($this->internalArray)) { |
175 | 160 | return false; |
176 | 161 | } |
@@ -182,8 +167,7 @@ discard block |
||
182 | 167 | /** |
183 | 168 | * Do nothing. |
184 | 169 | */ |
185 | - public function __wakeup() |
|
186 | - { |
|
170 | + public function __wakeup() { |
|
187 | 171 | // NOP |
188 | 172 | } |
189 | 173 | } |
190 | 174 | \ No newline at end of file |