diff --git a/app/Ninja/PaymentDrivers/BasePaymentDriver.php b/app/Ninja/PaymentDrivers/BasePaymentDriver.php
index 90f46ca2c783..eefcc9743505 100644
--- a/app/Ninja/PaymentDrivers/BasePaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/BasePaymentDriver.php
@@ -66,8 +66,8 @@ class BasePaymentDriver
      * @param bool $gatewayType
      */
     public function __construct(
-        AccountGateway $accountGateway = false,
-        Invitation $invitation = false,
+        AccountGateway $accountGateway = null,
+        Invitation $invitation = null,
         $gatewayType = false
     )
     {
@@ -173,7 +173,7 @@ class BasePaymentDriver
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
      * @throws Exception
      */
-    public function startPurchase(array $input = false, $sourceId = false)
+    public function startPurchase(array $input = null, $sourceId = false)
     {
         $this->input = $input;
         $this->sourceId = $sourceId;
@@ -312,7 +312,7 @@ class BasePaymentDriver
      * @return Payment|mixed|void
      * @throws Exception
      */
-    public function completeOnsitePurchase($input = false, PaymentMethod $paymentMethod = false)
+    public function completeOnsitePurchase($input = false, PaymentMethod $paymentMethod = null)
     {
         $this->input = count($input) ? $input : false;
         $gateway = $this->gateway();
@@ -411,7 +411,7 @@ class BasePaymentDriver
      *
      * @return array
      */
-    protected function paymentDetails(PaymentMethod $paymentMethod = false)
+    protected function paymentDetails(PaymentMethod $paymentMethod = null)
     {
         $invoice = $this->invoice();
         $completeUrl = url('complete/' . $this->invitation->invitation_key . '/' . $this->gatewayType);
@@ -779,7 +779,7 @@ class BasePaymentDriver
      *
      * @return Payment
      */
-    protected function creatingPayment(Payment $payment, $paymentMethod)
+    protected function creatingPayment(Payment $payment, PaymentMethod $paymentMethod)
     {
         return $payment;
     }
@@ -860,7 +860,7 @@ class BasePaymentDriver
      * @return bool|mixed
      * @throws Exception
      */
-    public function completeOffsitePurchase($input)
+    public function completeOffsitePurchase(array $input)
     {
         $this->input = $input;
         $ref = array_get($this->input, 'token') ?: $this->invitation->transaction_reference;
diff --git a/app/Ninja/PaymentDrivers/BraintreePaymentDriver.php b/app/Ninja/PaymentDrivers/BraintreePaymentDriver.php
index ca0d570a8a35..2ad50bf87df8 100644
--- a/app/Ninja/PaymentDrivers/BraintreePaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/BraintreePaymentDriver.php
@@ -6,6 +6,7 @@ use App\Models\PaymentMethod;
 use Exception;
 use Session;
 use Braintree\Customer;
+use App\Models\Payment;
 
 /**
  * Class BraintreePaymentDriver
@@ -53,7 +54,7 @@ class BraintreePaymentDriver extends BasePaymentDriver
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
-    public function startPurchase(array $input = false, $sourceId = false)
+    public function startPurchase(array $input = null, $sourceId = false)
     {
         $data = parent::startPurchase($input, $sourceId);
 
@@ -87,7 +88,7 @@ class BraintreePaymentDriver extends BasePaymentDriver
      *
      * @return array
      */
-    protected function paymentDetails(PaymentMethod $paymentMethod = false)
+    protected function paymentDetails(PaymentMethod $paymentMethod = null)
     {
         $data = parent::paymentDetails($paymentMethod);
 
diff --git a/app/Ninja/PaymentDrivers/CheckoutComPaymentDriver.php b/app/Ninja/PaymentDrivers/CheckoutComPaymentDriver.php
index b292507d7fa9..c1d9c63fbbbb 100644
--- a/app/Ninja/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -33,10 +33,10 @@ class CheckoutComPaymentDriver extends BasePaymentDriver
 
     /**
      * @param PaymentMethod $paymentMethod
-     * 
+     *
      * @return array
      */
-    protected function paymentDetails(PaymentMethod $paymentMethod = false)
+    protected function paymentDetails(PaymentMethod $paymentMethod = null)
     {
         $data = parent::paymentDetails();
 
diff --git a/app/Ninja/PaymentDrivers/MolliePaymentDriver.php b/app/Ninja/PaymentDrivers/MolliePaymentDriver.php
index 01d913b5fada..7aace938e28a 100644
--- a/app/Ninja/PaymentDrivers/MolliePaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/MolliePaymentDriver.php
@@ -9,10 +9,10 @@ class MolliePaymentDriver extends BasePaymentDriver
 {
     /**
      * @param $input
-     * 
+     *
      * @return \App\Models\Payment|mixed
      */
-    public function completeOffsitePurchase($input)
+    public function completeOffsitePurchase(array $input)
     {
         $details = $this->paymentDetails();
 
diff --git a/app/Ninja/PaymentDrivers/PayFastPaymentDriver.php b/app/Ninja/PaymentDrivers/PayFastPaymentDriver.php
index 08c54432a170..b1d8caf4891c 100644
--- a/app/Ninja/PaymentDrivers/PayFastPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/PayFastPaymentDriver.php
@@ -11,8 +11,8 @@ class PayFastPaymentDriver extends BasePaymentDriver
      * @var string
      */
     protected $transactionReferenceParam = 'm_payment_id';
-    
-    public function completeOffsitePurchase($input)
+
+    public function completeOffsitePurchase(array $input)
     {
         if ($accountGateway->isGateway(GATEWAY_PAYFAST) && Request::has('pt')) {
             $token = Request::query('pt');
diff --git a/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
index 9ac25cf2142a..fc8672564507 100644
--- a/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
@@ -25,7 +25,7 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver
      *
      * @return array
      */
-    protected function paymentDetails(PaymentMethod $paymentMethod = false)
+    protected function paymentDetails(PaymentMethod $paymentMethod = null)
     {
         $data = parent::paymentDetails();
 
@@ -37,7 +37,7 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver
     /**
      * @param Payment $payment
      * @param PaymentMethod $paymentMethod
-     * 
+     *
      * @return Payment
      */
     protected function creatingPayment(Payment $payment, PaymentMethod $paymentMethod)
diff --git a/app/Ninja/PaymentDrivers/PayPalProPaymentDriver.php b/app/Ninja/PaymentDrivers/PayPalProPaymentDriver.php
index 840ac556f9e9..2e5a2789d036 100644
--- a/app/Ninja/PaymentDrivers/PayPalProPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/PayPalProPaymentDriver.php
@@ -24,7 +24,7 @@ class PayPalProPaymentDriver extends BasePaymentDriver
      *
      * @return array
      */
-    protected function paymentDetails(PaymentMethod $paymentMethod = false)
+    protected function paymentDetails(PaymentMethod $paymentMethod = null)
     {
         $data = parent::paymentDetails();
 
diff --git a/app/Ninja/PaymentDrivers/StripePaymentDriver.php b/app/Ninja/PaymentDrivers/StripePaymentDriver.php
index 4bc65ae41425..c8e006a09617 100644
--- a/app/Ninja/PaymentDrivers/StripePaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/StripePaymentDriver.php
@@ -98,7 +98,7 @@ class StripePaymentDriver extends BasePaymentDriver
      *
      * @return array
      */
-    protected function paymentDetails(PaymentMethod $paymentMethod = false)
+    protected function paymentDetails(PaymentMethod $paymentMethod = null)
     {
         $data = parent::paymentDetails($paymentMethod);
 
@@ -394,7 +394,7 @@ class StripePaymentDriver extends BasePaymentDriver
 
     /**
      * @param $input
-     * 
+     *
      * @return array|string
      * @throws Exception
      */
diff --git a/app/Ninja/PaymentDrivers/WePayPaymentDriver.php b/app/Ninja/PaymentDrivers/WePayPaymentDriver.php
index d92014642b19..aaef30a27c9b 100644
--- a/app/Ninja/PaymentDrivers/WePayPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/WePayPaymentDriver.php
@@ -70,7 +70,7 @@ class WePayPaymentDriver extends BasePaymentDriver
      *
      * @return array
      */
-    protected function paymentDetails(PaymentMethod $paymentMethod = false)
+    protected function paymentDetails(PaymentMethod $paymentMethod = null)
     {
         $data = parent::paymentDetails($paymentMethod);