PHP deprecation fixes, assigning null arguments in methods

app/Http/Controllers/InvoiceController.php

@@ -54,7 +54,7 @@ class InvoiceController extends Controller
 	 * @param string|null $code
 	 * @return View
 	 */
-	public function view(Invoice $o,string $code=NULL): View
+	public function view(Invoice $o,?string $code=NULL): View
 	{
 		if ($code) {
 			try {

app/Http/Controllers/SupplierController.php

@@ -159,7 +159,7 @@ class SupplierController extends Controller
 	 * @param int|null $id
 	 * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
 	 */
-	public function product_view_type(Request $request,string $type,int $id=NULL)
+	public function product_view_type(Request $request,string $type,?int $id=NULL)
 	{
 		$o = $id ? Supplier::offeringTypeClass($type)->findOrFail($id) : NULL;
 

app/Mail/CancelRequest.php

@@ -23,7 +23,7 @@ class CancelRequest extends Mailable
 	 * @param Service $o
 	 * @param string|NULL  $notes
 	 */
-	public function __construct(Service $o,string $notes=NULL)
+	public function __construct(Service $o,?string $notes=NULL)
 	{
 		$this->service = $o;
 		$this->notes = $notes;

app/Mail/ChangeRequest.php

@@ -23,7 +23,7 @@ class ChangeRequest extends Mailable
 	 * @param Service $o
 	 * @param string|NULL  $notes
 	 */
-	public function __construct(Service $o,string $notes=NULL)
+	public function __construct(Service $o,?string $notes=NULL)
 	{
 		$this->service = $o;
 		$this->notes = $notes;

app/Models/Account.php

@@ -44,7 +44,7 @@ class Account extends Model
 	 * @param Collection|NULL $invoices
 	 * @return Collection
 	 */
-	public static function InvoicesCredit(Collection $invoices=NULL): Collection
+	public static function InvoicesCredit(?Collection $invoices=NULL): Collection
 	{
 		return (new self)
 			->invoiceSummaryCredit($invoices,TRUE)
@@ -57,7 +57,7 @@ class Account extends Model
 	 * @param Collection|NULL $invoices
 	 * @return Collection
 	 */
-	public static function InvoicesDue(Collection $invoices=NULL): Collection
+	public static function InvoicesDue(?Collection $invoices=NULL): Collection
 	{
 		return (new self)
 			->invoiceSummaryDue($invoices,TRUE)
@@ -251,7 +251,7 @@ class Account extends Model
 
 	/* METHODS */
 
-	public function invoice_next(Carbon $date=NULL): Collection
+	public function invoice_next(?Carbon $date=NULL): Collection
 	{
 		$svs = $this
 			->services_active
@@ -307,7 +307,7 @@ class Account extends Model
 	 * @param bool $all
 	 * @return Builder
 	 */
-	public function invoiceSummary(Collection $invoices=NULL,bool $all=FALSE): Builder
+	public function invoiceSummary(?Collection $invoices=NULL,bool $all=FALSE): Builder
 	{
 		return (new Invoice)
 			->select([
@@ -355,19 +355,19 @@ class Account extends Model
 			->with(['account']);
 	}
 
-	public function invoiceSummaryDue(Collection $invoices=NULL,bool $all=FALSE): Builder
+	public function invoiceSummaryDue(?Collection $invoices=NULL,bool $all=FALSE): Builder
 	{
 		return $this->invoiceSummary($invoices,$all)
 			->havingRaw('ROUND(CAST(SUM(item_total)-COALESCE(invoices.discount_amt,0)-SUM(payments) AS NUMERIC),2) > 0');
 	}
 
-	public function invoiceSummaryCredit(Collection $invoices=NULL,bool $all=FALSE): Builder
+	public function invoiceSummaryCredit(?Collection $invoices=NULL,bool $all=FALSE): Builder
 	{
 		return $this->invoiceSummary($invoices,$all)
 			->havingRaw('ROUND(CAST(SUM(item_total)-COALESCE(invoices.discount_amt,0)-SUM(payments) AS NUMERIC),2) < 0');
 	}
 
-	public function invoiceSummaryPast(Collection $invoices=NULL,bool $all=FALSE): Builder
+	public function invoiceSummaryPast(?Collection $invoices=NULL,bool $all=FALSE): Builder
 	{
 		return $this->invoiceSummary($invoices,$all)
 			->join('payment_items',['payment_items.invoice_id'=>'invoices.id'])

app/Models/Product.php

@@ -206,7 +206,7 @@ class Product extends Model
 	 * @param Group|NULL $go
 	 * @return float
 	 */
-	private function _charge(string $type,int $timeperiod=NULL,Group $go=NULL): float
+	private function _charge(string $type,?int $timeperiod=NULL,?Group $go=NULL): float
 	{
 		// We'll cache this for performance
 		static $default = NULL;
@@ -296,7 +296,7 @@ class Product extends Model
 	 * @param Group|null $go
 	 * @return float
 	 */
-	public function min_charge(int $timeperiod=NULL,Group $go=NULL): float
+	public function min_charge(?int $timeperiod=NULL,?Group $go=NULL): float
 	{
 		return $this->setup_charge($timeperiod,$go)
 			+ $this->base_charge($timeperiod,$go)*Invoice::billing_change($this->billing_interval,$this->type->billing_interval)*$this->contract_term;

app/Models/Service.php

@@ -1028,7 +1028,7 @@ class Service extends Model
 	 * @return Collection
 	 * @throws Exception
 	 */
-	public function next_invoice_items(Carbon $billdate=NULL): Collection
+	public function next_invoice_items(?Carbon $billdate=NULL): Collection
 	{
 		if ($this->is_cancelled || (! $this->is_billed))
 			return collect();

app/Models/Supplier.php

@@ -40,7 +40,7 @@ class Supplier extends Model
 	 * @param Supplier|null $so
 	 * @return Collection
 	 */
-	public static function offeringTypes(self $so=NULL): Collection
+	public static function offeringTypes(?self $so=NULL): Collection
 	{
 		$result = collect();
 

app/Models/Supplier/Broadband.php

@@ -73,7 +73,7 @@ class Broadband extends Type
 	 * @param bool $ceil Round the numbers to integers
 	 * @return array|string
 	 */
-	public function allowance(Collection $config=NULL,array $data=[],bool $ceil=TRUE)
+	public function allowance(?Collection $config=NULL,array $data=[],bool $ceil=TRUE)
 	{
 		$map = collect(self::traffic_map);
 		$merge = collect(self::traffic_merge);

app/Models/User.php

@@ -240,7 +240,7 @@ class User extends Authenticatable
 	 * @param User|null $user
 	 * @return bool
 	 */
-	public function isAdmin(User $user=NULL): bool
+	public function isAdmin(?User $user=NULL): bool
 	{
 		return $user->exists
 			&& $this->isReseller()

app/Traits/ScopeAccountUserAuthorised.php

@@ -1,21 +1,21 @@
 <?php
 
-/**
- * Add a ScopeAuthorised to an Eloquent Model
- * This will help limit the scope of accounts that a user can see.
- */
 namespace App\Traits;
 
 use Illuminate\Support\Facades\Auth;
 
 use App\Models\User;
 
+/**
+ * Add a ScopeAuthorised to an Eloquent Model
+ * This will help limit the scope of accounts that a user can see.
+ */
 trait ScopeAccountUserAuthorised
 {
 	/**
 	 * Only query records that the user is authorised to see
 	 */
-	public function scopeAccountUserAuthorised($query,string $table=NULL,User $uo=NULL)
+	public function scopeAccountUserAuthorised($query,?string $table=NULL,?User $uo=NULL)
 	{
 		if (! $uo)
 			$uo = Auth::user();