From c21db4db96000dc7a6672790b16dde8bfa3d36a6 Mon Sep 17 00:00:00 2001 From: Aaron Piotrowski Date: Thu, 24 Feb 2022 13:17:20 -0600 Subject: [PATCH] Add readonly where appropriate --- src/ConcurrentArrayIterator.php | 8 ++++---- src/ConcurrentChainedIterator.php | 4 ++-- src/ConcurrentIterableIterator.php | 2 +- src/Internal/ConcurrentClosureIterator.php | 10 +++++----- src/Internal/ConcurrentFlatMapIterator.php | 2 +- src/Internal/ConcurrentQueueIterator.php | 2 +- src/Internal/FlatMapOperation.php | 6 +++--- src/Internal/QueueState.php | 4 ++-- src/Internal/SortOperation.php | 2 +- src/Pipeline.php | 2 +- src/Queue.php | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/ConcurrentArrayIterator.php b/src/ConcurrentArrayIterator.php index a86353a..1fcc0c4 100644 --- a/src/ConcurrentArrayIterator.php +++ b/src/ConcurrentArrayIterator.php @@ -8,17 +8,17 @@ final class ConcurrentArrayIterator implements ConcurrentIterator { private int $position = 0; - private int $size; + private readonly int $size; - private array $values; + private readonly array $values; - private FiberLocal $currentPosition; + private readonly FiberLocal $currentPosition; private ?DisposedException $disposed = null; public function __construct(array $values) { - $this->values = \PHP_VERSION_ID >= 80100 && \array_is_list($values) ? $values : \array_values($values); + $this->values = \array_is_list($values) ? $values : \array_values($values); $this->size = \count($values); $this->currentPosition = new FiberLocal(fn () => throw new \Error('Call continue() before calling get()')); } diff --git a/src/ConcurrentChainedIterator.php b/src/ConcurrentChainedIterator.php index 03070de..1509542 100644 --- a/src/ConcurrentChainedIterator.php +++ b/src/ConcurrentChainedIterator.php @@ -16,10 +16,10 @@ final class ConcurrentChainedIterator implements ConcurrentIterator { /** @var ConcurrentIterator[] */ - private array $iterators; + private readonly array $iterators; /** @var FiberLocal */ - private FiberLocal $position; + private readonly FiberLocal $position; /** * @param ConcurrentIterator[] $iterators diff --git a/src/ConcurrentIterableIterator.php b/src/ConcurrentIterableIterator.php index 735ebd0..7b9fafc 100644 --- a/src/ConcurrentIterableIterator.php +++ b/src/ConcurrentIterableIterator.php @@ -14,7 +14,7 @@ final class ConcurrentIterableIterator implements ConcurrentIterator { /** @var ConcurrentIterator */ - private ConcurrentIterator $iterator; + private readonly ConcurrentIterator $iterator; /** * @param iterable $iterable diff --git a/src/Internal/ConcurrentClosureIterator.php b/src/Internal/ConcurrentClosureIterator.php index 65a4a28..78d17c0 100644 --- a/src/Internal/ConcurrentClosureIterator.php +++ b/src/Internal/ConcurrentClosureIterator.php @@ -15,15 +15,15 @@ */ final class ConcurrentClosureIterator implements ConcurrentIterator { - private \Closure $supplier; + private readonly \Closure $supplier; - private \SplQueue $sources; + private readonly \SplQueue $sources; - private QueueState $queue; + private readonly QueueState $queue; - private Sequence $sequence; + private readonly Sequence $sequence; - private DeferredCancellation $deferredCancellation; + private readonly DeferredCancellation $deferredCancellation; private int $cancellations = 0; diff --git a/src/Internal/ConcurrentFlatMapIterator.php b/src/Internal/ConcurrentFlatMapIterator.php index b552728..1fc4dd7 100644 --- a/src/Internal/ConcurrentFlatMapIterator.php +++ b/src/Internal/ConcurrentFlatMapIterator.php @@ -16,7 +16,7 @@ final class ConcurrentFlatMapIterator implements ConcurrentIterator { /** @var ConcurrentIterator */ - private ConcurrentIterator $iterator; + private readonly ConcurrentIterator $iterator; /** * @template R diff --git a/src/Internal/ConcurrentQueueIterator.php b/src/Internal/ConcurrentQueueIterator.php index 590f7b1..d772bd4 100644 --- a/src/Internal/ConcurrentQueueIterator.php +++ b/src/Internal/ConcurrentQueueIterator.php @@ -8,7 +8,7 @@ /** @internal */ final class ConcurrentQueueIterator implements ConcurrentIterator { - private QueueState $state; + private readonly QueueState $state; public function __construct(QueueState $state) { diff --git a/src/Internal/FlatMapOperation.php b/src/Internal/FlatMapOperation.php index 1cd3407..b7804a2 100644 --- a/src/Internal/FlatMapOperation.php +++ b/src/Internal/FlatMapOperation.php @@ -20,12 +20,12 @@ public static function getStopMarker(): object return $marker ??= new \stdClass; } - private int $concurrency; + private readonly int $concurrency; - private bool $ordered; + private readonly bool $ordered; /** @var \Closure(T, int):iterable */ - private \Closure $flatMap; + private readonly \Closure $flatMap; /** * @param \Closure(T, int):iterable $flatMap diff --git a/src/Internal/QueueState.php b/src/Internal/QueueState.php index 0649fc5..2c99549 100644 --- a/src/Internal/QueueState.php +++ b/src/Internal/QueueState.php @@ -50,10 +50,10 @@ final class QueueState implements \IteratorAggregate private int $positionOffset = 0; /** @var FiberLocal */ - private FiberLocal $currentPosition; + private readonly FiberLocal $currentPosition; /** @var FiberLocal */ - private FiberLocal $currentValue; + private readonly FiberLocal $currentValue; public function __construct(int $bufferSize = 0) { diff --git a/src/Internal/SortOperation.php b/src/Internal/SortOperation.php index 9a7832e..35441bd 100644 --- a/src/Internal/SortOperation.php +++ b/src/Internal/SortOperation.php @@ -8,7 +8,7 @@ /** @internal */ final class SortOperation implements IntermediateOperation { - private \Closure $compare; + private readonly \Closure $compare; public function __construct(\Closure $compare) { diff --git a/src/Pipeline.php b/src/Pipeline.php index 017b21a..b1c32d2 100644 --- a/src/Pipeline.php +++ b/src/Pipeline.php @@ -93,7 +93,7 @@ public static function concat(array $pipelines): self )); } - private ConcurrentIterator $source; + private readonly ConcurrentIterator $source; private int $concurrency = 1; diff --git a/src/Queue.php b/src/Queue.php index 6063be1..e6b1743 100644 --- a/src/Queue.php +++ b/src/Queue.php @@ -17,7 +17,7 @@ final class Queue { /** @var Internal\QueueState Has public emit, complete, and fail methods. */ - private Internal\QueueState $state; + private readonly Internal\QueueState $state; /** * @param int $bufferSize Allowed number of items to internally buffer before awaiting backpressure from the