New tests, bugs fixes.

Smoren · Mar 11, 2024 · 157f7f1 · 157f7f1
1 parent d1e15dd
commit 157f7f1
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 19 deletions.
diff --git a/src/Exceptions/LengthError.php → src/Exceptions/SizeError.php b/src/Exceptions/LengthError.php → src/Exceptions/SizeError.php
@@ -2,6 +2,6 @@
 
 namespace Smoren\ArrayView\Exceptions;
 
-class LengthError extends \RuntimeException
+class SizeError extends \RuntimeException
 {
 }
diff --git a/src/Interfaces/ArrayViewInterface.php b/src/Interfaces/ArrayViewInterface.php
@@ -77,4 +77,40 @@ public function set($newValues): self;
      * @return bool
      */
     public function isReadonly(): bool;
+
+    /**
+     * @return int
+     */
+    public function count(): int;
+
+    /**
+     * @param numeric|string|ArraySelectorInterface $offset
+     * @return bool
+     */
+    public function offsetExists($offset): bool;
+
+    /**
+     * @param numeric|string|ArraySelectorInterface $offset
+     * @return T|array<T>
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset);
+
+    /**
+     * @param numeric|string|ArraySelectorInterface $offset
+     * @param T|array<T>|ArrayViewInterface<T> $value
+     * @return void
+     */
+    public function offsetSet($offset, $value): void;
+
+    /**
+     * @param numeric|string|ArraySelectorInterface $offset
+     * @return void
+     */
+    public function offsetUnset($offset): void;
+
+    /**
+     * @return \Generator<int, T>
+     */
+    public function getIterator(): \Generator;
 }
diff --git a/src/Views/ArrayMaskView.php b/src/Views/ArrayMaskView.php
@@ -2,7 +2,7 @@
 
 namespace Smoren\ArrayView\Views;
 
-use Smoren\ArrayView\Exceptions\LengthError;
+use Smoren\ArrayView\Exceptions\SizeError;
 use Smoren\ArrayView\Interfaces\ArrayViewInterface;
 
 /**
@@ -25,7 +25,7 @@ public function __construct(&$source, array $mask, ?bool $readonly = null)
     {
         [$sourceSize, $maskSize] = [\count($source), \count($mask)];
         if ($sourceSize !== $maskSize) {
-            throw new LengthError("Mask length not equal to source length ({$maskSize} != {$maskSize}).");
+            throw new SizeError("Mask size not equal to source length ({$maskSize} != {$sourceSize}).");
         }
 
         $indexes = array_filter(

diff --git a/src/Views/ArrayView.php b/src/Views/ArrayView.php
@@ -6,7 +6,7 @@
 
 use Smoren\ArrayView\Exceptions\IndexError;
 use Smoren\ArrayView\Exceptions\KeyError;
-use Smoren\ArrayView\Exceptions\LengthError;
+use Smoren\ArrayView\Exceptions\SizeError;
 use Smoren\ArrayView\Exceptions\NotSupportedError;
 use Smoren\ArrayView\Exceptions\ReadonlyError;
 use Smoren\ArrayView\Exceptions\ValueError;
@@ -146,7 +146,7 @@ public function applyWith($data, callable $mapper): self
     {
         [$dataSize, $thisSize] = [\count($data), \count($this)];
         if ($dataSize !== $thisSize) {
-            throw new LengthError("Length of values array not equal to view length ({$dataSize} != {$thisSize}).");
+            throw new SizeError("Length of values array not equal to view length ({$dataSize} != {$thisSize}).");
         }
 
         $dataView = ArrayView::toView($data);
@@ -178,21 +178,20 @@ public function set($newValues): self
 
         [$dataSize, $thisSize] = [\count($newValues), \count($this)];
         if ($dataSize !== $thisSize) {
-            throw new LengthError("Length of values array not equal to view length ({$dataSize} != {$thisSize}).");
+            throw new SizeError("Length of values array not equal to view length ({$dataSize} != {$thisSize}).");
         }
 
         $newValuesView = ArrayView::toView($newValues);
 
         for ($i = 0; $i < \count($this); $i++) {
-            // @phpstan-ignore-next-line
             $this[$i] = $newValuesView[$i];
         }
 
         return $this;
     }
 
     /**
-     * @return \Generator<int, T>
+     * {@inheritDoc}
      */
     public function getIterator(): \Generator
     {
@@ -204,16 +203,15 @@ public function getIterator(): \Generator
     }
 
     /**
-     * @return bool
+     * {@inheritDoc}
      */
     public function isReadonly(): bool
     {
         return $this->readonly;
     }
 
     /**
-     * @param numeric|string|ArraySelectorInterface $offset
-     * @return bool
+     * {@inheritDoc}
      */
     public function offsetExists($offset): bool
     {
@@ -233,8 +231,7 @@ public function offsetExists($offset): bool
     }
 
     /**
-     * @param numeric|string|ArraySelectorInterface $offset
-     * @return T|array<T>
+     * {@inheritDoc}
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
@@ -260,9 +257,7 @@ public function offsetGet($offset)
     }
 
     /**
-     * @param numeric|string|ArraySelectorInterface $offset
-     * @param T|array<T>|ArrayViewInterface<T> $value
-     * @return void
+     * {@inheritDoc}
      */
     public function offsetSet($offset, $value): void
     {
@@ -297,23 +292,26 @@ public function offsetSet($offset, $value): void
     }
 
     /**
-     * @param numeric|string|ArraySelectorInterface $offset
-     * @return void
      * @throws NotSupportedError
+     *
+     * {@inheritDoc}
      */
     public function offsetUnset($offset): void
     {
         throw new NotSupportedError();
     }
 
     /**
-     * @return int
+     * {@inheritDoc}
      */
     public function count(): int
     {
         return $this->getParentSize();
     }
 
+    /**
+     * @return int
+     */
     protected function getParentSize(): int
     {
         return ($this->parentView !== null)

diff --git a/tests/unit/ArrayView/ErrorsTest.php b/tests/unit/ArrayView/ErrorsTest.php
@@ -4,7 +4,9 @@
 
 use Smoren\ArrayView\Exceptions\IndexError;
 use Smoren\ArrayView\Exceptions\KeyError;
+use Smoren\ArrayView\Exceptions\SizeError;
 use Smoren\ArrayView\Exceptions\ValueError;
+use Smoren\ArrayView\Selectors\MaskSelector;
 use Smoren\ArrayView\Views\ArrayView;
 
 class ErrorsTest extends \Codeception\Test\Unit
@@ -77,6 +79,54 @@ public function testWriteKeyError(array $source, array $keys)
         }
     }
 
+    /**
+     * @dataProvider dataProviderForBadSizeMask
+     */
+    public function testReadByMaskSizeError(array $source, array $boolMask)
+    {
+        $view = ArrayView::toView($source);
+
+        $boolMaskSize = \count($boolMask);
+        $sourceSize = \count($source);
+
+        $this->expectException(SizeError::class);
+        $this->expectExceptionMessage("Mask size not equal to source length ({$boolMaskSize} != {$sourceSize}).");
+
+        $_ = $view[new MaskSelector($boolMask)];
+    }
+
+    /**
+     * @dataProvider dataProviderForBadSizeMask
+     */
+    public function testGetSubviewByMaskSizeError(array $source, array $boolMask)
+    {
+        $view = ArrayView::toView($source);
+
+        $boolMaskSize = \count($boolMask);
+        $sourceSize = \count($source);
+
+        $this->expectException(SizeError::class);
+        $this->expectExceptionMessage("Mask size not equal to source length ({$boolMaskSize} != {$sourceSize}).");
+
+        $view->subview(new MaskSelector($boolMask));
+    }
+
+    /**
+     * @dataProvider dataProviderForBadSizeMask
+     */
+    public function testWriteByMaskSizeError(array $source, array $boolMask)
+    {
+        $view = ArrayView::toView($source);
+
+        $boolMaskSize = \count($boolMask);
+        $sourceSize = \count($source);
+
+        $this->expectException(SizeError::class);
+        $this->expectExceptionMessage("Mask size not equal to source length ({$boolMaskSize} != {$sourceSize}).");
+
+        $view[new MaskSelector($boolMask)] = $boolMask;
+    }
+
     /**
      * @dataProvider dataProviderForNonSequentialError
      */
@@ -112,6 +162,21 @@ public function dataProviderForBadKeys(): array
         ];
     }
 
+    public function dataProviderForBadSizeMask(): array
+    {
+        return [
+            [[], [1]],
+            [[1], []],
+            [[1], [1, 0]],
+            [[1, 2, 3], [1]],
+            [[1, 2, 3], [0]],
+            [[1, 2, 3], [0, 1]],
+            [[1, 2, 3], [0, 1, 1, 0]],
+            [[1, 2, 3], [1, 1, 1, 1, 1]],
+            [[1, 2, 3], [0, 0, 0, 0, 0]],
+        ];
+    }
+
     public function dataProviderForNonSequentialError(): array
     {
         return [