Merge branch 'master' into master

Author: darryldecode

.phpunit.result.cache

@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":4952:{a:2:{s:7:"defects";a:7:{s:71:"CartConditionTest::test_add_cart_condition_without_condition_attributes";i:6;s:68:"CartConditionTest::test_add_cart_condition_with_condition_attributes";i:6;s:65:"CartTest::test_item_price_should_be_normalized_when_added_to_cart";i:6;s:79:"CartTest::test_should_throw_exception_when_provided_invalid_values_scenario_one";i:6;s:79:"CartTest::test_should_throw_exception_when_provided_invalid_values_scenario_two";i:6;s:81:"CartTest::test_should_throw_exception_when_provided_invalid_values_scenario_three";i:4;s:38:"CartTest::test_cart_get_total_quantity";i:6;}s:5:"times";a:61:{s:32:"CartConditionTest::test_subtotal";d:0.025;s:47:"CartConditionTest::test_total_without_condition";d:0.001;s:44:"CartConditionTest::test_total_with_condition";d:0.001;s:73:"CartConditionTest::test_total_with_multiple_conditions_added_scenario_one";d:0.001;s:73:"CartConditionTest::test_total_with_multiple_conditions_added_scenario_two";d:0.001;s:75:"CartConditionTest::test_total_with_multiple_conditions_added_scenario_three";d:0.001;s:75:"CartConditionTest::test_cart_multiple_conditions_can_be_added_once_by_array";d:0.001;s:74:"CartConditionTest::test_total_with_multiple_conditions_added_scenario_four";d:0.001;s:47:"CartConditionTest::test_add_item_with_condition";d:0;s:93:"CartConditionTest::test_add_item_with_multiple_item_conditions_in_multiple_condition_instance";d:0;s:82:"CartConditionTest::test_add_item_with_multiple_item_conditions_with_target_omitted";d:0;s:42:"CartConditionTest::test_add_item_condition";d:0.001;s:66:"CartConditionTest::test_add_item_condition_restrict_negative_price";d:0;s:60:"CartConditionTest::test_get_cart_condition_by_condition_name";d:0;s:63:"CartConditionTest::test_remove_cart_condition_by_condition_name";d:0;s:63:"CartConditionTest::test_remove_item_condition_by_condition_name";d:0;s:76:"CartConditionTest::test_remove_item_condition_by_condition_name_scenario_two";d:0.001;s:45:"CartConditionTest::test_clear_item_conditions";d:0;s:45:"CartConditionTest::test_clear_cart_conditions";d:0;s:59:"CartConditionTest::test_get_calculated_value_of_a_condition";d:0;s:46:"CartConditionTest::test_get_conditions_by_type";d:0;s:49:"CartConditionTest::test_remove_conditions_by_type";d:0;s:71:"CartConditionTest::test_add_cart_condition_without_condition_attributes";d:0.001;s:68:"CartConditionTest::test_add_cart_condition_with_condition_attributes";d:0.001;s:48:"CartConditionTest::test_get_order_from_condition";d:0;s:42:"CartConditionTest::test_condition_ordering";d:0.001;s:32:"CartTest::test_cart_can_add_item";d:0.001;s:42:"CartTest::test_cart_can_add_items_as_array";d:0;s:61:"CartTest::test_cart_can_add_items_with_multidimensional_array";d:0.001;s:51:"CartTest::test_cart_can_add_item_without_attributes";d:0;s:109:"CartTest::test_cart_update_with_attribute_then_attributes_should_be_still_instance_of_ItemAttributeCollection";d:0.001;s:36:"CartTest::test_cart_items_attributes";d:0;s:40:"CartTest::test_cart_update_existing_item";d:0;s:80:"CartTest::test_cart_update_existing_item_with_quantity_as_array_and_not_relative";d:0;s:65:"CartTest::test_item_price_should_be_normalized_when_added_to_cart";d:0;s:52:"CartTest::test_it_removes_an_item_on_cart_by_item_id";d:0.001;s:29:"CartTest::test_cart_sub_total";d:0.001;s:54:"CartTest::test_sub_total_when_item_quantity_is_updated";d:0.001;s:65:"CartTest::test_sub_total_when_item_quantity_is_updated_by_reduced";d:0;s:96:"CartTest::test_item_quantity_update_by_reduced_should_not_reduce_if_quantity_will_result_to_zero";d:0;s:79:"CartTest::test_should_throw_exception_when_provided_invalid_values_scenario_one";d:0.001;s:79:"CartTest::test_should_throw_exception_when_provided_invalid_values_scenario_two";d:0;s:81:"CartTest::test_should_throw_exception_when_provided_invalid_values_scenario_three";d:0;s:28:"CartTest::test_clearing_cart";d:0;s:38:"CartTest::test_cart_get_total_quantity";d:0;s:39:"CartTestEvents::test_event_cart_created";d:0.001;s:38:"CartTestEvents::test_event_cart_adding";d:0.002;s:53:"CartTestEvents::test_event_cart_adding_multiple_times";d:0.001;s:66:"CartTestEvents::test_event_cart_adding_multiple_times_scenario_two";d:0.001;s:43:"CartTestEvents::test_event_cart_remove_item";d:0.001;s:37:"CartTestEvents::test_event_cart_clear";d:0.001;s:55:"CartTestMultipleInstances::test_cart_multiple_instances";d:0.001;s:40:"CartTestOtherFormat::test_cart_sub_total";d:0.001;s:65:"CartTestOtherFormat::test_sub_total_when_item_quantity_is_updated";d:0;s:76:"CartTestOtherFormat::test_sub_total_when_item_quantity_is_updated_by_reduced";d:0;s:48:"ItemTest::test_item_get_sum_price_using_property";d:0;s:51:"ItemTest::test_item_get_sum_price_using_array_style";d:0;s:40:"ItemTest::test_item_get_conditions_empty";d:0;s:50:"ItemTest::test_item_get_conditions_with_conditions";d:0;s:59:"ItemTestOtherFormat::test_item_get_sum_price_using_property";d:0;s:62:"ItemTestOtherFormat::test_item_get_sum_price_using_array_style";d:0;}}}

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - travis_retry composer self-update

README.md

@@ -1,5 +1,4 @@
-# Laravel 5 Shopping Cart
-
+# Laravel 5 & 6 Shopping Cart
 [![Build Status](https://travis-ci.org/darryldecode/laravelshoppingcart.svg?branch=master)](https://travis-ci.org/darryldecode/laravelshoppingcart)
 [![Total Downloads](https://poser.pugx.org/darryldecode/cart/d/total.svg)](https://packagist.org/packages/darryldecode/cart)
 [![License](https://poser.pugx.org/darryldecode/cart/license.svg)](https://packagist.org/packages/darryldecode/cart)
@@ -20,7 +19,9 @@ For Laravel 5.1~:
 `composer require "darryldecode/cart:~2.0"`
 
 For Laravel 5.5, 5.6 or 5.7~:
-`composer require "darryldecode/cart:~4.0"`
+
+```composer require "darryldecode/cart:~4.0"``` or 
+```composer require "darryldecode/cart"```
 
 ## CONFIGURATION
 
@@ -1057,6 +1058,56 @@ class DBStorage {
 }
 ```
 
+For example you can also leverage Laravel's Caching (redis, memcached, file, dynamo, etc) using the example below. Exmaple also includes cookie persistance, so that cart would be still available for 30 days. Sessions by default persists only 20 minutes. 
+
+```
+<?php
+
+namespace App\Cart;
+
+use Carbon\Carbon;
+use Cookie;
+use Darryldecode\Cart\CartCollection;
+
+class CacheStorage
+{
+    private $data = [];
+    private $cart_id;
+
+    public function __construct()
+    {
+        $this->cart_id = \Cookie::get('cart');
+        if ($this->cart_id) {
+            $this->data = \Cache::get('cart_' . $this->cart_id, []);
+        } else {
+            $this->cart_id = uniqid();
+        }
+    }
+
+    public function has($key)
+    {
+        return isset($this->data[$key]);
+    }
+
+    public function get($key)
+    {
+        return new CartCollection($this->data[$key] ?? []);
+    }
+
+    public function put($key, $value)
+    {
+        $this->data[$key] = $value;
+        \Cache::put('cart_' . $this->cart_id, $this->data, Carbon::now()->addDays(30));
+
+        if (!Cookie::hasQueued('cart')) {
+            Cookie::queue(
+                Cookie::make('cart', $this->cart_id, 60 * 24 * 30)
+            );
+        }
+    }
+}
+```
+
 To make this the cart's default storage, let's update the cart's configuration file.
 First, let us publish first the cart config file for us to enable to override it.
 `php artisan vendor:publish --provider="Darryldecode\Cart\CartServiceProvider" --tag="config"`

composer.json

@@ -10,14 +10,14 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/validation": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/translation": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*"
+        "php": ">=7.1",
+        "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
+        "illuminate/validation": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
+        "illuminate/translation": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^5.0",
+        "phpunit/phpunit": "^8.0.0",
         "symfony/var-dumper": "2.7.*@dev"
     },
     "autoload": {

src/Darryldecode/Cart/ItemCollection.php

@@ -25,7 +25,7 @@ class ItemCollection extends Collection
      * @param array|mixed $items
      * @param $config
      */
-    public function __construct($items, $config)
+    public function __construct($items, $config = [])
     {
         parent::__construct($items);
 

tests/CartConditionsTest.php

@@ -19,7 +19,7 @@ class CartConditionTest extends PHPUnit\Framework\TestCase  {
      */
     protected $cart;
 
-    public function setUp()
+    public function setUp(): void
     {
         $events = m::mock('Illuminate\Contracts\Events\Dispatcher');
         $events->shouldReceive('dispatch');
@@ -33,7 +33,7 @@ public function setUp()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }
@@ -770,7 +770,7 @@ public function test_add_cart_condition_without_condition_attributes()
         // when get attribute is called and there is no attributes added,
         // it should return an empty array
         $conditionAttribute = $contition->getAttributes();
-        $this->assertInternalType('array', $conditionAttribute);
+        $this->assertIsArray($conditionAttribute);
     }
 
     public function test_add_cart_condition_with_condition_attributes()
@@ -806,7 +806,7 @@ public function test_add_cart_condition_with_condition_attributes()
         // when get attribute is called and there is no attributes added,
         // it should return an empty array
         $conditionAttributes = $contition->getAttributes();
-        $this->assertInternalType('array', $conditionAttributes);
+        $this->assertIsArray($conditionAttributes);
         $this->assertArrayHasKey('description',$conditionAttributes);
         $this->assertArrayHasKey('sale_start_date',$conditionAttributes);
         $this->assertArrayHasKey('sale_end_date',$conditionAttributes);

tests/CartTest.php

@@ -20,7 +20,7 @@ class CartTest extends PHPUnit\Framework\TestCase
      */
     protected $cart;
 
-    public function setUp()
+    public function setUp(): void
     {
         $events = m::mock('Illuminate\Contracts\Events\Dispatcher');
         $events->shouldReceive('dispatch');
@@ -34,7 +34,7 @@ public function setUp()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }
@@ -244,7 +244,7 @@ public function test_item_price_should_be_normalized_when_added_to_cart()
         // add a price in a string format should be converted to float
         $this->cart->add(455, 'Sample Item', '100.99', 2, array());
 
-        $this->assertInternalType('float', $this->cart->getContent()->first()['price'], 'Cart price should be a float');
+        $this->assertIsFloat($this->cart->getContent()->first()['price'], 'Cart price should be a float');
     }
 
     public function test_it_removes_an_item_on_cart_by_item_id()
@@ -415,27 +415,21 @@ public function test_item_quantity_update_by_reduced_should_not_reduce_if_quanti
         $this->assertEquals(3, $item['quantity'], 'Item quantity of with item ID of 456 should now be reduced to 2');
     }
 
-    /**
-     * @expectedException Darryldecode\Cart\Exceptions\InvalidItemException
-     */
     public function test_should_throw_exception_when_provided_invalid_values_scenario_one()
     {
+        $this->expectException('Darryldecode\Cart\Exceptions\InvalidItemException');
         $this->cart->add(455, 'Sample Item', 100.99, 0, array());
     }
 
-    /**
-     * @expectedException Darryldecode\Cart\Exceptions\InvalidItemException
-     */
     public function test_should_throw_exception_when_provided_invalid_values_scenario_two()
     {
+        $this->expectException('Darryldecode\Cart\Exceptions\InvalidItemException');
         $this->cart->add('', 'Sample Item', 100.99, 2, array());
     }
 
-    /**
-     * @expectedException Darryldecode\Cart\Exceptions\InvalidItemException
-     */
     public function test_should_throw_exception_when_provided_invalid_values_scenario_three()
     {
+        $this->expectException('Darryldecode\Cart\Exceptions\InvalidItemException');
         $this->cart->add(523, '', 100.99, 2, array());
     }
 
@@ -556,5 +550,7 @@ public function test_cart_can_add_items_with_multidimensional_array_with_associa
 
         $this->assertFalse($this->cart->isEmpty(), 'Cart should not be empty');
         $this->assertCount(3, $this->cart->getContent()->toArray(), 'Cart should have 3 items');
+        $this->assertIsInt($this->cart->getTotalQuantity(), 'Return type should be INT');
+        $this->assertEquals(4, $this->cart->getTotalQuantity(),'Cart\'s quantity should be 4.');
     }
 }

tests/CartTestEvents.php

@@ -15,11 +15,11 @@ class CartTestEvents extends PHPUnit\Framework\TestCase {
 
     const CART_INSTANCE_NAME = 'shopping';
 
-    public function setUp()
+    public function setUp(): void
     {
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }

tests/CartTestMultipleInstances.php

@@ -23,7 +23,7 @@ class CartTestMultipleInstances extends PHPUnit\Framework\TestCase {
      */
     protected $cart2;
 
-    public function setUp()
+    public function setUp(): void
     {
         $events = m::mock('Illuminate\Contracts\Events\Dispatcher');
         $events->shouldReceive('dispatch');
@@ -45,7 +45,7 @@ public function setUp()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }

tests/CartTestOtherFormat.php

@@ -18,7 +18,7 @@ class CartTestOtherFormat extends PHPUnit\Framework\TestCase  {
      */
     protected $cart;
 
-    public function setUp()
+    public function setUp(): void
     {
         $events = m::mock('Illuminate\Contracts\Events\Dispatcher');
         $events->shouldReceive('dispatch');
@@ -32,7 +32,7 @@ public function setUp()
     );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }

tests/ItemTest.php

@@ -21,7 +21,7 @@ class ItemTest extends PHPUnit\Framework\TestCase
      */
     protected $cart;
 
-    public function setUp()
+    public function setUp(): void
     {
         $events = m::mock('Illuminate\Contracts\Events\Dispatcher');
         $events->shouldReceive('dispatch');
@@ -35,7 +35,7 @@ public function setUp()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }

tests/ItemTestOtherFormat.php

@@ -19,7 +19,7 @@ class ItemTestOtherFormat extends PHPUnit\Framework\TestCase
      */
     protected $cart;
 
-    public function setUp()
+    public function setUp(): void
     {
         $events = m::mock('Illuminate\Contracts\Events\Dispatcher');
         $events->shouldReceive('dispatch');
@@ -33,7 +33,7 @@ public function setUp()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }