Cleanup

buggregator · Apr 16, 2024 · df472bc · df472bc
1 parent 2321f16
commit df472bc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/src/Proto/Frame/Profiler/Payload.php b/src/Proto/Frame/Profiler/Payload.php
@@ -37,6 +37,19 @@ private function __construct(
         $this->metadata['type'] = $type->value;
     }
 
+    /**
+     * @param PayloadType $type
+     * @param Metadata $metadata
+     * @param \Closure(): Calls $callsProvider
+     */
+    public static function new(
+        PayloadType $type,
+        array $metadata,
+        \Closure $callsProvider,
+    ): self {
+        return new static($type, $metadata, $callsProvider);
+    }
+
     public static function fromArray(array $data, ?Type $type = null): static
     {
         $metadata = $data;
@@ -48,14 +61,6 @@ public static function fromArray(array $data, ?Type $type = null): static
         );
     }
 
-    public static function fromFile(FileInfo $fileInfo): static
-    {
-        // todo
-        // $metadata = $data;
-        // unset($metadata['edges'], $metadata['peaks']);
-        // return new static(PayloadType::from($data['type']), $metadata, fn(): array => $data);
-    }
-
     /**
      * @return Calls
      */

diff --git a/src/Service/FilesObserver/Filter/XHProf.php b/src/Service/FilesObserver/Filter/XHProf.php
@@ -21,22 +21,23 @@ public function validate(FileInfo $file): bool
     public function convert(FileInfo $file): \Traversable
     {
         try {
-            // todo read in a stream
-            $content = \file_get_contents($file->path);
-
-            $data = \unserialize($content, ['allowed_classes' => false]);
-
-            $payload = $this->dataToPayload($data);
-            $payload['date'] = $file->mtime;
-            $payload['hostname'] = \explode('.', $file->getName(), 2)[0];
-            $payload['filename'] = $file->getName();
+            $metadata = [
+                'date' => $file->mtime,
+                'hostname' => \explode('.', $file->getName(), 2)[0],
+                'filename' => $file->getName(),
+            ];
 
             yield new ProfilerFrame(
-                ProfilerFrame\Payload::fromArray($payload, ProfilerFrame\Type::XHProf),
+                ProfilerFrame\Payload::new(
+                    type: ProfilerFrame\Type::XHProf,
+                    metadata: $metadata,
+                    callsProvider: function () use ($file): array {
+                        $content = \file_get_contents($file->path);
+                        $data = \unserialize($content, ['allowed_classes' => false]);
+                        return $this->dataToPayload($data);
+                    },
+                ),
             );
-            // yield new ProfilerFrame(
-            //     ProfilerFrame\Payload::fromFile($file),
-            // );
         } catch (\Throwable $e) {
             // todo log
             var_dump($e->getMessage());