Skip to content

Commit 3daa28b

Browse files
murrantmurrant
authored
Merge branch 'master' into update-deps
2 parents 6537f56 + a226ed9 commit 3daa28b

File tree

296 files changed

+27948
-5566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+27948
-5566
lines changed

‎LibreNMS/ComposerHelper.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ private static function populateEnv()
134134
];
135135

136136
if (file_exists('config.php')) {
137-
/** @phpstan-ignore include.fileNotFound */
138137
@include 'config.php';
139138
}
140139

‎LibreNMS/Model.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ abstract public function isValid();
174174
*/
175175
public static function onDelete($model)
176176
{
177-
if (\App::runningInConsole()) {
177+
if (app()->runningInConsole()) {
178178
echo '-';
179179
}
180180
}
@@ -184,7 +184,7 @@ public static function onDelete($model)
184184
*/
185185
public static function onCreate($model)
186186
{
187-
if (\App::runningInConsole()) {
187+
if (app()->runningInConsole()) {
188188
echo '+';
189189
}
190190
}
@@ -194,14 +194,14 @@ public static function onCreate($model)
194194
*/
195195
public static function onUpdate($model)
196196
{
197-
if (\App::runningInConsole()) {
197+
if (app()->runningInConsole()) {
198198
echo 'U';
199199
}
200200
}
201201

202202
public static function onNoUpdate()
203203
{
204-
if (\App::runningInConsole()) {
204+
if (app()->runningInConsole()) {
205205
echo '.';
206206
}
207207
}

‎LibreNMS/Util/ModuleTestHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ private function saveSnmprec(array $data, ?string $context = null, bool $write =
467467
}
468468

469469
// put data in the proper order for snmpsim
470-
uksort($results, [$this, 'compareOid']);
470+
uksort($results, $this->compareOid(...));
471471

472472
$output = implode(PHP_EOL, $results) . PHP_EOL;
473473

‎app/Http/Controllers/Ajax/AvailabilityMapController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function setGroup(Request $request)
5656
*/
5757
private function setSessionValue($request, $key)
5858
{
59-
$value = $request->get($key);
59+
$value = $request->input($key);
6060
$request->session()->put($key, $value);
6161

6262
return response()->json([$key, $value]);

‎app/Http/Controllers/Ajax/DeviceSearchController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function buildQuery(string $search, Request $request): Builder
8585
public function formatItem($device): array
8686
{
8787
$name = $device->displayName();
88-
if (! request()->get('map') && $name !== $device->sysName) {
88+
if (! request()->input('map') && $name !== $device->sysName) {
8989
$name .= " ($device->sysName)";
9090
}
9191

‎app/Http/Controllers/Ajax/NetCommand.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ public function run(Request $request)
4444

4545
ini_set('allow_url_fopen', '0');
4646

47-
switch ($request->get('cmd')) {
47+
switch ($request->input('cmd')) {
4848
case 'whois':
49-
$cmd = [LibrenmsConfig::get('whois', 'whois'), $request->get('query')];
49+
$cmd = [LibrenmsConfig::get('whois', 'whois'), $request->input('query')];
5050
break;
5151
case 'ping':
52-
$cmd = [LibrenmsConfig::get('ping', 'ping'), '-c', '5', $request->get('query')];
52+
$cmd = [LibrenmsConfig::get('ping', 'ping'), '-c', '5', $request->input('query')];
5353
break;
5454
case 'tracert':
55-
$cmd = [LibrenmsConfig::get('mtr', 'mtr'), '-r', '-c', '5', $request->get('query')];
55+
$cmd = [LibrenmsConfig::get('mtr', 'mtr'), '-r', '-c', '5', $request->input('query')];
5656
break;
5757
case 'nmap':
5858
if (! $request->user()->isAdmin()) {
5959
return response('Insufficient privileges');
6060
} else {
61-
$cmd = [LibrenmsConfig::get('nmap', 'nmap'), $request->get('query')];
61+
$cmd = [LibrenmsConfig::get('nmap', 'nmap'), $request->input('query')];
6262
}
6363
break;
6464
default:

‎app/Http/Controllers/Ajax/PortSearchController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function buildQuery(string $search, Request $request): Builder
4040
->with('device')
4141
->where('deleted', 0)
4242
->where(function (Builder $query) use ($request) {
43-
$search = $request->get('search');
43+
$search = $request->input('search');
4444
$like_search = "%$search%";
4545

4646
return $query->orWhere('ifAlias', 'LIKE', $like_search)

‎app/Http/Controllers/Ajax/RipeNccApiController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public function raw(Request $request, RipeApi $api)
4040
'query_param' => 'required|ip_or_hostname',
4141
]);
4242

43-
$is_whois = $request->get('data_param') == 'whois';
43+
$is_whois = $request->input('data_param') == 'whois';
4444

4545
try {
46-
$resource = $request->get('query_param');
46+
$resource = $request->input('query_param');
4747
$output = $is_whois ? $api->getWhois($resource) : $api->getAbuseContact($resource);
4848

4949
return response()->json([

‎app/Http/Controllers/Ajax/SearchController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ abstract class SearchController
3535
{
3636
public function __invoke(Request $request): JsonResponse
3737
{
38-
$search = $request->get('search');
38+
$search = $request->input('search');
3939
if (empty($search)) {
4040
return new JsonResponse;
4141
}

‎app/Http/Controllers/AlertController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function ack(Request $request, Alert $alert): \Illuminate\Http\JsonRespon
1818
'ack_until_clear' => 'nullable|in:0,1,true,false',
1919
]);
2020

21-
$state = $request->get('state');
21+
$state = $request->input('state');
2222
$state_description = '';
2323
if ($state == 2) {
2424
$alert->state = 1;
@@ -31,12 +31,12 @@ public function ack(Request $request, Alert $alert): \Illuminate\Http\JsonRespon
3131
}
3232

3333
$info = $alert->info;
34-
$info['until_clear'] = filter_var($request->get('ack_until_clear'), FILTER_VALIDATE_BOOLEAN);
34+
$info['until_clear'] = filter_var($request->input('ack_until_clear'), FILTER_VALIDATE_BOOLEAN);
3535
$alert->info = $info;
3636

3737
$timestamp = date(LibrenmsConfig::get('dateformat.long'));
3838
$username = $request->user()->username;
39-
$ack_msg = $request->get('ack_msg');
39+
$ack_msg = $request->input('ack_msg');
4040
$alert->note = trim($alert->note . PHP_EOL . "$timestamp - $state_description ($username) " . $ack_msg);
4141

4242
if ($alert->save()) {

0 commit comments

Comments
 (0)