Replace deprecated array and string helpers

Laravel recommends using the `Str` and `Arr` class methods directly instead of the respective helper functions. These helper functions are deprecated in Laravel 5.8 and removed in Laravel 6.
This commit is contained in:
Shift
2023-01-06 11:53:35 +00:00
parent 03623d493d
commit b02541ac64
28 changed files with 91 additions and 70 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\helpdesk;
// Controller
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
// Model
use App\Model\helpdesk\Form\Fields;
@@ -136,7 +137,7 @@ class FormController extends Controller
$fields = [];
for ($i = 0; $i <= $count; $i++) {
if (! empty(Input::get('name')[$i])) {
$name = str_slug(Input::get('name')[$i], '_');
$name = Str::slug(Input::get('name')[$i], '_');
$field = Fields::create([
'forms_id' => $forms->id,
'label' => Input::get('label')[$i],
@@ -251,7 +252,7 @@ class FormController extends Controller
}
//dd(Input::get('label'),Input::get('name'),Input::get('type'),Input::get('required'));
for ($i = 0; $i < $count; $i++) {
$name = str_slug(Input::get('name')[$i], '_');
$name = Str::slug(Input::get('name')[$i], '_');
$field = $field->create([
'forms_id' => $forms->id,
'label' => Input::get('label')[$i],
@@ -384,7 +385,7 @@ class FormController extends Controller
'field_id' => $fieldid,
'child_id' => $childid,
'field_key' => $key,
'field_value' => str_slug($value, '_'),
'field_value' => Str::slug($value, '_'),
]);
}
}
@@ -443,12 +444,12 @@ class FormController extends Controller
}
return '<script>
$("#'.str_slug($value).'").on("change", function () {
var valueid = $("#'.str_slug($value).'").val();
var fieldid = $("#'.$fieldid.str_slug($value).'").val();
send'.$fieldid.str_slug($value).'(valueid,fieldid);
$("#'.Str::slug($value).'").on("change", function () {
var valueid = $("#'.Str::slug($value).'").val();
var fieldid = $("#'.$fieldid.Str::slug($value).'").val();
send'.$fieldid.Str::slug($value).'(valueid,fieldid);
});
function send'.$fieldid.str_slug($value).'(valueid,fieldid) {
function send'.$fieldid.Str::slug($value).'(valueid,fieldid) {
$.ajax({
url: "'.url('forms/render/child/').'",
dataType: "html",
@@ -554,8 +555,8 @@ class FormController extends Controller
if (count($values) > 0) {
foreach ($values as $field_value) {
$script = self::jqueryScript($field_value, $field->id, $field->name, $field_type);
$radio .= '<div>'.Form::hidden('fieldid[]', $field->id, ['id' => $field->id.str_slug($field_value)]);
$radio .= Form::$field_type($field->name, $field_value, null, ['class' => "$field->id", 'id' => str_slug($field_value), 'required' => $required]).$script.'<span> '.removeUnderscore($field_value).'</span></div>';
$radio .= '<div>'.Form::hidden('fieldid[]', $field->id, ['id' => $field->id.Str::slug($field_value)]);
$radio .= Form::$field_type($field->name, $field_value, null, ['class' => "$field->id", 'id' => Str::slug($field_value), 'required' => $required]).$script.'<span> '.removeUnderscore($field_value).'</span></div>';
}
$html = Form::label($field->label, $field->label, ['class' => $required_class]).'</br>'.$radio.'<div id='.$field->name.'></br></div>';
}

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\helpdesk;
// controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\CompanyRequest;
@@ -572,7 +573,7 @@ class SettingsController extends Controller
*/
public function generateApiKey()
{
$key = str_random(32);
$key = Str::random(32);
return $key;
}

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\helpdesk;
// controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\CompanyRequest;
@@ -718,7 +719,7 @@ class SettingsController2 extends Controller
*/
public function generateApiKey()
{
$key = str_random(32);
$key = Str::random(32);
return $key;
}