Large update for version 2.0

Author: Crinsane

.gitignore

@@ -1,5 +1,4 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Store
-.idea
+.DS_Store

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
 
 before_script:
   - composer self-update

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Rob Gloudemans <[email protected]>
+Copyright (c) 2016 Rob Gloudemans <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,43 +2,25 @@
 [![Build Status](https://travis-ci.org/Crinsane/LaravelShoppingcart.png?branch=master)](https://travis-ci.org/Crinsane/LaravelShoppingcart)
 [![Total Downloads](https://poser.pugx.org/gloudemans/shoppingcart/downloads.png)](https://packagist.org/packages/gloudemans/shoppingcart)
 
-A simple shoppingcart implementation for Laravel 4.
+A simple shoppingcart implementation for Laravel.
 
 ## Installation
 
-Install the package through [Composer](http://getcomposer.org/). Edit your project's `composer.json` file by adding:
+Install the package through [Composer](http://getcomposer.org/). 
 
-### Laravel 4.2 and below
+Run the Composer require command from the Terminal:
 
-```php
-"require": {
-	"laravel/framework": "4.2.*",
-	"gloudemans/shoppingcart": "~1.2"
-}
-```
-
-### Laravel 5
-
-```php
-"require": {
-	"laravel/framework": "5.0.*",
-	"gloudemans/shoppingcart": "~1.3"
-}
-```
-
-Next, run the Composer update command from the Terminal:
-
-    composer update
+    composer require gloudemans/shoppingcart
 
-Now all you have to do is add the service provider of the package and alias the package. To do this open your `app/config/app.php` file.
+Now all you have to do is add the service provider of the package and alias the package. To do this open your `config/app.php` file.
 
 Add a new line to the `service providers` array:
 
-	'Gloudemans\Shoppingcart\ShoppingcartServiceProvider'
+	\Gloudemans\Shoppingcart\ShoppingcartServiceProvider::class
 
-And finally add a new line to the `aliases` array:
+And optionally add a new line to the `aliases` array:
 
-	'Cart'            => 'Gloudemans\Shoppingcart\Facades\Cart',
+	'Cart'            => \Gloudemans\Shoppingcart\Facades\Cart::class,
 
 Now you're ready to start using the shoppingcart in your application.
 

composer.json

@@ -1,29 +1,31 @@
 {
     "name": "gloudemans/shoppingcart",
-    "description": "Laravel 5 Shoppingcart",
+    "description": "Laravel Shoppingcart",
     "keywords": ["laravel", "shoppingcart"],
     "license": "MIT",
     "authors": [
         {
             "name": "Rob Gloudemans",
-            "email": "[email protected]"
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "~5.0"
+        "illuminate/support": "5.2.*",
+        "illuminate/session": "^5.2.*",
+        "illuminate/events": "^5.2.*"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9",
-        "phpunit/phpunit": "~4.0"
-    },
-    "suggest": {
-        "gloudemans/notify": "Simple flash notifications for Laravel 5"
+        "phpunit/phpunit": "~4.0",
+        "mockery/mockery": "~0.9.0",
+        "orchestra/testbench": "~3.0"
     },
     "autoload": {
-        "psr-0": {
-            "Gloudemans\\Shoppingcart": "src/"
+        "psr-4": {
+            "Gloudemans\\Shoppingcart\\": "src/"
         }
     },
+    "suggest": {
+        "gloudemans/notify": "Simple flash notifications for Laravel"
+    },
     "minimum-stability": "dev"
 }

config/cart.php

@@ -0,0 +1,16 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default tax rate
+    |--------------------------------------------------------------------------
+    |
+    | This default tax rate will be used when you make a class implement the
+    | Taxable interface and use the HasTax trait.
+    |
+    */
+    'tax' => 21
+
+];

database/migrations/0000_00_00_000000_create_shoppingcart_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateShoppingcartTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::create('shoppingcart', function (Blueprint $table) {
+            $table->string('identifier');
+            $table->string('instance');
+            $table->longText('content');
+            $table->nullableTimestamps();
+
+            $table->primary(['identifier', 'instance']);
+        });
+    }
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::drop('shoppingcart');
+    }
+}

phpunit.xml

@@ -8,8 +8,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
->
+         syntaxCheck="false">
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix=".php">./tests/</directory>

src/CanBeBought.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Gloudemans\Shoppingcart;
+
+trait CanBeBought
+{
+
+    /**
+     * Get the identifier of the Buyable item.
+     *
+     * @return int|string
+     */
+    public function getBuyableIdentifier()
+    {
+        return method_exists($this, 'getKey') ? $this->getKey() : $this->id;
+    }
+
+    /**
+     * Get the description or title of the Buyable item.
+     *
+     * @return string
+     */
+    public function getBuyableDescription()
+    {
+        if(property_exists('name', $this)) return $this->name;
+        if(property_exists('title', $this)) return $this->title;
+        if(property_exists('description', $this)) return $this->description;
+
+        return null;
+    }
+
+    /**
+     * Get the price of the Buyable item.
+     *
+     * @return float
+     */
+    public function getBuyablePrice()
+    {
+        if(property_exists('price', $this)) return $this->price;
+
+        return null;
+    }
+}