From 4511ccd7e65c3a15a8f34a2cc78290d50148ae02 Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Fri, 6 Aug 2021 14:25:16 -0500 Subject: [PATCH] chore(deps): upgrade vimeo/psalm --- composer.json | 2 +- src/Builder/FallbackBuilder.php | 1 - src/Converter/Time/PhpTimeConverter.php | 2 +- src/FeatureSet.php | 5 +---- src/Fields/SerializableFieldsTrait.php | 1 + src/Generator/CombGenerator.php | 2 +- src/Generator/DceSecurityGenerator.php | 3 +-- src/Generator/PeclUuidNameGenerator.php | 6 +++--- src/Provider/Dce/SystemDceSecurityProvider.php | 1 - src/Provider/Node/FallbackNodeProvider.php | 1 - src/Provider/Node/SystemNodeProvider.php | 2 +- src/Type/Decimal.php | 1 + src/Type/Hexadecimal.php | 1 + src/Type/Integer.php | 1 + src/Type/Time.php | 1 + 15 files changed, 14 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 016eb51..df1f908 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "phpunit/phpunit": "^8.5 || ^9", "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^3.18" + "vimeo/psalm": "^4.9" }, "suggest": { "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", diff --git a/src/Builder/FallbackBuilder.php b/src/Builder/FallbackBuilder.php index cfd4665..470d2f7 100644 --- a/src/Builder/FallbackBuilder.php +++ b/src/Builder/FallbackBuilder.php @@ -55,7 +55,6 @@ class FallbackBuilder implements UuidBuilderInterface { $lastBuilderException = null; - /** @var UuidBuilderInterface $builder */ foreach ($this->builders as $builder) { try { return $builder->build($codec, $bytes); diff --git a/src/Converter/Time/PhpTimeConverter.php b/src/Converter/Time/PhpTimeConverter.php index 52963fe..538d2f2 100644 --- a/src/Converter/Time/PhpTimeConverter.php +++ b/src/Converter/Time/PhpTimeConverter.php @@ -111,7 +111,7 @@ class PhpTimeConverter implements TimeConverterInterface ); } - return new Hexadecimal(str_pad(dechex((int) $uuidTime), 16, '0', STR_PAD_LEFT)); + return new Hexadecimal(str_pad(dechex($uuidTime), 16, '0', STR_PAD_LEFT)); } public function convertTime(Hexadecimal $uuidTimestamp): Time diff --git a/src/FeatureSet.php b/src/FeatureSet.php index 4531a6d..92ce2ef 100644 --- a/src/FeatureSet.php +++ b/src/FeatureSet.php @@ -273,10 +273,7 @@ class FeatureSet $this->calculator = $calculator; $this->numberConverter = $this->buildNumberConverter($calculator); $this->timeConverter = $this->buildTimeConverter($calculator); - - if (isset($this->timeProvider)) { - $this->timeGenerator = $this->buildTimeGenerator($this->timeProvider); - } + $this->timeGenerator = $this->buildTimeGenerator($this->timeProvider); } /** diff --git a/src/Fields/SerializableFieldsTrait.php b/src/Fields/SerializableFieldsTrait.php index 4ae90be..a076568 100644 --- a/src/Fields/SerializableFieldsTrait.php +++ b/src/Fields/SerializableFieldsTrait.php @@ -48,6 +48,7 @@ trait SerializableFieldsTrait * @param string $serialized The serialized string representation of the object * * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint + * @psalm-suppress UnusedMethodCall */ public function unserialize($serialized): void { diff --git a/src/Generator/CombGenerator.php b/src/Generator/CombGenerator.php index 88ae6ea..49b0938 100644 --- a/src/Generator/CombGenerator.php +++ b/src/Generator/CombGenerator.php @@ -107,7 +107,7 @@ class CombGenerator implements RandomGeneratorInterface return (string) hex2bin( str_pad( - bin2hex((string) $hash), + bin2hex($hash), $length - self::TIMESTAMP_BYTES, '0' ) diff --git a/src/Generator/DceSecurityGenerator.php b/src/Generator/DceSecurityGenerator.php index 79f0566..aca8c5d 100644 --- a/src/Generator/DceSecurityGenerator.php +++ b/src/Generator/DceSecurityGenerator.php @@ -137,7 +137,7 @@ class DceSecurityGenerator implements DceSecurityGeneratorInterface ); } - $domainByte = (string) pack('n', $localDomain)[1]; + $domainByte = pack('n', $localDomain)[1]; $identifierBytes = (string) hex2bin(str_pad($identifierHex, 8, '0', STR_PAD_LEFT)); if ($node instanceof Hexadecimal) { @@ -149,7 +149,6 @@ class DceSecurityGenerator implements DceSecurityGeneratorInterface $clockSeq = $clockSeq << 8; } - /** @var string $bytes */ $bytes = $this->timeGenerator->generate($node, $clockSeq); // Replace bytes in the time-based UUID with DCE Security values. diff --git a/src/Generator/PeclUuidNameGenerator.php b/src/Generator/PeclUuidNameGenerator.php index 93b7868..3780c5c 100644 --- a/src/Generator/PeclUuidNameGenerator.php +++ b/src/Generator/PeclUuidNameGenerator.php @@ -35,11 +35,11 @@ class PeclUuidNameGenerator implements NameGeneratorInterface { switch ($hashAlgorithm) { case 'md5': - $uuid = (string) uuid_generate_md5($ns->toString(), $name); + $uuid = uuid_generate_md5($ns->toString(), $name); break; case 'sha1': - $uuid = (string) uuid_generate_sha1($ns->toString(), $name); + $uuid = uuid_generate_sha1($ns->toString(), $name); break; default: @@ -49,6 +49,6 @@ class PeclUuidNameGenerator implements NameGeneratorInterface )); } - return (string) uuid_parse($uuid); + return uuid_parse($uuid); } } diff --git a/src/Provider/Dce/SystemDceSecurityProvider.php b/src/Provider/Dce/SystemDceSecurityProvider.php index 67b58eb..6d6240b 100644 --- a/src/Provider/Dce/SystemDceSecurityProvider.php +++ b/src/Provider/Dce/SystemDceSecurityProvider.php @@ -177,7 +177,6 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface return ''; } - /** @var string $sid */ $sid = str_getcsv(trim((string) $response))[1] ?? ''; if (($lastHyphen = strrpos($sid, '-')) === false) { diff --git a/src/Provider/Node/FallbackNodeProvider.php b/src/Provider/Node/FallbackNodeProvider.php index f6e5e40..cad0104 100644 --- a/src/Provider/Node/FallbackNodeProvider.php +++ b/src/Provider/Node/FallbackNodeProvider.php @@ -41,7 +41,6 @@ class FallbackNodeProvider implements NodeProviderInterface { $lastProviderException = null; - /** @var NodeProviderInterface $provider */ foreach ($this->nodeProviders as $provider) { try { return $provider->getNode(); diff --git a/src/Provider/Node/SystemNodeProvider.php b/src/Provider/Node/SystemNodeProvider.php index 8234aba..d512f22 100644 --- a/src/Provider/Node/SystemNodeProvider.php +++ b/src/Provider/Node/SystemNodeProvider.php @@ -132,7 +132,7 @@ class SystemNodeProvider implements NodeProviderInterface $node = $matches[1][0] ?? ''; } - return (string) $node; + return $node; } /** diff --git a/src/Type/Decimal.php b/src/Type/Decimal.php index 5ba8865..042fc16 100644 --- a/src/Type/Decimal.php +++ b/src/Type/Decimal.php @@ -104,6 +104,7 @@ final class Decimal implements NumberInterface * @param string $serialized The serialized string representation of the object * * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint + * @psalm-suppress UnusedMethodCall */ public function unserialize($serialized): void { diff --git a/src/Type/Hexadecimal.php b/src/Type/Hexadecimal.php index 1145018..7de2f82 100644 --- a/src/Type/Hexadecimal.php +++ b/src/Type/Hexadecimal.php @@ -83,6 +83,7 @@ final class Hexadecimal implements TypeInterface * @param string $serialized The serialized string representation of the object * * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint + * @psalm-suppress UnusedMethodCall */ public function unserialize($serialized): void { diff --git a/src/Type/Integer.php b/src/Type/Integer.php index 540ecbe..fabe5eb 100644 --- a/src/Type/Integer.php +++ b/src/Type/Integer.php @@ -120,6 +120,7 @@ final class Integer implements NumberInterface * @param string $serialized The serialized string representation of the object * * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint + * @psalm-suppress UnusedMethodCall */ public function unserialize($serialized): void { diff --git a/src/Type/Time.php b/src/Type/Time.php index f6a140f..abceddf 100644 --- a/src/Type/Time.php +++ b/src/Type/Time.php @@ -94,6 +94,7 @@ final class Time implements TypeInterface * @param string $serialized The serialized string representation of the object * * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint + * @psalm-suppress UnusedMethodCall */ public function unserialize($serialized): void {