Merge pull request #51 from happypixels/laravel-7

Laravel 7 support & StyleCI fixes
happypixels · Apr 11, 2020 · 3c390f1 · 3c390f1
2 parents 8cc3992 + 3a7a5f3
commit 3c390f1
Show file tree

Hide file tree

Showing 46 changed files with 90 additions and 90 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
  "league/omnipay": "^3",
  "omnipay/stripe": "3.1.x-dev#37df2a791e8feab45543125f4c5f22d5d305096d",
  "moneyphp/money": "^3.1",
- "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0"
+ "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0"
  },
  "require-dev": {
  "vlucas/phpdotenv": "^2.4",

diff --git a/src/Cart/Cart.php b/src/Cart/Cart.php
@@ -2,10 +2,10 @@
 
 namespace Happypixels\Shopr\Cart;
 
-use Illuminate\Support\Collection;
+use Happypixels\Shopr\Contracts\Shoppable;
 use Happypixels\Shopr\Models\Order;
 use Happypixels\Shopr\Money\Formatter;
-use Happypixels\Shopr\Contracts\Shoppable;
+use Illuminate\Support\Collection;
 
 abstract class Cart
 {
@@ -28,7 +28,7 @@ abstract public function persist($data);
  *
  * @return Collection
  */
- public function getAllItems() : Collection
+ public function getAllItems(): Collection
  {
  return collect($this->get());
  }
@@ -38,7 +38,7 @@ public function getAllItems() : Collection
  *
  * @return Collection
  */
- public function items() : Collection
+ public function items(): Collection
  {
  return $this->getAllItems()->filter(function ($item) {
  return $item->shoppable->isDiscount() === false;
@@ -50,7 +50,7 @@ public function items() : Collection
  *
  * @return Collection
  */
- public function discounts() : Collection
+ public function discounts(): Collection
  {
  return $this->getAllItems()->filter(function ($item) {
  return $item->shoppable->isDiscount() === true;
@@ -62,7 +62,7 @@ public function discounts() : Collection
  *
  * @return Collection
  */
- public function relativeDiscounts() : Collection
+ public function relativeDiscounts(): Collection
  {
  return $this->discounts()->filter(function ($discount) {
  return ! $discount->shoppable->is_fixed;
@@ -203,7 +203,7 @@ public function addDiscount(Shoppable $coupon)
  * @param string $code
  * @return bool
  */
- public function hasDiscount($code = null) : bool
+ public function hasDiscount($code = null): bool
  {
  foreach ($this->discounts() as $item) {
  if (! $code) {
@@ -290,7 +290,7 @@ public function convertToOrder($gateway, $data = [])
  * @param float|null $price
  * @return Happypixels\Shopr\Cart\CartItem
  */
- public function addItem($shoppableType, $shoppableId, $quantity = 1, $options = [], $subItems = [], $price = null) : CartItem
+ public function addItem($shoppableType, $shoppableId, $quantity = 1, $options = [], $subItems = [], $price = null): CartItem
  {
  $quantity = (is_numeric($quantity) && $quantity > 0) ? $quantity : 1;
 

diff --git a/src/Contracts/Shoppable.php b/src/Contracts/Shoppable.php
@@ -10,5 +10,5 @@ public function getTitle();
 
  public function getPrice();
 
- public function isDiscount() : bool;
+ public function isDiscount(): bool;
 }
diff --git a/src/Controllers/CartDiscountController.php b/src/Controllers/CartDiscountController.php
@@ -2,11 +2,11 @@
 
 namespace Happypixels\Shopr\Controllers;
 
-use Illuminate\Http\Request;
 use Happypixels\Shopr\Cart\Cart;
-use Illuminate\Routing\Controller;
 use Happypixels\Shopr\Models\DiscountCoupon;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
 
 class CartDiscountController extends Controller
 {

diff --git a/src/Controllers/CartItemController.php b/src/Controllers/CartItemController.php
@@ -2,11 +2,11 @@
 
 namespace Happypixels\Shopr\Controllers;
 
-use Illuminate\Http\Request;
 use Happypixels\Shopr\Cart\Cart;
-use Illuminate\Routing\Controller;
 use Happypixels\Shopr\Rules\Discounts\NotADiscount;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
 
 class CartItemController extends Controller
 {

diff --git a/src/Controllers/CheckoutController.php b/src/Controllers/CheckoutController.php
@@ -2,10 +2,10 @@
 
 namespace Happypixels\Shopr\Controllers;
 
-use Illuminate\Http\Request;
 use Happypixels\Shopr\Cart\Cart;
-use Illuminate\Routing\Controller;
 use Happypixels\Shopr\PaymentProviders\PaymentProviderManager;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
 
 class CheckoutController extends Controller
 {

diff --git a/src/Controllers/Web/OrderController.php b/src/Controllers/Web/OrderController.php
@@ -2,8 +2,8 @@
 
 namespace Happypixels\Shopr\Controllers\Web;
 
-use Illuminate\Routing\Controller;
 use Happypixels\Shopr\Models\Order;
+use Illuminate\Routing\Controller;
 
 class OrderController extends Controller
 {

diff --git a/src/Controllers/Web/PaymentConfirmationController.php b/src/Controllers/Web/PaymentConfirmationController.php
@@ -2,11 +2,11 @@
 
 namespace Happypixels\Shopr\Controllers\Web;
 
-use Illuminate\Http\Request;
-use Illuminate\Routing\Controller;
-use Happypixels\Shopr\Models\Order;
 use Happypixels\Shopr\Exceptions\PaymentFailedException;
+use Happypixels\Shopr\Models\Order;
 use Happypixels\Shopr\PaymentProviders\PaymentProviderManager;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
 
 class PaymentConfirmationController extends Controller
 {

diff --git a/src/Mails/OrderCreatedAdmins.php b/src/Mails/OrderCreatedAdmins.php
@@ -2,9 +2,9 @@
 
 namespace Happypixels\Shopr\Mails;
 
+use Happypixels\Shopr\Models\Order;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
-use Happypixels\Shopr\Models\Order;
 use Illuminate\Queue\SerializesModels;
 
 class OrderCreatedAdmins extends Mailable

diff --git a/src/Mails/OrderCreatedCustomer.php b/src/Mails/OrderCreatedCustomer.php
@@ -2,9 +2,9 @@
 
 namespace Happypixels\Shopr\Mails;
 
+use Happypixels\Shopr\Models\Order;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
-use Happypixels\Shopr\Models\Order;
 use Illuminate\Queue\SerializesModels;
 
 class OrderCreatedCustomer extends Mailable

diff --git a/src/Models/DiscountCoupon.php b/src/Models/DiscountCoupon.php
@@ -83,7 +83,7 @@ public function getCalculatedPositiveValue()
  *
  * @return bool
  */
- public function isDiscount() : bool
+ public function isDiscount(): bool
  {
  return true;
  }

diff --git a/src/Models/Shoppable.php b/src/Models/Shoppable.php
@@ -2,8 +2,8 @@
 
 namespace Happypixels\Shopr\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Happypixels\Shopr\Contracts\Shoppable as ShoppableContract;
+use Illuminate\Database\Eloquent\Model;
 
 class Shoppable extends Model implements ShoppableContract
 {
@@ -42,7 +42,7 @@ public function getPrice()
  *
  * @return bool
  */
- public function isDiscount() : bool
+ public function isDiscount(): bool
  {
  return false;
  }

diff --git a/src/Money/Formatter.php b/src/Money/Formatter.php
@@ -2,11 +2,11 @@
 
 namespace Happypixels\Shopr\Money;
 
-use Money\Money;
-use Money\Currency;
-use NumberFormatter;
 use Money\Currencies\ISOCurrencies;
+use Money\Currency;
 use Money\Formatter\IntlMoneyFormatter;
+use Money\Money;
+use NumberFormatter;
 
 class Formatter
 {

diff --git a/src/Observers/OrderObserver.php b/src/Observers/OrderObserver.php
@@ -3,10 +3,10 @@
 namespace Happypixels\Shopr\Observers;
 
 use Happypixels\Shopr\Cart\Cart;
-use Happypixels\Shopr\Models\Order;
-use Illuminate\Support\Facades\Mail;
 use Happypixels\Shopr\Mails\OrderCreatedAdmins;
 use Happypixels\Shopr\Mails\OrderCreatedCustomer;
+use Happypixels\Shopr\Models\Order;
+use Illuminate\Support\Facades\Mail;
 
 class OrderObserver
 {

diff --git a/src/PaymentProviders/PaymentProvider.php b/src/PaymentProviders/PaymentProvider.php
@@ -2,12 +2,12 @@
 
 namespace Happypixels\Shopr\PaymentProviders;
 
-use Omnipay\Omnipay;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
 use Happypixels\Shopr\Cart\Cart;
-use Happypixels\Shopr\Models\Order;
 use Happypixels\Shopr\Exceptions\PaymentFailedException;
+use Happypixels\Shopr\Models\Order;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Omnipay\Omnipay;
 
 abstract class PaymentProvider
 {
@@ -35,7 +35,7 @@ abstract public function purchase();
  *
  * @return array
  */
- abstract public function getPaymentConfirmationData() : array;
+ abstract public function getPaymentConfirmationData(): array;
 
  /**
  * Makes the purchase and returns the results if successful. Throws exception if unsuccessful.

diff --git a/src/PaymentProviders/PaymentProviderManager.php b/src/PaymentProviders/PaymentProviderManager.php
@@ -2,8 +2,8 @@
 
 namespace Happypixels\Shopr\PaymentProviders;
 
-use Illuminate\Http\Request;
 use Happypixels\Shopr\Exceptions\InvalidGatewayException;
+use Illuminate\Http\Request;
 
 class PaymentProviderManager
 {

diff --git a/src/PaymentProviders/Stripe.php b/src/PaymentProviders/Stripe.php
@@ -28,7 +28,7 @@ public function purchase()
  *
  * @return array
  */
- public function getPaymentConfirmationData() : array
+ public function getPaymentConfirmationData(): array
  {
  return [
  'paymentIntentReference' => $this->input['payment_intent'],

diff --git a/src/Rules/Discounts/CartValueAboveCouponLimit.php b/src/Rules/Discounts/CartValueAboveCouponLimit.php
@@ -3,8 +3,8 @@
 namespace Happypixels\Shopr\Rules\Discounts;
 
 use Happypixels\Shopr\Cart\Cart;
-use Illuminate\Contracts\Validation\Rule;
 use Happypixels\Shopr\Models\DiscountCoupon;
+use Illuminate\Contracts\Validation\Rule;
 
 class CartValueAboveCouponLimit implements Rule
 {

diff --git a/src/Rules/Discounts/CouponExists.php b/src/Rules/Discounts/CouponExists.php
@@ -2,8 +2,8 @@
 
 namespace Happypixels\Shopr\Rules\Discounts;
 
-use Illuminate\Contracts\Validation\Rule;
 use Happypixels\Shopr\Models\DiscountCoupon;
+use Illuminate\Contracts\Validation\Rule;
 
 class CouponExists implements Rule
 {

diff --git a/src/Rules/Discounts/DateIsWithinCouponTimespan.php b/src/Rules/Discounts/DateIsWithinCouponTimespan.php
@@ -2,8 +2,8 @@
 
 namespace Happypixels\Shopr\Rules\Discounts;
 
-use Illuminate\Contracts\Validation\Rule;
 use Happypixels\Shopr\Models\DiscountCoupon;
+use Illuminate\Contracts\Validation\Rule;
 
 class DateIsWithinCouponTimespan implements Rule
 {

diff --git a/src/ShoprServiceProvider.php b/src/ShoprServiceProvider.php
@@ -3,13 +3,13 @@
 namespace Happypixels\Shopr;
 
 use Happypixels\Shopr\Cart\Cart;
+use Happypixels\Shopr\Cart\Drivers\SessionCart;
 use Happypixels\Shopr\Models\Order;
-use Illuminate\Support\Facades\Event;
-use Happypixels\Shopr\Money\Formatter;
 use Happypixels\Shopr\Models\OrderItem;
-use Illuminate\Support\ServiceProvider;
+use Happypixels\Shopr\Money\Formatter;
 use Happypixels\Shopr\Observers\OrderObserver;
-use Happypixels\Shopr\Cart\Drivers\SessionCart;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\ServiceProvider;
 
 class ShoprServiceProvider extends ServiceProvider
 {

diff --git a/tests/Feature/Cart/AddCartItemTest.php b/tests/Feature/Cart/AddCartItemTest.php
@@ -3,8 +3,8 @@
 namespace Happypixels\Shopr\Tests\Feature\Cart;
 
 use Happypixels\Shopr\Cart\Cart;
-use Happypixels\Shopr\Tests\TestCase;
 use Happypixels\Shopr\Models\DiscountCoupon;
+use Happypixels\Shopr\Tests\TestCase;
 
 class AddCartItemTest extends TestCase
 {
@@ -35,9 +35,9 @@ public function discounts_are_not_allowed()
  public function it_throws_404_error_if_shoppable_is_not_found()
  {
  $this->json('POST', 'api/shopr/cart/items', [
-  'shoppable_id' => 2,
-  'shoppable_type' => 'Happypixels\Shopr\Tests\Support\Models\TestShoppable',
-  ])
+ 'shoppable_id' => 2,
+ 'shoppable_type' => 'Happypixels\Shopr\Tests\Support\Models\TestShoppable',
+ ])
  ->assertStatus(404);
  }
 

diff --git a/tests/Feature/Cart/CartControllerTest.php b/tests/Feature/Cart/CartControllerTest.php
@@ -3,9 +3,9 @@
 namespace Happypixels\Shopr\Tests\Feature\Cart;
 
 use Happypixels\Shopr\Cart\Cart;
+use Happypixels\Shopr\Tests\Support\Models\TestShoppable;
 use Happypixels\Shopr\Tests\TestCase;
 use Illuminate\Support\Facades\Event;
-use Happypixels\Shopr\Tests\Support\Models\TestShoppable;
 
 class CartControllerTest extends TestCase
 {

diff --git a/tests/Feature/Cart/RemoveCartItemTest.php b/tests/Feature/Cart/RemoveCartItemTest.php
@@ -3,10 +3,10 @@
 namespace Happypixels\Shopr\Tests\Feature\Cart;
 
 use Happypixels\Shopr\Cart\Cart;
-use Happypixels\Shopr\Tests\TestCase;
-use Illuminate\Support\Facades\Event;
 use Happypixels\Shopr\Models\DiscountCoupon;
 use Happypixels\Shopr\Tests\Support\Models\TestShoppable;
+use Happypixels\Shopr\Tests\TestCase;
+use Illuminate\Support\Facades\Event;
 
 class RemoveCartItemTest extends TestCase
 {

diff --git a/tests/Feature/Cart/UpdateCartItemTest.php b/tests/Feature/Cart/UpdateCartItemTest.php
@@ -3,10 +3,10 @@
 namespace Happypixels\Shopr\Tests\Feature\Cart;
 
 use Happypixels\Shopr\Cart\Cart;
-use Happypixels\Shopr\Tests\TestCase;
-use Illuminate\Support\Facades\Event;
 use Happypixels\Shopr\Models\DiscountCoupon;
 use Happypixels\Shopr\Tests\Support\Models\TestShoppable;
+use Happypixels\Shopr\Tests\TestCase;
+use Illuminate\Support\Facades\Event;
 
 class UpdateCartItemTest extends TestCase
 {

diff --git a/tests/Feature/Mails/OrderCreatedAdminsMailTest.php b/tests/Feature/Mails/OrderCreatedAdminsMailTest.php
@@ -3,12 +3,12 @@
 namespace Happypixels\Shopr\Tests\Feature\Mails;
 
 use Happypixels\Shopr\Cart\Cart;
-use Illuminate\Support\Facades\Mail;
-use Happypixels\Shopr\Tests\TestCase;
-use Illuminate\Support\Facades\Event;
 use Happypixels\Shopr\Mails\OrderCreatedAdmins;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Happypixels\Shopr\Tests\Support\Models\TestShoppable;
+use Happypixels\Shopr\Tests\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Mail;
 
 class OrderCreatedAdminsMailTest extends TestCase
 {