Merge 1b044dc into b2da654

.github/workflows/phpcs.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           extensions: dom, mbstring
           coverage: none
           tools: cs2pr

.github/workflows/phpunit.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           extensions: ffi, dom, mbstring
           coverage: pcov
 

.github/workflows/static-analysis.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           extensions: dom, mbstring
           coverage: none
 

README.md

@@ -31,7 +31,6 @@ php-profiler also provides functionality to only get the address of EG from targ
 ## Requirements
 ### Supported PHP versions
 #### Execution
-- PHP-7.4 64bit Linux x86_64 (NTS / ZTS)
 - PHP-8.0 64bit Linux x86_64 (NTS / ZTS)
 - FFI extension must be enabled.
 - If the target process is ZTS, PCNTL extension must be enabled.

composer.json

@@ -17,7 +17,7 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "php": "^7.4|^8.0",
+    "php": "^8.0",
     "ext-ffi": "*",
     "ext-filter": "*",
     "ext-json": "*",

config/di.php

@@ -35,7 +35,7 @@
 return [
     MemoryReaderInterface::class => autowire(MemoryReader::class),
     ZendTypeReader::class => function () {
-        return new ZendTypeReader(ZendTypeReader::V74);
+        return new ZendTypeReader(ZendTypeReader::V80);
     },
     SymbolResolverCreatorInterface::class => autowire(Elf64SymbolResolverCreator::class),
     FileReaderInterface::class => autowire(CatFileReader::class),

src/Command/CommandEnumerator.php

@@ -23,15 +23,12 @@
  */
 final class CommandEnumerator implements IteratorAggregate
 {
-    private FilesystemIterator $command_files_iterator;
-
     /**
      * CommandEnumerator constructor.
-     * @param FilesystemIterator $command_files_iterator
      */
-    public function __construct(FilesystemIterator $command_files_iterator)
-    {
-        $this->command_files_iterator = $command_files_iterator;
+    public function __construct(
+        private FilesystemIterator $command_files_iterator
+    ) {
     }
 
     /**

src/Command/Inspector/DaemonCommand.php

@@ -36,33 +36,16 @@
 
 final class DaemonCommand extends Command
 {
-    private PhpSearcherContextCreator $php_searcher_context_creator;
-    private PhpReaderContextCreator $php_reader_context_creator;
-    private DaemonSettingsFromConsoleInput $daemon_settings_from_console_input;
-    private GetTraceSettingsFromConsoleInput $get_trace_settings_from_console_input;
-    private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input;
-    private TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input;
-    private TemplateSettingsFromConsoleInput $template_settings_from_console_input;
-    private TemplatedTraceFormatterFactory $templated_trace_formatter_factory;
-
     public function __construct(
-        PhpSearcherContextCreator $php_searcher_context_creator,
-        PhpReaderContextCreator $php_reader_context_creator,
-        DaemonSettingsFromConsoleInput $daemon_settings_from_console_input,
-        GetTraceSettingsFromConsoleInput $get_trace_settings_from_console_input,
-        TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
-        TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input,
-        TemplateSettingsFromConsoleInput $template_settings_from_console_input,
-        TemplatedTraceFormatterFactory $template_factory,
+        private PhpSearcherContextCreator $php_searcher_context_creator,
+        private PhpReaderContextCreator $php_reader_context_creator,
+        private DaemonSettingsFromConsoleInput $daemon_settings_from_console_input,
+        private GetTraceSettingsFromConsoleInput $get_trace_settings_from_console_input,
+        private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
+        private TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input,
+        private TemplateSettingsFromConsoleInput $template_settings_from_console_input,
+        private TemplatedTraceFormatterFactory $templated_trace_formatter_factory,
     ) {
-        $this->php_reader_context_creator = $php_reader_context_creator;
-        $this->php_searcher_context_creator = $php_searcher_context_creator;
-        $this->daemon_settings_from_console_input = $daemon_settings_from_console_input;
-        $this->get_trace_settings_from_console_input = $get_trace_settings_from_console_input;
-        $this->target_php_settings_from_console_input = $target_php_settings_from_console_input;
-        $this->trace_loop_settings_from_console_input = $trace_loop_settings_from_console_input;
-        $this->template_settings_from_console_input = $template_settings_from_console_input;
-        $this->templated_trace_formatter_factory = $template_factory;
         parent::__construct();
     }
 

src/Command/Inspector/GetCurrentFunctionNameCommand.php

@@ -30,27 +30,14 @@
 
 final class GetCurrentFunctionNameCommand extends Command
 {
-    private PhpGlobalsFinder $php_globals_finder;
-    private ExecutorGlobalsReader $executor_globals_reader;
-    private TraceLoopProvider $loop_provider;
-    private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input;
-    private TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input;
-    private TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input;
-
     public function __construct(
-        PhpGlobalsFinder $php_globals_finder,
-        ExecutorGlobalsReader $executor_globals_reader,
-        TraceLoopProvider $loop_provider,
-        TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
-        TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input,
-        TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input
+        private PhpGlobalsFinder $php_globals_finder,
+        private ExecutorGlobalsReader $executor_globals_reader,
+        private TraceLoopProvider $loop_provider,
+        private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
+        private TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input,
+        private TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input
     ) {
-        $this->php_globals_finder = $php_globals_finder;
-        $this->executor_globals_reader = $executor_globals_reader;
-        $this->loop_provider = $loop_provider;
-        $this->target_php_settings_from_console_input = $target_php_settings_from_console_input;
-        $this->target_process_settings_from_console_input = $target_process_settings_from_console_input;
-        $this->trace_loop_settings_from_console_input = $trace_loop_settings_from_console_input;
         parent::__construct();
     }
 

src/Command/Inspector/GetEgAddressCommand.php

@@ -31,18 +31,11 @@
  */
 final class GetEgAddressCommand extends Command
 {
-    private PhpGlobalsFinder $php_globals_finder;
-    private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input;
-    private TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input;
-
     public function __construct(
-        PhpGlobalsFinder $php_globals_finder,
-        TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
-        TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input
+        private PhpGlobalsFinder $php_globals_finder,
+        private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
+        private TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input
     ) {
-        $this->php_globals_finder = $php_globals_finder;
-        $this->target_php_settings_from_console_input = $target_php_settings_from_console_input;
-        $this->target_process_settings_from_console_input = $target_process_settings_from_console_input;
         parent::__construct();
     }
 

src/Command/Inspector/GetTraceCommand.php

@@ -33,36 +33,17 @@
 
 final class GetTraceCommand extends Command
 {
-    private PhpGlobalsFinder $php_globals_finder;
-    private ExecutorGlobalsReader $executor_globals_reader;
-    private TraceLoopProvider $loop_provider;
-    private GetTraceSettingsFromConsoleInput $get_trace_settings_from_console_input;
-    private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input;
-    private TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input;
-    private TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input;
-    private TemplateSettingsFromConsoleInput $template_settings_from_console_input;
-    private TemplatedTraceFormatterFactory $templated_trace_formatter_factory;
-
     public function __construct(
-        PhpGlobalsFinder $php_globals_finder,
-        ExecutorGlobalsReader $executor_globals_reader,
-        TraceLoopProvider $loop_provider,
-        GetTraceSettingsFromConsoleInput $get_trace_settings_from_console_input,
-        TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
-        TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input,
-        TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input,
-        TemplateSettingsFromConsoleInput $template_settings_from_console_input,
-        TemplatedTraceFormatterFactory $templated_trace_formatter_factory
+        private PhpGlobalsFinder $php_globals_finder,
+        private ExecutorGlobalsReader $executor_globals_reader,
+        private TraceLoopProvider $loop_provider,
+        private GetTraceSettingsFromConsoleInput $get_trace_settings_from_console_input,
+        private TargetPhpSettingsFromConsoleInput $target_php_settings_from_console_input,
+        private TargetProcessSettingsFromConsoleInput $target_process_settings_from_console_input,
+        private TraceLoopSettingsFromConsoleInput $trace_loop_settings_from_console_input,
+        private TemplateSettingsFromConsoleInput $template_settings_from_console_input,
+        private TemplatedTraceFormatterFactory $templated_trace_formatter_factory,
     ) {
-        $this->php_globals_finder = $php_globals_finder;
-        $this->executor_globals_reader = $executor_globals_reader;
-        $this->loop_provider = $loop_provider;
-        $this->get_trace_settings_from_console_input = $get_trace_settings_from_console_input;
-        $this->target_php_settings_from_console_input = $target_php_settings_from_console_input;
-        $this->target_process_settings_from_console_input = $target_process_settings_from_console_input;
-        $this->trace_loop_settings_from_console_input = $trace_loop_settings_from_console_input;
-        $this->template_settings_from_console_input = $template_settings_from_console_input;
-        $this->templated_trace_formatter_factory = $templated_trace_formatter_factory;
         parent::__construct();
     }
 

src/Inspector/Daemon/Dispatcher/DispatchTable.php

@@ -20,24 +20,16 @@
 
 final class DispatchTable
 {
-    public WorkerPoolInterface $worker_pool;
     private TargetProcessListInterface $assigned;
-    private TargetPhpSettings $target_php_settings;
-    private TraceLoopSettings $trace_loop_settings;
-    private GetTraceSettings $get_trace_settings;
     /** @var array<int, PhpReaderControllerInterface> */
     private array $dispatch_table = [];
 
     public function __construct(
-        WorkerPoolInterface $worker_pool,
-        TargetPhpSettings $target_php_settings,
-        TraceLoopSettings $trace_loop_settings,
-        GetTraceSettings $get_trace_settings
+        public WorkerPoolInterface $worker_pool,
+        private TargetPhpSettings $target_php_settings,
+        private TraceLoopSettings $trace_loop_settings,
+        private GetTraceSettings $get_trace_settings
     ) {
-        $this->worker_pool = $worker_pool;
-        $this->target_php_settings = $target_php_settings;
-        $this->trace_loop_settings = $trace_loop_settings;
-        $this->get_trace_settings = $get_trace_settings;
         $this->assigned = new TargetProcessList();
     }
 

src/Inspector/Daemon/Reader/Context/PhpReaderContextCreator.php

@@ -22,12 +22,9 @@
 
 final class PhpReaderContextCreator implements PhpReaderContextCreatorInterface
 {
-    private ContextCreatorInterface $context_creator;
-
     public function __construct(
-        ContextCreatorInterface $context_creator
+        private ContextCreatorInterface $context_creator
     ) {
-        $this->context_creator = $context_creator;
     }
 
     public function create(): PhpReaderControllerInterface

src/Inspector/Daemon/Reader/Controller/PhpReaderController.php

@@ -26,16 +26,13 @@
 
 final class PhpReaderController implements PhpReaderControllerInterface
 {
-    /** @var ContextInterface<PhpReaderControllerProtocolInterface> */
-    private ContextInterface $context;
-
     /**
      * PhpReaderContext constructor.
      * @param ContextInterface<PhpReaderControllerProtocolInterface> $context
      */
-    public function __construct(ContextInterface $context)
-    {
-        $this->context = $context;
+    public function __construct(
+        private ContextInterface $context
+    ) {
     }
 
     public function start(): Promise

src/Inspector/Daemon/Reader/Controller/PhpReaderControllerProtocol.php

@@ -23,11 +23,9 @@
 
 final class PhpReaderControllerProtocol implements PhpReaderControllerProtocolInterface
 {
-    private Channel $channel;
-
-    public function __construct(Channel $channel)
-    {
-        $this->channel = $channel;
+    public function __construct(
+        private Channel $channel
+    ) {
     }
 
     /** @return static */

src/Inspector/Daemon/Reader/Protocol/Message/AttachMessage.php

@@ -15,10 +15,8 @@
 
 final class AttachMessage
 {
-    public int $pid;
-
-    public function __construct(int $pid)
-    {
-        $this->pid = $pid;
+    public function __construct(
+        public int $pid
+    ) {
     }
 }

src/Inspector/Daemon/Reader/Protocol/Message/DetachWorkerMessage.php

@@ -15,10 +15,8 @@
 
 final class DetachWorkerMessage
 {
-    public int $pid;
-
-    public function __construct(int $pid)
-    {
-        $this->pid = $pid;
+    public function __construct(
+        public int $pid
+    ) {
     }
 }

src/Inspector/Daemon/Reader/Protocol/Message/SetSettingsMessage.php

@@ -19,17 +19,10 @@
 
 final class SetSettingsMessage
 {
-    public TargetPhpSettings $target_php_settings;
-    public TraceLoopSettings $trace_loop_settings;
-    public GetTraceSettings $get_trace_settings;
-
     public function __construct(
-        TargetPhpSettings $target_php_settings,
-        TraceLoopSettings $trace_loop_settings,
-        GetTraceSettings $get_trace_settings
+        public TargetPhpSettings $target_php_settings,
+        public TraceLoopSettings $trace_loop_settings,
+        public GetTraceSettings $get_trace_settings
     ) {
-        $this->target_php_settings = $target_php_settings;
-        $this->trace_loop_settings = $trace_loop_settings;
-        $this->get_trace_settings = $get_trace_settings;
     }
 }

src/Inspector/Daemon/Reader/Protocol/Message/TraceMessage.php

@@ -17,10 +17,8 @@
 
 final class TraceMessage
 {
-    public CallTrace $trace;
-
-    public function __construct(CallTrace $trace)
-    {
-        $this->trace = $trace;
+    public function __construct(
+        public CallTrace $trace,
+    ) {
     }
 }

src/Inspector/Daemon/Reader/Worker/PhpReaderEntryPoint.php

@@ -23,15 +23,10 @@
 
 final class PhpReaderEntryPoint implements WorkerEntryPointInterface
 {
-    private PhpReaderTraceLoopInterface $trace_loop;
-    private PhpReaderWorkerProtocolInterface $protocol;
-
     public function __construct(
-        PhpReaderTraceLoopInterface $trace_loop,
-        PhpReaderWorkerProtocolInterface $protocol
+        private PhpReaderTraceLoopInterface $trace_loop,
+        private PhpReaderWorkerProtocolInterface $protocol
     ) {
-        $this->trace_loop = $trace_loop;
-        $this->protocol = $protocol;
     }
 
     public function run(): \Generator