Drop $workerLimit param

Author: trowski

src/Driver/ParallelFilesystemDriver.php

@@ -7,57 +7,31 @@
 use Amp\File\Internal;
 use Amp\Future;
 use Amp\Parallel\Worker\ContextWorkerPool;
-use Amp\Parallel\Worker\DelegatingWorkerPool;
 use Amp\Parallel\Worker\LimitedWorkerPool;
 use Amp\Parallel\Worker\TaskFailureThrowable;
 use Amp\Parallel\Worker\Worker;
 use Amp\Parallel\Worker\WorkerException;
-use Amp\Parallel\Worker\WorkerPool;
 use function Amp\async;
 
 final class ParallelFilesystemDriver implements FilesystemDriver
 {
     public const DEFAULT_WORKER_LIMIT = 8;
 
-    private readonly WorkerPool $pool;
-
-    /** @var positive-int Maximum number of workers to use for open files. */
-    private readonly int $workerLimit;
-
     /** @var \WeakMap<Worker, int> */
     private \WeakMap $workerStorage;
 
     /** @var Future<Worker>|null Pending worker request */
     private ?Future $pendingWorker = null;
 
     /**
-     * @param WorkerPool|null $pool Custom worker pool to use for file workers. If null, a new pool is created.
-     * @param int|null $workerLimit [Deprecated] Maximum number of workers to use from the pool for open files. Instead
-     *      of using this parameter, provide a pool with a limited number using an instance of {@see LimitedWorkerPool}
-     *      such as {@see ContextWorkerPool}.
+     * @param LimitedWorkerPool $pool Custom worker pool to use for file workers. If one is not provided, a new
+     *      pool is created.
      */
-    public function __construct(?WorkerPool $pool = null, ?int $workerLimit = null)
-    {
+    public function __construct(
+        private readonly LimitedWorkerPool $pool = new ContextWorkerPool(self::DEFAULT_WORKER_LIMIT),
+    ) {
         /** @var \WeakMap<Worker, int> For Psalm. */
         $this->workerStorage = new \WeakMap();
-
-        if ($workerLimit !== null) {
-            \trigger_error(
-                'The $workerLimit parameter is deprecated and will be removed in the next major version.' .
-                ' To limit the number of workers used from the given pool, use an instance of ' .
-                LimitedWorkerPool::class . ' instead, such as ' . ContextWorkerPool::class . ' or ' .
-                DelegatingWorkerPool::class,
-                \E_USER_DEPRECATED,
-            );
-        }
-
-        $workerLimit ??= $pool instanceof LimitedWorkerPool ? $pool->getWorkerLimit() : self::DEFAULT_WORKER_LIMIT;
-        if ($workerLimit <= 0) {
-            throw new \ValueError("Worker limit must be a positive integer");
-        }
-
-        $this->pool = $pool ?? new ContextWorkerPool($workerLimit);
-        $this->workerLimit = $workerLimit;
     }
 
     public function openFile(string $path, string $mode): ParallelFile
@@ -90,7 +64,7 @@ private function selectWorker(): Worker
     {
         $this->pendingWorker?->await(); // Wait for any currently pending request for a worker.
 
-        if ($this->workerStorage->count() < $this->workerLimit) {
+        if ($this->workerStorage->count() < $this->pool->getWorkerLimit()) {
             $this->pendingWorker = async($this->pool->getWorker(...));
             $worker = $this->pendingWorker->await();