fix psalm errors

reliforp · Jun 10, 2021 · a1ccec8 · a1ccec8
1 parent 1d8ec49
commit a1ccec8
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 8 deletions.
diff --git a/src/Command/Inspector/DaemonCommand.php b/src/Command/Inspector/DaemonCommand.php
@@ -99,7 +99,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $get_trace_settings
         );
 
-        $echo_back_canceler = new EchoBackCanceller();
+        $_echo_back_canceler = new EchoBackCanceller();
 
         Loop::onReadable(
             STDIN,

diff --git a/src/Inspector/Daemon/Dispatcher/WorkerPool.php b/src/Inspector/Daemon/Dispatcher/WorkerPool.php
@@ -31,6 +31,7 @@ final class WorkerPool implements WorkerPoolInterface
     /** @var array<int, bool> */
     private array $on_read_list;
 
+    /** @no-named-arguments */
     public function __construct(PhpReaderControllerInterface ...$contexts)
     {
         $this->contexts = $contexts;

diff --git a/src/Inspector/Daemon/Reader/Controller/PhpReaderControllerProtocol.php b/src/Inspector/Daemon/Reader/Controller/PhpReaderControllerProtocol.php
@@ -30,6 +30,7 @@ public function __construct(Channel $channel)
         $this->channel = $channel;
     }
 
+    /** @return static */
     public static function createFromChannel(Channel $channel): self
     {
         return new self($channel);

diff --git a/src/Inspector/Daemon/Reader/Worker/PhpReaderEntryPoint.php b/src/Inspector/Daemon/Reader/Worker/PhpReaderEntryPoint.php
@@ -36,11 +36,17 @@ public function __construct(
 
     public function run(): \Generator
     {
-        /** @var SetSettingsMessage $set_settings_message */
+        /**
+         * @psalm-ignore-var
+         * @var SetSettingsMessage $set_settings_message
+         */
         $set_settings_message = yield $this->protocol->receiveSettings();
 
         while (1) {
-            /** @var AttachMessage $attach_message */
+            /**
+             * @psalm-ignore-var
+             * @var AttachMessage $attach_message
+             */
             $attach_message = yield $this->protocol->receiveAttach();
 
             $target_process_settings = new TargetProcessSettings(

diff --git a/src/Inspector/Daemon/Reader/Worker/PhpReaderWorkerProtocol.php b/src/Inspector/Daemon/Reader/Worker/PhpReaderWorkerProtocol.php
@@ -30,6 +30,7 @@ public function __construct(Channel $channel)
         $this->channel = $channel;
     }
 
+    /** @return static */
     public static function createFromChannel(Channel $channel): self
     {
         return new self($channel);

diff --git a/src/Inspector/Daemon/Searcher/Controller/PhpSearcherControllerProtocol.php b/src/Inspector/Daemon/Searcher/Controller/PhpSearcherControllerProtocol.php
@@ -28,6 +28,7 @@ public function __construct(Channel $channel)
         $this->channel = $channel;
     }
 
+    /** @return static */
     public static function createFromChannel(Channel $channel): self
     {
         return new self($channel);

diff --git a/src/Inspector/Daemon/Searcher/Worker/PhpSearcherEntryPoint.php b/src/Inspector/Daemon/Searcher/Worker/PhpSearcherEntryPoint.php
@@ -35,7 +35,10 @@ public function __construct(
 
     public function run(): \Generator
     {
-        /** @var TargetRegexMessage $target_regex */
+        /**
+         * @psalm-ignore-var
+         * @var TargetRegexMessage $target_regex
+         */
         $target_regex = yield $this->protocol->receiveTargetRegex();
 
         while (1) {

diff --git a/src/Inspector/Daemon/Searcher/Worker/PhpSearcherWorkerProtocol.php b/src/Inspector/Daemon/Searcher/Worker/PhpSearcherWorkerProtocol.php
@@ -28,6 +28,7 @@ public function __construct(Channel $channel)
         $this->channel = $channel;
     }
 
+    /** @return static */
     public static function createFromChannel(Channel $channel): self
     {
         return new self($channel);

diff --git a/src/Inspector/Settings/InspectorSettingsException.php b/src/Inspector/Settings/InspectorSettingsException.php
@@ -14,7 +14,11 @@
 namespace PhpProfiler\Inspector\Settings;
 
 use LogicException;
+use Throwable;
 
+/**
+ * @psalm-consistent-constructor
+ */
 abstract class InspectorSettingsException extends \Exception
 {
     public const ERROR_NONE = 0;
@@ -24,6 +28,16 @@ abstract class InspectorSettingsException extends \Exception
         self::ERROR_NONE => '',
     ];
 
+    /**
+     * @param string $message
+     * @param int $code
+     * @param Throwable|null $previous
+     */
+    public function __construct($message = "", $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+
     /**
      * @return array<int, string>
      */

diff --git a/src/Inspector/Settings/TargetPhpSettings/TargetPhpSettingsFromConsoleInput.php b/src/Inspector/Settings/TargetPhpSettings/TargetPhpSettingsFromConsoleInput.php
@@ -81,7 +81,6 @@ public function createSettings(InputInterface $input): TargetPhpSettings
                 TargetPhpSettingsException::TARGET_PHP_VERSION_INVALID
             );
         }
-        /** @psalm-var value-of<ZendTypeReader::ALL_SUPPORTED_VERSIONS> $php_version */
 
         $php_path = $input->getOption('php-path');
         if (!is_null($php_path) and !is_string($php_path)) {

diff --git a/src/Lib/ByteStream/ByteReaderDisableWriteAccessTrait.php b/src/Lib/ByteStream/ByteReaderDisableWriteAccessTrait.php
@@ -21,11 +21,16 @@
  */
 trait ByteReaderDisableWriteAccessTrait
 {
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
     public function offsetSet($offset, $value): void
     {
         throw new LogicException('write access is forbidden for ByteReaderInteface');
     }
 
+    /** @param mixed $offset */
     public function offsetUnset($offset): void
     {
         throw new LogicException('write access is forbidden for ByteReaderInteface');

diff --git a/src/Lib/Elf/Parser/Elf64Parser.php b/src/Lib/Elf/Parser/Elf64Parser.php
@@ -299,6 +299,10 @@ public function parseGnuHashTable(
 
         $chain_offset = $offset + 16 + $bloom_size * 8 + $nbuckets * 4;
 
+        if ($buckets === []) {
+            return null;
+        }
+
         $max_bucket_index = max($buckets);
         $last_chain_offset = $chain_offset + ($max_bucket_index - $symoffset) * 4;
         $last_chain_item = $this->integer_reader->read32($data, $last_chain_offset);

diff --git a/src/Lib/Loop/AsyncLoopMiddleware/NanoSleepMiddlewareAsync.php b/src/Lib/Loop/AsyncLoopMiddleware/NanoSleepMiddlewareAsync.php
@@ -28,6 +28,7 @@ public function __construct(int $sleep_nano_seconds, AsyncLoopMiddlewareInterfac
 
     public function invoke(): \Generator
     {
+        /** @psalm-suppress UnusedFunctionCall */
         time_nanosleep(0, $this->sleep_nano_seconds);
         yield from $this->chain->invoke();
     }

diff --git a/src/Lib/Loop/LoopMiddleware/NanoSleepMiddleware.php b/src/Lib/Loop/LoopMiddleware/NanoSleepMiddleware.php
@@ -28,6 +28,7 @@ public function __construct(int $sleep_nano_seconds, LoopMiddlewareInterface $ch
 
     public function invoke(): bool
     {
+        /** @psalm-suppress UnusedFunctionCall */
         time_nanosleep(0, $this->sleep_nano_seconds);
         if (!$this->chain->invoke()) {
             return false;

diff --git a/src/Lib/PhpProcessReader/PhpMemoryReader/ExecutorGlobalsReader.php b/src/Lib/PhpProcessReader/PhpMemoryReader/ExecutorGlobalsReader.php
@@ -157,7 +157,10 @@ public function readFunctionName(int $pid, string $php_version, CData $current_f
          */
         $current_function_name_pointer = \FFI::cast('long', $current_function->common->function_name);
         if ($current_function_name_pointer->cdata !== 0) {
-            /** @var \FFI\CPointer $current_function_name_pointer */
+            /**
+             * @psalm-ignore-var
+             * @var \FFI\CPointer $current_function_name_pointer
+             */
             $current_function_name_zstring = $this->memory_reader->read(
                 $pid,
                 $current_function_name_pointer->cdata,

diff --git a/src/Lib/Process/MemoryMap/ProcessModuleMemoryMap.php b/src/Lib/Process/MemoryMap/ProcessModuleMemoryMap.php
@@ -50,7 +50,7 @@ public function getMemoryAddressFromOffset(int $offset): int
     {
         $ranges = $this->getSortedOffsetToMemoryAreaMap();
         $file_offset_decided = 0;
-        foreach ($ranges as $file_offset => $memory_begin) {
+        foreach ($ranges as $file_offset => $_memory_begin) {
             if ($file_offset <= $offset) {
                 $file_offset_decided = $file_offset;
             }

diff --git a/src/Lib/Process/MemoryReader/MemoryReader.php b/src/Lib/Process/MemoryReader/MemoryReader.php
@@ -60,7 +60,6 @@ public function __construct()
      */
     public function read(int $pid, int $remote_address, int $size): CData
     {
-        /** @var CData $buffer */
         $buffer = $this->ffi->new("unsigned char[{$size}]");
 
         /**