improved exceptions for cypher lists and objects

Author: transistive

src/Types/AbstractCypherObject.php

@@ -17,10 +17,9 @@
 use ArrayAccess;
 use ArrayIterator;
 use BadMethodCallException;
-use function get_class;
-use InvalidArgumentException;
 use IteratorAggregate;
 use JsonSerializable;
+use OutOfBoundsException;
 use function sprintf;
 
 /**
@@ -73,7 +72,7 @@ final public function offsetGet($offset)
     {
         $serialized = $this->toArray();
         if (!array_key_exists($offset, $serialized)) {
-            throw new InvalidArgumentException("Offset: $offset does not exists for class: ".static::class);
+            throw new OutOfBoundsException("Offset: \"$offset\" does not exists in object of instance: ".static::class);
         }
 
         return $serialized[$offset];
@@ -85,14 +84,14 @@ final public function offsetGet($offset)
      */
     final public function offsetSet($offset, $value): void
     {
-        throw new BadMethodCallException(sprintf('%s is immutable', get_class($this)));
+        throw new BadMethodCallException(sprintf('%s is immutable', static::class));
     }
 
     /**
      * @param TKey $offset
      */
     final public function offsetUnset($offset): void
     {
-        throw new BadMethodCallException(sprintf('%s is immutable', get_class($this)));
+        throw new BadMethodCallException(sprintf('%s is immutable', static::class));
     }
 }

src/Types/CypherList.php

@@ -16,7 +16,6 @@
 use function array_key_exists;
 use function array_key_last;
 use function array_slice;
-use BadMethodCallException;
 use function is_int;
 use OutOfBoundsException;
 use function sort;
@@ -72,7 +71,7 @@ public function last()
     {
         $key = array_key_last($this->sequence);
         if (!is_int($key)) {
-            throw new BadMethodCallException('Cannot grab last element from an empty list');
+            throw new OutOfBoundsException('Cannot grab last element of an empty list');
         }
 
         return $this->sequence[$key];
@@ -144,7 +143,7 @@ public static function fromIterable(iterable $iterable): AbstractCypherSequence
     public function get(int $key)
     {
         if (!array_key_exists($key, $this->sequence)) {
-            throw new OutOfBoundsException();
+            throw new OutOfBoundsException(sprintf('Cannot get item in sequence at position: %s', $key));
         }
 
         return $this->sequence[$key];