Merge pull request #166 from sj-i/remove-current-function

remove i:current_function
reliforp · Feb 14, 2022 · b102b9a · b102b9a
2 parents 0dac36e + aa4d5ad
commit b102b9a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 184 deletions.
diff --git a/src/Command/Inspector/GetCurrentFunctionNameCommand.php b/src/Command/Inspector/GetCurrentFunctionNameCommand.php
diff --git a/src/Lib/PhpProcessReader/PhpMemoryReader/CallTraceReader.php b/src/Lib/PhpProcessReader/PhpMemoryReader/CallTraceReader.php
@@ -84,25 +84,6 @@ private function getExecutorGlobals(
         return $dereferencer->deref($eg_pointer);
     }
 
-    /**
-     * @param value-of<ZendTypeReader::ALL_SUPPORTED_VERSIONS> $php_version
-     * @throws MemoryReaderException
-     */
-    public function readCurrentFunctionName(int $pid, string $php_version, int $executor_globals_address): string
-    {
-        $dereferencer = $this->getDereferencer($pid, $php_version);
-        $eg = $this->getExecutorGlobals($executor_globals_address, $php_version, $dereferencer);
-        if (is_null($eg->current_execute_data)) {
-            throw new \Exception('cannot read current execute data');
-        }
-        /**
-         * @var ZendExecuteData $current_execute_data
-         * @psalm-ignore-var
-         */
-        $current_execute_data = $dereferencer->deref($eg->current_execute_data);
-        return $current_execute_data->getFunctionName($dereferencer) ?? 'unknown';
-    }
-
     /**
      * @param value-of<ZendTypeReader::ALL_SUPPORTED_VERSIONS> $php_version
      * @throws MemoryReaderException

diff --git a/tests/Lib/PhpProcessReader/PhpMemoryReader/CallTraceReaderTest.php b/tests/Lib/PhpProcessReader/PhpMemoryReader/CallTraceReaderTest.php
@@ -54,64 +54,6 @@ protected function tearDown(): void
         }
     }
 
-    public function testReadCurrentFunctionName()
-    {
-        $memory_reader = new MemoryReader();
-        $executor_globals_reader = new CallTraceReader(
-            $memory_reader,
-            new ZendTypeReaderCreator(),
-            new OpcodeFactory()
-        );
-        $this->child = proc_open(
-            [
-                PHP_BINARY,
-                '-r',
-                'fputs(STDOUT, "a\n");fgets(STDIN);'
-            ],
-            [
-                ['pipe', 'r'],
-                ['pipe', 'w'],
-                ['pipe', 'w']
-            ],
-            $pipes
-        );
-
-        fgets($pipes[1]);
-        $child_status = proc_get_status($this->child);
-        $php_symbol_reader_creator = new PhpSymbolReaderCreator(
-            $memory_reader,
-            new ProcessModuleSymbolReaderCreator(
-                new Elf64SymbolResolverCreator(
-                    new CatFileReader(),
-                    new Elf64Parser(
-                        new LittleEndianReader()
-                    )
-                ),
-                $memory_reader,
-            ),
-            ProcessMemoryMapCreator::create(),
-            new LittleEndianReader()
-        );
-        $php_globals_finder = new PhpGlobalsFinder(
-            $php_symbol_reader_creator,
-            new LittleEndianReader(),
-            new MemoryReader()
-        );
-
-        /** @var int $child_status['pid'] */
-        $executor_globals_address = $php_globals_finder->findExecutorGlobals(
-            new ProcessSpecifier($child_status['pid']),
-            new TargetPhpSettings()
-        );
-        $name = $executor_globals_reader->readCurrentFunctionName(
-            $child_status['pid'],
-            ZendTypeReader::V74,
-            $executor_globals_address
-        );
-        $this->assertSame('fgets', $name);
-    }
-
-
     public function testReadCallTrace()
     {
         $memory_reader = new MemoryReader();