diff --git a/LibreNMS/ObjectCache.php b/LibreNMS/ObjectCache.php index dfff8c4790..21c981c50a 100644 --- a/LibreNMS/ObjectCache.php +++ b/LibreNMS/ObjectCache.php @@ -88,7 +88,6 @@ class ObjectCache implements ArrayAccess * Get Data-Object * * @param mixed $obj Name of Data-Object - * @return mixed */ public function offsetGet($obj): mixed { @@ -106,6 +105,7 @@ class ObjectCache implements ArrayAccess return $GLOBALS['_ObjCache'][$this->obj][$obj]['value']; } } + return; } //end offsetGet() diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 3ae269c7c1..76632a719a 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -10,7 +10,6 @@ class Handler extends ExceptionHandler /** * A list of the exception types that are not reported. * - * @var array */ protected $dontReport = [ \Illuminate\Auth\AuthenticationException::class, @@ -50,7 +49,7 @@ class Handler extends ExceptionHandler // try to upgrade generic exceptions to more specific ones if (! config('app.debug')) { - if ($exception instanceof \Illuminate\View\ViewException || $exception instanceof \Facade\Ignition\Exceptions\ViewException) { + if ($exception instanceof \Illuminate\View\ViewException || $exception instanceof \Spatie\LaravelIgnition\Exceptions\ViewException) { $base = $exception->getPrevious(); // get real exception } diff --git a/app/Http/Controllers/Ajax/DeviceSearchController.php b/app/Http/Controllers/Ajax/DeviceSearchController.php index 667bb001c3..2a5095f74a 100644 --- a/app/Http/Controllers/Ajax/DeviceSearchController.php +++ b/app/Http/Controllers/Ajax/DeviceSearchController.php @@ -57,20 +57,20 @@ class DeviceSearchController extends SearchController $baseQuery->leftJoin('ports', 'ports.device_id', '=', 'devices.device_id') ->leftJoin('ipv4_addresses', 'ipv4_addresses.port_id', 'ports.port_id'); - $query->orWhere('ipv4_address', '=', $search) + $query->orWhere('ipv4_addresses.ipv4_address', '=', $search) ->orWhere('overwrite_ip', '=', $search) ->orWhere('ip', '=', inet_pton($search)); } elseif (\LibreNMS\Util\IPv6::isValid($search, false)) { $baseQuery->leftJoin('ports', 'ports.device_id', '=', 'devices.device_id') ->leftJoin('ipv6_addresses', 'ipv6_addresses.port_id', 'ports.port_id'); - $query->orWhere('ipv6_address', '=', $search) + $query->orWhere('ipv6_addresses.ipv6_address', '=', $search) ->orWhere('overwrite_ip', '=', $search) ->orWhere('ip', '=', inet_pton($search)); } elseif (ctype_xdigit($mac_search = str_replace([':', '-', '.'], '', $search))) { $baseQuery->leftJoin('ports', 'ports.device_id', '=', 'devices.device_id'); - $query->orWhere('ifPhysAddress', 'LIKE', "%$mac_search%"); + $query->orWhere('ports.ifPhysAddress', 'LIKE', "%$mac_search%"); } return $query; diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 2e3381519e..cdabe6d879 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -65,7 +65,7 @@ class RegisterController extends Controller protected function create(array $data) { return User::create([ - 'name' => $data['name'], + 'realname' => $data['name'], 'email' => $data['email'], 'password' => Hash::make($data['password']), ]); diff --git a/app/Http/Controllers/Install/InstallationController.php b/app/Http/Controllers/Install/InstallationController.php index 73696e4cd7..64a87ce78e 100644 --- a/app/Http/Controllers/Install/InstallationController.php +++ b/app/Http/Controllers/Install/InstallationController.php @@ -126,7 +126,7 @@ class InstallationController extends Controller $db['port'] ?? 3306, $db['socket'] ?? null ); - config(['database.default', $this->connection]); + config('database.default', $this->connection); } } diff --git a/app/Http/Controllers/Table/PortsController.php b/app/Http/Controllers/Table/PortsController.php index 2c33c7b6cb..266677fd61 100644 --- a/app/Http/Controllers/Table/PortsController.php +++ b/app/Http/Controllers/Table/PortsController.php @@ -107,8 +107,8 @@ class PortsController extends TableController ->where('deleted', $request->get('deleted', 0)) // always filter deleted ->when($request->get('hostname'), function (Builder $query, $hostname) { $query->where(function (Builder $query) use ($hostname) { - $query->where('hostname', 'like', "%$hostname%") - ->orWhere('sysName', 'like', "%$hostname%"); + $query->where('devices.hostname', 'like', "%$hostname%") + ->orWhere('devices.sysName', 'like', "%$hostname%"); }); }) ->when($request->get('ifAlias'), function (Builder $query, $ifAlias) { diff --git a/app/Logging/Reporting/Middleware/AddGitInformation.php b/app/Logging/Reporting/Middleware/AddGitInformation.php index 11bba25bd6..6b36de4edc 100644 --- a/app/Logging/Reporting/Middleware/AddGitInformation.php +++ b/app/Logging/Reporting/Middleware/AddGitInformation.php @@ -28,7 +28,7 @@ namespace App\Logging\Reporting\Middleware; use LibreNMS\Util\Git; use Spatie\FlareClient\Report; -class AddGitInformation +class AddGitInformation implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware { /** * @param \Spatie\FlareClient\Report $report diff --git a/app/Logging/Reporting/Middleware/CleanContext.php b/app/Logging/Reporting/Middleware/CleanContext.php index b0c9bf14c3..2b16c882f1 100644 --- a/app/Logging/Reporting/Middleware/CleanContext.php +++ b/app/Logging/Reporting/Middleware/CleanContext.php @@ -27,7 +27,7 @@ namespace App\Logging\Reporting\Middleware; use Spatie\FlareClient\Report; -class CleanContext +class CleanContext implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware { /** * Middleware to remove sensitive data from the context. diff --git a/app/Logging/Reporting/Middleware/SetGroups.php b/app/Logging/Reporting/Middleware/SetGroups.php index 3578268912..0cf5228a28 100644 --- a/app/Logging/Reporting/Middleware/SetGroups.php +++ b/app/Logging/Reporting/Middleware/SetGroups.php @@ -28,7 +28,7 @@ namespace App\Logging\Reporting\Middleware; use LibreNMS\Util\Version; use Spatie\FlareClient\Report; -class SetGroups +class SetGroups implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware { /** * Middleware to set LibreNMS and Tools grouping data diff --git a/app/Logging/Reporting/Middleware/SetInstanceId.php b/app/Logging/Reporting/Middleware/SetInstanceId.php index 056db99619..43e8d9d551 100644 --- a/app/Logging/Reporting/Middleware/SetInstanceId.php +++ b/app/Logging/Reporting/Middleware/SetInstanceId.php @@ -25,11 +25,11 @@ namespace App\Logging\Reporting\Middleware; use App\Providers\ErrorReportingProvider; use Spatie\FlareClient\Report; -class SetInstanceId +class SetInstanceId implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware { /** * Middleware to add instance ID, piggybacks on the "user id" feature. - * + * * @param \Spatie\FlareClient\Report $report * @param callable $next * @return mixed diff --git a/app/Models/AlertTemplate.php b/app/Models/AlertTemplate.php index 62fa192a4b..5fcda93d00 100644 --- a/app/Models/AlertTemplate.php +++ b/app/Models/AlertTemplate.php @@ -26,6 +26,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Relations\HasManyThrough; +use Illuminate\Database\Eloquent\Relations\HasMany; class AlertTemplate extends BaseModel { @@ -33,7 +34,7 @@ class AlertTemplate extends BaseModel // ---- Define Relationships ---- - public function map() + public function map(): HasMany { return $this->hasMany(\App\Models\AlertTemplateMap::class, 'alert_templates_id', 'id'); } diff --git a/app/Models/ServiceTemplate.php b/app/Models/ServiceTemplate.php index e3e7327da3..3871c18478 100644 --- a/app/Models/ServiceTemplate.php +++ b/app/Models/ServiceTemplate.php @@ -162,7 +162,7 @@ class ServiceTemplate extends BaseModel } $template_ids = static::query() - ->with(['device_groups' => function ($query) { + ->with(['groups' => function ($query) { $query->select('device_groups.id'); }]) ->get() diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index ef6ef7d124..ffc8ffde44 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -12,7 +12,7 @@ class AuthServiceProvider extends ServiceProvider /** * The policy mappings for the application. * - * @var array + * @var array */ protected $policies = [ \App\Models\User::class => \App\Policies\UserPolicy::class, diff --git a/database/migrations/2019_07_09_150217_update_users_widgets_settings.php b/database/migrations/2019_07_09_150217_update_users_widgets_settings.php index 7e7ac07f30..c1c084be43 100644 --- a/database/migrations/2019_07_09_150217_update_users_widgets_settings.php +++ b/database/migrations/2019_07_09_150217_update_users_widgets_settings.php @@ -12,6 +12,7 @@ class UpdateUsersWidgetsSettings extends Migration */ public function up() { + /** @phpstan-ignore-next-line */ $widgets = UserWidget::where('widget_id', 1)->get(); foreach ($widgets as $widget) { $settings = $widget->settings; @@ -31,6 +32,7 @@ class UpdateUsersWidgetsSettings extends Migration */ public function down() { + /** @phpstan-ignore-next-line */ $widgets = UserWidget::where('widget_id', 1)->get(); foreach ($widgets as $widget) { $settings = $widget->settings;