More tests for errors.

Author: Smoren

src/Views/ArrayView.php

@@ -254,7 +254,8 @@ public function offsetGet($offset)
  return $this->subview($offset)->toArray();
  }
 
- throw new KeyError("Invalid key: \"{$offset}\".");
+ $strOffset = is_scalar($offset) ? strval($offset) : gettype($offset);
+ throw new KeyError("Invalid key: \"{$strOffset}\".");
  }
 
  /**
@@ -289,7 +290,8 @@ public function offsetSet($offset, $value): void
  return;
  }
 
- throw new KeyError("Invalid key: \"{$offset}\".");
+ $strOffset = is_scalar($offset) ? strval($offset) : gettype($offset);
+ throw new KeyError("Invalid key: \"{$strOffset}\".");
  }
 
  /**
@@ -332,6 +334,10 @@ protected function convertIndex(int $i): int
  */
  private function numericOffsetExists($offset): bool
  {
+ if (is_nan($offset) || is_infinite($offset)) {
+ return false;
+ }
+
  try {
  $index = $this->convertIndex(intval($offset));
  } catch (IndexError $e) {

tests/unit/ArrayView/ErrorsTest.php

@@ -3,6 +3,7 @@
 namespace Smoren\ArrayView\Tests\Unit\ArrayView;
 
 use Smoren\ArrayView\Exceptions\IndexError;
+use Smoren\ArrayView\Exceptions\KeyError;
 use Smoren\ArrayView\Exceptions\ValueError;
 use Smoren\ArrayView\Views\ArrayView;
 
@@ -17,7 +18,8 @@ public function testReadIndexError(array $source, array $indexes)
  foreach ($indexes as $index) {
  try {
  $_ = $view[$index];
- $this->fail();
+ $strIndex = strval($index);
+ $this->fail("IndexError not thrown for key: \"{$strIndex}\"");
  } catch (IndexError $e) {
  $this->assertSame("Index {$index} is out of range.", $e->getMessage());
  }
@@ -33,13 +35,48 @@ public function testWriteIndexError(array $source, array $indexes)
  foreach ($indexes as $index) {
  try {
  $view[$index] = 1;
- $this->fail();
+ $strIndex = strval($index);
+ $this->fail("IndexError not thrown for key: \"{$strIndex}\"");
  } catch (IndexError $e) {
  $this->assertSame("Index {$index} is out of range.", $e->getMessage());
  }
  }
  }
 
+ /**
+ * @dataProvider dataProviderForBadKeys
+ */
+ public function testReadKeyError(array $source, array $keys)
+ {
+ $view = ArrayView::toView($source);
+ foreach ($keys as $key) {
+ $strKey = is_scalar($key) ? strval($key) : gettype($key);
+ try {
+ $_ = $view[$key];
+ $this->fail("KeyError not thrown for key: \"{$strKey}\"");
+ } catch (KeyError $e) {
+ $this->assertSame("Invalid key: \"{$strKey}\".", $e->getMessage());
+ }
+ }
+ }
+
+ /**
+ * @dataProvider dataProviderForBadKeys
+ */
+ public function testWriteKeyError(array $source, array $keys)
+ {
+ $view = ArrayView::toView($source);
+ foreach ($keys as $key) {
+ $strKey = is_scalar($key) ? strval($key) : gettype($key);
+ try {
+ $view[$key] = 1;
+ $this->fail("KeyError not thrown for key: \"{$strKey}\"");
+ } catch (KeyError $e) {
+ $this->assertSame("Invalid key: \"{$strKey}\".", $e->getMessage());
+ }
+ }
+ }
+
  /**
  * @dataProvider dataProviderForNonSequentialError
  */
@@ -53,9 +90,25 @@ public function testNonSequentialError(callable $arrayGetter)
  public function dataProviderForOutOfRangeIndexes(): array
  {
  return [
- [[], [-2, -1, 0, 1]],
- [[1], [-3, -2, 1, 2]],
- [[1, 2, 3], [-100, -5, 4, 100]],
+ [[], [-2, -1, 0, 1, NAN, INF, -INF]],
+ [[1], [-3, -2, 1, 2, NAN, INF, -INF]],
+ [[1, 2, 3], [-100, -5, 4, 100, NAN, INF, -INF]],
+ ];
+ }
+
+ public function dataProviderForBadKeys(): array
+ {
+ return [
+ [[], ['a', 'b', 'c']],
+ [[], ['1a', 'test', '!']],
+ [[], [[], [1, 2, 3], ['a' => 'test']], new \stdClass([])],
+ [[], [null, true, false, [], [1, 2, 3], ['a' => 'test']], new \stdClass([])],
+ [[1], ['a', 'b', 'c']],
+ [[1], ['1a', 'test', '!']],
+ [[1], [null, true, false, [], [1, 2, 3], ['a' => 'test']], new \stdClass([])],
+ [[1, 2, 3], ['a', 'b', 'c']],
+ [[1, 2, 3], ['1a', 'test', '!']],
+ [[2], [null, true, false, [], [1, 2, 3], ['a' => 'test']], new \stdClass([])],
  ];
  }