Update

jamesdb · Jan 7, 2016 · 53f3878 · 53f3878
1 parent e53f9da
commit 53f3878
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/Cart.php b/src/Cart.php
@@ -5,7 +5,6 @@
 use jamesdb\Cart\CartItem;
 use jamesdb\Cart\Event as CartEvent;
 use jamesdb\Cart\Exception as CartException;
-use jamesdb\Cart\Identifier\IdentifierInterface;
 use jamesdb\Cart\Storage\StorageInterface;
 use League\Event\Emitter;
 use SebastianBergmann\Money\Currency;
@@ -335,29 +334,27 @@ public function restore()
         if (! empty($data)) {
             $data = unserialize($data);
 
-            $start = 'Storage data';
-
             if (! is_array($data)) {
                 throw new CartException\CartRestoreException(
-                    sprintf('%s must be an array', $start)
+                    'Data must be an array'
                 );
             }
 
             if (! isset($data['id']) || (! isset($data['items']))) {
                 throw new CartException\CartRestoreException(
-                    sprintf('%s must have an id and items key', $start)
+                    'Storage data must have an id and items key'
                 );
             }
 
             if (! is_string($data['id'])) {
                 throw new CartException\CartRestoreException(
-                    sprintf('Invalid %s type, ensure id is a string', strtolower($start))
+                    'Invalid storage data type, ensure id is a string'
                 );
             }
 
             if (! is_array($data['items'])) {
                 throw new CartException\CartRestoreException(
-                    sprintf('Invalid %s type, ensure items is an array', strtolower($start))
+                    'Invalid storage data type, ensure items are an array'
                 );
             }
 

diff --git a/tests/CartTest.php b/tests/CartTest.php
@@ -480,7 +480,7 @@ public function testCartCanBeRestored()
      */
     public function testCartRestoreThrowsNotArrayException()
     {
-        $this->setExpectedException('jamesdb\Cart\Exception\CartRestoreException', 'Storage data must be an array');
+        $this->setExpectedException('jamesdb\Cart\Exception\CartRestoreException', 'Data must be an array');
 
         $storageMock = $this->getMock('jamesdb\Cart\Storage\StorageInterface');
 
@@ -564,7 +564,7 @@ public function testRestoreThrowsDataTypeExceptionWhenInvalidIdSupplied()
      */
     public function testRestoreThrowsDataTypeExceptionWhenInvalidItemsSupplied()
     {
-        $this->setExpectedException('jamesdb\Cart\Exception\CartRestoreException', 'Invalid storage data type, ensure items is an array');
+        $this->setExpectedException('jamesdb\Cart\Exception\CartRestoreException', 'Invalid storage data type, ensure items are an array');
 
         $storageMock = $this->getMock('jamesdb\Cart\Storage\StorageInterface');