From 34c0380c99859e4a2bfbb911827971e425bd9a55 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sat, 11 Jan 2020 22:05:05 +1100 Subject: [PATCH] array_get deprecated --- app/Classes/SSL.php | 4 +++- app/Models/InvoiceItem.php | 3 ++- app/Models/Product.php | 9 ++++----- .../adminlte/a/widgets/service/order/sent.blade.php | 2 +- .../adminlte/u/widgets/service/order/sent.blade.php | 2 +- .../metronic/layouts/partials/mainheader.blade.php | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/Classes/SSL.php b/app/Classes/SSL.php index c5e7b71..96790a9 100644 --- a/app/Classes/SSL.php +++ b/app/Classes/SSL.php @@ -2,6 +2,8 @@ namespace App\Classes; +use Illuminate\Support\Arr; + class SSL { // Our CSR @@ -29,7 +31,7 @@ class SSL private function cn() { - $subject = array_get($this->crt,'subject'); + $subject = Arr::get($this->crt,'subject'); if (! $subject AND $this->csr_pem) { $subject = openssl_csr_get_subject($this->csr_pem); diff --git a/app/Models/InvoiceItem.php b/app/Models/InvoiceItem.php index bb6436e..8fee3a8 100644 --- a/app/Models/InvoiceItem.php +++ b/app/Models/InvoiceItem.php @@ -3,6 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Arr; class InvoiceItem extends Model { @@ -68,7 +69,7 @@ class InvoiceItem extends Model ); default: - return array_get($types,$this->item_type,'Unknown'); + return Arr::get($types,$this->item_type,'Unknown'); } } diff --git a/app/Models/Product.php b/app/Models/Product.php index 9fc109d..14a5485 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -4,7 +4,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use App\Traits\NextKey; @@ -68,13 +67,13 @@ class Product extends Model public function getDefaultBillingAttribute() { - return array_get($this->PricePeriods(),$this->price_recurr_default); + return Arr::get($this->PricePeriods(),$this->price_recurr_default); } public function getDefaultCostAttribute() { // @todo Integrate this into a Tax::class - return array_get($this->price_array,sprintf('%s.1.price_base',$this->price_recurr_default))*1.1; + return Arr::get($this->price_array,sprintf('%s.1.price_base',$this->price_recurr_default))*1.1; } private function getDefaultLanguage() @@ -102,7 +101,7 @@ class Product extends Model 8=>1/60, ]; - return $this->setup_cost + ( $this->default_cost * array_get($table,$this->price_recurr_default) * $this->contract_term); + return $this->setup_cost + ( $this->default_cost * Arr::get($table,$this->price_recurr_default) * $this->contract_term); } public function getNameAttribute(Language $lo=NULL) @@ -148,7 +147,7 @@ class Product extends Model public function getSetupCostAttribute() { // @todo Integrate this into a Tax::class - return array_get($this->price_array,sprintf('%s.1.price_setup',$this->price_recurr_default))*1.1; + return Arr::get($this->price_array,sprintf('%s.1.price_setup',$this->price_recurr_default))*1.1; } public function scopeActive() diff --git a/resources/theme/backend/adminlte/a/widgets/service/order/sent.blade.php b/resources/theme/backend/adminlte/a/widgets/service/order/sent.blade.php index 3d8ea52..74b4b81 100644 --- a/resources/theme/backend/adminlte/a/widgets/service/order/sent.blade.php +++ b/resources/theme/backend/adminlte/a/widgets/service/order/sent.blade.php @@ -40,7 +40,7 @@ Order Details{!! $o->order_info_details !!} - Reference: + Reference: diff --git a/resources/theme/backend/adminlte/u/widgets/service/order/sent.blade.php b/resources/theme/backend/adminlte/u/widgets/service/order/sent.blade.php index 2309f7b..5b75791 100644 --- a/resources/theme/backend/adminlte/u/widgets/service/order/sent.blade.php +++ b/resources/theme/backend/adminlte/u/widgets/service/order/sent.blade.php @@ -40,7 +40,7 @@ Order Details{!! $o->order_info_details !!} - Reference:{{ array_get($o->order_info,'order_reference','') }} + Reference:{{ \Illuminate\Support\Arr::get($o->order_info,'order_reference','') }} diff --git a/resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php b/resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php index 65452fe..a38d310 100644 --- a/resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php +++ b/resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php @@ -37,7 +37,7 @@ @foreach ($so->top_menu as $item => $menu)