[Filesystem][Finder][Form] Use CPP

OskarStark · xabbuh · commit df7781901d0c · 2024-01-16T22:21:05.000+01:00
diff --git a/Chunk/DataChunk.php b/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
diff --git a/Chunk/ErrorChunk.php b/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 {
diff --git a/Internal/AmpBody.php b/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);
diff --git a/Internal/AmpClientState.php b/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;
     }
 
     /**
diff --git a/Internal/AmpListener.php b/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
diff --git a/Internal/AmpResolver.php b/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
diff --git a/Internal/Canary.php b/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
diff --git a/Internal/HttplugWaitLoop.php b/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
diff --git a/Response/AmpResponse.php b/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'];
diff --git a/Response/CurlResponse.php b/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+');
diff --git a/Response/HttplugPromise.php b/Response/HttplugPromise.php
@@ -23,11 +23,9 @@
  */
 final class HttplugPromise implements HttplugPromiseInterface
 {
-    private GuzzlePromiseInterface $promise;
-
-    public function __construct(GuzzlePromiseInterface $promise)
-    {
-        $this->promise = $promise;
+    public function __construct(
+        private GuzzlePromiseInterface $promise,
+    ) {
     }
 
     public function then(callable $onFulfilled = null, callable $onRejected = null): self
diff --git a/Response/NativeResponse.php b/Response/NativeResponse.php
@@ -29,11 +29,6 @@ final class NativeResponse implements ResponseInterface, StreamableInterface
     use CommonResponseTrait;
     use TransportResponseTrait;
 
-    /**
-     * @var resource
-     */
-    private $context;
-    private string $url;
     private \Closure $resolver;
     private ?\Closure $onProgress;
     private ?int $remaining = null;
@@ -43,18 +38,23 @@ final class NativeResponse implements ResponseInterface, StreamableInterface
      */
     private $buffer;
 
-    private NativeClientState $multi;
     private float $pauseExpiry = 0.0;
 
     /**
      * @internal
+     * @param $context resource
      */
-    public function __construct(NativeClientState $multi, $context, string $url, array $options, array &$info, callable $resolver, ?callable $onProgress, ?LoggerInterface $logger)
-    {
-        $this->multi = $multi;
+    public function __construct(
+        private NativeClientState $multi,
+        private $context,
+        private string $url,
+        array $options,
+        array &$info,
+        callable $resolver,
+        ?callable $onProgress,
+        ?LoggerInterface $logger,
+    ) {
         $this->id = $id = (int) $context;
-        $this->context = $context;
-        $this->url = $url;
         $this->logger = $logger;
         $this->timeout = $options['timeout'];
         $this->info = &$info;
diff --git a/Response/ResponseStream.php b/Response/ResponseStream.php
@@ -20,11 +20,9 @@
  */
 final class ResponseStream implements ResponseStreamInterface
 {
-    private \Generator $generator;
-
-    public function __construct(\Generator $generator)
-    {
-        $this->generator = $generator;
+    public function __construct(
+        private \Generator $generator,
+    ) {
     }
 
     public function key(): ResponseInterface
diff --git a/Response/TraceableResponse.php b/Response/TraceableResponse.php
@@ -31,17 +31,12 @@
  */
 class TraceableResponse implements ResponseInterface, StreamableInterface
 {
-    private HttpClientInterface $client;
-    private ResponseInterface $response;
-    private mixed $content;
-    private ?StopwatchEvent $event;
-
-    public function __construct(HttpClientInterface $client, ResponseInterface $response, &$content, StopwatchEvent $event = null)
-    {
-        $this->client = $client;
-        $this->response = $response;
-        $this->content = &$content;
-        $this->event = $event;
+    public function __construct(
+        private HttpClientInterface $client,
+        private ResponseInterface $response,
+        private mixed &$content,
+        private ?StopwatchEvent $event = null,
+    ) {
     }
 
     public function __sleep(): array
diff --git a/Retry/GenericRetryStrategy.php b/Retry/GenericRetryStrategy.php
@@ -36,7 +36,6 @@ class GenericRetryStrategy implements RetryStrategyInterface
         510 => self::IDEMPOTENT_METHODS,
     ];
 
-    private array $statusCodes;
     private int $delayMs;
     private float $multiplier;
     private int $maxDelayMs;
@@ -49,10 +48,13 @@ class GenericRetryStrategy implements RetryStrategyInterface
      * @param int   $maxDelayMs  Maximum delay to allow (0 means no maximum)
      * @param float $jitter      Probability of randomness int delay (0 = none, 1 = 100% random)
      */
-    public function __construct(array $statusCodes = self::DEFAULT_RETRY_STATUS_CODES, int $delayMs = 1000, float $multiplier = 2.0, int $maxDelayMs = 0, float $jitter = 0.1)
-    {
-        $this->statusCodes = $statusCodes;
-
+    public function __construct(
+        private array $statusCodes = self::DEFAULT_RETRY_STATUS_CODES,
+        int $delayMs = 1000,
+        float $multiplier = 2.0,
+        int $maxDelayMs = 0,
+        float $jitter = 0.1,
+    ) {
         if ($delayMs < 0) {
             throw new InvalidArgumentException(sprintf('Delay must be greater than or equal to zero: "%s" given.', $delayMs));
         }

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,9 @@`
`25`	`25`	`*/`
`26`	`26`	`class AmpResolver implements Dns\Resolver`
`27`	`27`	`{`
`28`		`- private array $dnsMap;`
`29`		`-`
`30`		`- public function __construct(array &$dnsMap)`
`31`		`- {`
`32`		`- $this->dnsMap = &$dnsMap;`
	`28`	`+ public function __construct(`
	`29`	`+ private array &$dnsMap,`
	`30`	`+ ) {`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`public function resolve(string $name, int $typeRestriction = null): Promise`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`final class Canary`
`20`	`20`	`{`
`21`		`- private \Closure $canceller;`
`22`		`-`
`23`		`- public function __construct(\Closure $canceller)`
`24`		`- {`
`25`		`- $this->canceller = $canceller;`
	`21`	`+ public function __construct(`
	`22`	`+ private \Closure $canceller,`
	`23`	`+ ) {`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`public function cancel(): void`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,9 @@`
`23`	`23`	`*/`
`24`	`24`	`final class HttplugPromise implements HttplugPromiseInterface`
`25`	`25`	`{`
`26`		`- private GuzzlePromiseInterface $promise;`
`27`		`-`
`28`		`- public function __construct(GuzzlePromiseInterface $promise)`
`29`		`- {`
`30`		`- $this->promise = $promise;`
	`26`	`+ public function __construct(`
	`27`	`+ private GuzzlePromiseInterface $promise,`
	`28`	`+ ) {`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`public function then(callable $onFulfilled = null, callable $onRejected = null): self`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,9 @@`
`20`	`20`	`*/`
`21`	`21`	`final class ResponseStream implements ResponseStreamInterface`
`22`	`22`	`{`
`23`		`- private \Generator $generator;`
`24`		`-`
`25`		`- public function __construct(\Generator $generator)`
`26`		`- {`
`27`		`- $this->generator = $generator;`
	`23`	`+ public function __construct(`
	`24`	`+ private \Generator $generator,`
	`25`	`+ ) {`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`public function key(): ResponseInterface`