DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16209 from uberbrady/eliminate_preg_split_deprecation_warnings

Browse source 
Fixed #16208 - don't call preg_split() with a null
This commit is contained in:
snipe 2025-02-06 13:30:53 +00:00 committed by GitHub
parent b131227b71 de3ebfecfe
commit b48704b3af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/SettingsSamlRequest.php
View file

@ -62,7 +62,7 @@ class SettingsSamlRequest extends FormRequest
$custom_privateKey = ''; $custom_privateKey = '';
$custom_x509certNew = ''; $custom_x509certNew = '';
if (! empty($this->input('saml_custom_settings'))) { if (! empty($this->input('saml_custom_settings'))) {
$req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings')); $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings', ''));
$custom_settings = []; $custom_settings = [];
foreach ($req_custom_settings as $custom_setting) { foreach ($req_custom_settings as $custom_setting) {

2
app/Models/CustomField.php
View file

@ -307,7 +307,7 @@ class CustomField extends Model
public function formatFieldValuesAsArray() public function formatFieldValuesAsArray()
{ {
$result = []; $result = [];
$arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values); $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values ?? '');
if (($this->element != 'checkbox') && ($this->element != 'radio')) { if (($this->element != 'checkbox') && ($this->element != 'radio')) {
$result[''] = 'Select '.strtolower($this->format); $result[''] = 'Select '.strtolower($this->format);

2
app/Services/Saml.php
View file

@ -209,7 +209,7 @@ class Saml
} }
} }
$custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings); $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings ?? '');
if ($custom_settings) { if ($custom_settings) {
foreach ($custom_settings as $custom_setting) { foreach ($custom_settings as $custom_setting) {
$split = explode('=', $custom_setting, 2); $split = explode('=', $custom_setting, 2);