[Filesystem][Finder][Form] Use CPP

Author: OskarStark

Chunk/DataChunk.php

@@ -20,13 +20,10 @@
  */
 class DataChunk implements ChunkInterface
 {
-    private int $offset = 0;
-    private string $content = '';
-
-    public function __construct(int $offset = 0, string $content = '')
-    {
-        $this->offset = $offset;
-        $this->content = $content;
+    public function __construct(
+        private int $offset = 0,
+        private string $content = '',
+    ) {
     }
 
     public function isTimeout(): bool

Chunk/ErrorChunk.php

@@ -23,14 +23,13 @@
 class ErrorChunk implements ChunkInterface
 {
     private bool $didThrow = false;
-    private int $offset;
     private string $errorMessage;
     private ?\Throwable $error = null;
 
-    public function __construct(int $offset, \Throwable|string $error)
-    {
-        $this->offset = $offset;
-
+    public function __construct(
+        private int $offset,
+        \Throwable|string $error,
+    ) {
         if (\is_string($error)) {
             $this->errorMessage = $error;
         } else {

Internal/AmpBody.php

@@ -27,18 +27,19 @@ class AmpBody implements RequestBody, InputStream
 {
     private ResourceInputStream|\Closure|string $body;
     private array $info;
-    private \Closure $onProgress;
     private ?int $offset = 0;
     private int $length = -1;
     private ?int $uploaded = null;
 
     /**
      * @param \Closure|resource|string $body
      */
-    public function __construct($body, &$info, \Closure $onProgress)
-    {
+    public function __construct(
+        $body,
+        &$info,
+        private \Closure $onProgress,
+    ) {
         $this->info = &$info;
-        $this->onProgress = $onProgress;
 
         if (\is_resource($body)) {
             $this->offset = ftell($body);

Internal/AmpClientState.php

@@ -47,18 +47,15 @@ final class AmpClientState extends ClientState
 
     private array $clients = [];
     private \Closure $clientConfigurator;
-    private int $maxHostConnections;
-    private int $maxPendingPushes;
-    private ?LoggerInterface $logger;
 
-    public function __construct(?callable $clientConfigurator, int $maxHostConnections, int $maxPendingPushes, ?LoggerInterface &$logger)
-    {
+    public function __construct(
+        ?callable $clientConfigurator,
+        private int $maxHostConnections,
+        private int $maxPendingPushes,
+        private ?LoggerInterface &$logger,
+    ) {
         $clientConfigurator ??= static fn (PooledHttpClient $client) => new InterceptedHttpClient($client, new RetryRequests(2));
         $this->clientConfigurator = $clientConfigurator(...);
-
-        $this->maxHostConnections = $maxHostConnections;
-        $this->maxPendingPushes = $maxPendingPushes;
-        $this->logger = &$logger;
     }
 
     /**

Internal/AmpListener.php

@@ -26,13 +26,16 @@
 class AmpListener implements EventListener
 {
     private array $info;
-    private array $pinSha256;
-    private \Closure $onProgress;
-    /** @var resource|null */
-    private $handle;
 
-    public function __construct(array &$info, array $pinSha256, \Closure $onProgress, &$handle)
-    {
+    /**
+     * @param resource|null $handle
+     */
+    public function __construct(
+        array &$info,
+        private array $pinSha256,
+        private \Closure $onProgress,
+        private &$handle,
+    ) {
         $info += [
             'connect_time' => 0.0,
             'pretransfer_time' => 0.0,
@@ -44,9 +47,6 @@ public function __construct(array &$info, array $pinSha256, \Closure $onProgress
         ];
 
         $this->info = &$info;
-        $this->pinSha256 = $pinSha256;
-        $this->onProgress = $onProgress;
-        $this->handle = &$handle;
     }
 
     public function startRequest(Request $request): Promise

Internal/AmpResolver.php

@@ -25,11 +25,9 @@
  */
 class AmpResolver implements Dns\Resolver
 {
-    private array $dnsMap;
-
-    public function __construct(array &$dnsMap)
-    {
-        $this->dnsMap = &$dnsMap;
+    public function __construct(
+        private array &$dnsMap,
+    ) {
     }
 
     public function resolve(string $name, int $typeRestriction = null): Promise

Internal/Canary.php

@@ -18,11 +18,9 @@
  */
 final class Canary
 {
-    private \Closure $canceller;
-
-    public function __construct(\Closure $canceller)
-    {
-        $this->canceller = $canceller;
+    public function __construct(
+        private \Closure $canceller,
+    ) {
     }
 
     public function cancel(): void

Internal/HttplugWaitLoop.php

@@ -30,20 +30,15 @@
  */
 final class HttplugWaitLoop
 {
-    private HttpClientInterface $client;
-    private ?\SplObjectStorage $promisePool;
-    private ResponseFactoryInterface $responseFactory;
-    private StreamFactoryInterface $streamFactory;
-
     /**
      * @param \SplObjectStorage<ResponseInterface, array{Psr7RequestInterface, Promise}>|null $promisePool
      */
-    public function __construct(HttpClientInterface $client, ?\SplObjectStorage $promisePool, ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory)
-    {
-        $this->client = $client;
-        $this->promisePool = $promisePool;
-        $this->responseFactory = $responseFactory;
-        $this->streamFactory = $streamFactory;
+    public function __construct(
+        private HttpClientInterface $client,
+        private ?\SplObjectStorage $promisePool,
+        private ResponseFactoryInterface $responseFactory,
+        private StreamFactoryInterface $streamFactory,
+    ) {
     }
 
     public function wait(?ResponseInterface $pendingResponse, float $maxDuration = null, float $idleTimeout = null): int

Response/AmpResponse.php

@@ -45,7 +45,6 @@ final class AmpResponse implements ResponseInterface, StreamableInterface
 
     private static string $nextId = 'a';
 
-    private AmpClientState $multi;
     private ?array $options;
     private \Closure $onProgress;
 
@@ -54,9 +53,12 @@ final class AmpResponse implements ResponseInterface, StreamableInterface
     /**
      * @internal
      */
-    public function __construct(AmpClientState $multi, Request $request, array $options, ?LoggerInterface $logger)
-    {
-        $this->multi = $multi;
+    public function __construct(
+        private AmpClientState $multi,
+        Request $request,
+        array $options,
+        ?LoggerInterface $logger,
+    ) {
         $this->options = &$options;
         $this->logger = $logger;
         $this->timeout = $options['timeout'];

Response/CurlResponse.php

@@ -32,8 +32,6 @@ final class CurlResponse implements ResponseInterface, StreamableInterface
     }
     use TransportResponseTrait;
 
-    private CurlClientState $multi;
-
     /**
      * @var resource
      */
@@ -42,10 +40,16 @@ final class CurlResponse implements ResponseInterface, StreamableInterface
     /**
      * @internal
      */
-    public function __construct(CurlClientState $multi, \CurlHandle|string $ch, array $options = null, LoggerInterface $logger = null, string $method = 'GET', callable $resolveRedirect = null, int $curlVersion = null, string $originalUrl = null)
-    {
-        $this->multi = $multi;
-
+    public function __construct(
+        private CurlClientState $multi,
+        \CurlHandle|string $ch,
+        array $options = null,
+        LoggerInterface $logger = null,
+        string $method = 'GET',
+        callable $resolveRedirect = null,
+        int $curlVersion = null,
+        string $originalUrl = null,
+    ) {
         if ($ch instanceof \CurlHandle) {
             $this->handle = $ch;
             $this->debugBuffer = fopen('php://temp', 'w+');