mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert string references to ::class (#14508)

Browse Source 
PHP 5.5.9 adds the new static `class` property which provides the fully qualified class name. This is preferred over using strings for class names since the `class` property references are checked by PHP.

Co-authored-by: Shift <shift@laravelshift.com>
This commit is contained in:
Jellyfrog
2022-10-25 15:31:46 +02:00
committed by GitHub
parent 8e3fe223ef
commit 44578b2935
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/Modules/Isis.php
View File

@@ -68,7 +68,7 @@ class Isis implements Module
? $os->discoverIsIs() ? $os->discoverIsIs()
: $this->discoverIsIsMib($os); : $this->discoverIsIsMib($os);
ModuleModelObserver::observe('\App\Models\IsisAdjacency'); ModuleModelObserver::observe(\App\Models\IsisAdjacency::class);
$this->syncModels($os->getDevice(), 'isisAdjacencies', $adjacencies); $this->syncModels($os->getDevice(), 'isisAdjacencies', $adjacencies);
} }

2
LibreNMS/Modules/Mempools.php
View File

@@ -61,7 +61,7 @@ class Mempools implements Module
}); });
$this->calculateAvailable($mempools); $this->calculateAvailable($mempools);
MempoolObserver::observe('\App\Models\Mempool'); MempoolObserver::observe(\App\Models\Mempool::class);
$this->syncModels($os->getDevice(), 'mempools', $mempools); $this->syncModels($os->getDevice(), 'mempools', $mempools);
echo PHP_EOL; echo PHP_EOL;

32
LibreNMS/Modules/Mpls.php
View File

@@ -57,35 +57,35 @@ class Mpls implements Module
{ {
if ($os instanceof MplsDiscovery) { if ($os instanceof MplsDiscovery) {
echo "\nMPLS LSPs: "; echo "\nMPLS LSPs: ";
ModuleModelObserver::observe('\App\Models\MplsLsp'); ModuleModelObserver::observe(\App\Models\MplsLsp::class);
$lsps = $this->syncModels($os->getDevice(), 'mplsLsps', $os->discoverMplsLsps()); $lsps = $this->syncModels($os->getDevice(), 'mplsLsps', $os->discoverMplsLsps());
echo "\nMPLS LSP Paths: "; echo "\nMPLS LSP Paths: ";
ModuleModelObserver::observe('\App\Models\MplsLspPath'); ModuleModelObserver::observe(\App\Models\MplsLspPath::class);
$paths = $this->syncModels($os->getDevice(), 'mplsLspPaths', $os->discoverMplsPaths($lsps)); $paths = $this->syncModels($os->getDevice(), 'mplsLspPaths', $os->discoverMplsPaths($lsps));
echo "\nMPLS SDPs: "; echo "\nMPLS SDPs: ";
ModuleModelObserver::observe('\App\Models\MplsSdp'); ModuleModelObserver::observe(\App\Models\MplsSdp::class);
$sdps = $this->syncModels($os->getDevice(), 'mplsSdps', $os->discoverMplsSdps()); $sdps = $this->syncModels($os->getDevice(), 'mplsSdps', $os->discoverMplsSdps());
echo "\nMPLS Services: "; echo "\nMPLS Services: ";
ModuleModelObserver::observe('\App\Models\MplsService'); ModuleModelObserver::observe(\App\Models\MplsService::class);
$svcs = $this->syncModels($os->getDevice(), 'mplsServices', $os->discoverMplsServices()); $svcs = $this->syncModels($os->getDevice(), 'mplsServices', $os->discoverMplsServices());
echo "\nMPLS SAPs: "; echo "\nMPLS SAPs: ";
ModuleModelObserver::observe('\App\Models\MplsSap'); ModuleModelObserver::observe(\App\Models\MplsSap::class);
$this->syncModels($os->getDevice(), 'mplsSaps', $os->discoverMplsSaps($svcs)); $this->syncModels($os->getDevice(), 'mplsSaps', $os->discoverMplsSaps($svcs));
echo "\nMPLS SDP Bindings: "; echo "\nMPLS SDP Bindings: ";
ModuleModelObserver::observe('\App\Models\MplsSdpBind'); ModuleModelObserver::observe(\App\Models\MplsSdpBind::class);
$this->syncModels($os->getDevice(), 'mplsSdpBinds', $os->discoverMplsSdpBinds($sdps, $svcs)); $this->syncModels($os->getDevice(), 'mplsSdpBinds', $os->discoverMplsSdpBinds($sdps, $svcs));
echo "\nMPLS Tunnel Active Routing Hops: "; echo "\nMPLS Tunnel Active Routing Hops: ";
ModuleModelObserver::observe('\App\Models\MplsTunnelArHop'); ModuleModelObserver::observe(\App\Models\MplsTunnelArHop::class);
$this->syncModels($os->getDevice(), 'mplsTunnelArHops', $os->discoverMplsTunnelArHops($paths)); $this->syncModels($os->getDevice(), 'mplsTunnelArHops', $os->discoverMplsTunnelArHops($paths));
echo "\nMPLS Tunnel Constrained Shortest Path First Hops: "; echo "\nMPLS Tunnel Constrained Shortest Path First Hops: ";
ModuleModelObserver::observe('\App\Models\MplsTunnelCHop'); ModuleModelObserver::observe(\App\Models\MplsTunnelCHop::class);
$this->syncModels($os->getDevice(), 'mplsTunnelCHops', $os->discoverMplsTunnelCHops($paths)); $this->syncModels($os->getDevice(), 'mplsTunnelCHops', $os->discoverMplsTunnelCHops($paths));
echo PHP_EOL; echo PHP_EOL;
@@ -106,49 +106,49 @@ class Mpls implements Module
if ($device->mplsLsps()->exists()) { if ($device->mplsLsps()->exists()) {
echo "\nMPLS LSPs: "; echo "\nMPLS LSPs: ";
ModuleModelObserver::observe('\App\Models\MplsLsp'); ModuleModelObserver::observe(\App\Models\MplsLsp::class);
$lsps = $this->syncModels($device, 'mplsLsps', $os->pollMplsLsps()); $lsps = $this->syncModels($device, 'mplsLsps', $os->pollMplsLsps());
} }
if ($device->mplsLspPaths()->exists()) { if ($device->mplsLspPaths()->exists()) {
echo "\nMPLS LSP Paths: "; echo "\nMPLS LSP Paths: ";
ModuleModelObserver::observe('\App\Models\MplsLspPath'); ModuleModelObserver::observe(\App\Models\MplsLspPath::class);
$paths = $this->syncModels($device, 'mplsLspPaths', $os->pollMplsPaths($lsps)); $paths = $this->syncModels($device, 'mplsLspPaths', $os->pollMplsPaths($lsps));
} }
if ($device->mplsSdps()->exists()) { if ($device->mplsSdps()->exists()) {
echo "\nMPLS SDPs: "; echo "\nMPLS SDPs: ";
ModuleModelObserver::observe('\App\Models\MplsSdp'); ModuleModelObserver::observe(\App\Models\MplsSdp::class);
$sdps = $this->syncModels($device, 'mplsSdps', $os->pollMplsSdps()); $sdps = $this->syncModels($device, 'mplsSdps', $os->pollMplsSdps());
} }
if ($device->mplsServices()->exists()) { if ($device->mplsServices()->exists()) {
echo "\nMPLS Services: "; echo "\nMPLS Services: ";
ModuleModelObserver::observe('\App\Models\MplsService'); ModuleModelObserver::observe(\App\Models\MplsService::class);
$svcs = $this->syncModels($device, 'mplsServices', $os->pollMplsServices()); $svcs = $this->syncModels($device, 'mplsServices', $os->pollMplsServices());
} }
if ($device->mplsSaps()->exists()) { if ($device->mplsSaps()->exists()) {
echo "\nMPLS SAPs: "; echo "\nMPLS SAPs: ";
ModuleModelObserver::observe('\App\Models\MplsSap'); ModuleModelObserver::observe(\App\Models\MplsSap::class);
$this->syncModels($device, 'mplsSaps', $os->pollMplsSaps($svcs)); $this->syncModels($device, 'mplsSaps', $os->pollMplsSaps($svcs));
} }
if ($device->mplsSdpBinds()->exists()) { if ($device->mplsSdpBinds()->exists()) {
echo "\nMPLS SDP Bindings: "; echo "\nMPLS SDP Bindings: ";
ModuleModelObserver::observe('\App\Models\MplsSdpBind'); ModuleModelObserver::observe(\App\Models\MplsSdpBind::class);
$this->syncModels($device, 'mplsSdpBinds', $os->pollMplsSdpBinds($sdps, $svcs)); $this->syncModels($device, 'mplsSdpBinds', $os->pollMplsSdpBinds($sdps, $svcs));
} }
if ($device->mplsTunnelArHops()->exists()) { if ($device->mplsTunnelArHops()->exists()) {
echo "\nMPLS Tunnel Active Routing Hops: "; echo "\nMPLS Tunnel Active Routing Hops: ";
ModuleModelObserver::observe('\App\Models\MplsTunnelArHop'); ModuleModelObserver::observe(\App\Models\MplsTunnelArHop::class);
$this->syncModels($device, 'mplsTunnelArHops', $os->pollMplsTunnelArHops($paths)); $this->syncModels($device, 'mplsTunnelArHops', $os->pollMplsTunnelArHops($paths));
} }
if ($device->mplsTunnelCHops()->exists()) { if ($device->mplsTunnelCHops()->exists()) {
echo "\nMPLS Tunnel Constrained Shortest Path First Hops: "; echo "\nMPLS Tunnel Constrained Shortest Path First Hops: ";
ModuleModelObserver::observe('\App\Models\MplsTunnelCHop'); ModuleModelObserver::observe(\App\Models\MplsTunnelCHop::class);
$this->syncModels($device, 'mplsTunnelCHops', $os->pollMplsTunnelCHops($paths)); $this->syncModels($device, 'mplsTunnelCHops', $os->pollMplsTunnelCHops($paths));
} }

2
app/Models/Vminfo.php
View File

@@ -54,6 +54,6 @@ class Vminfo extends DeviceRelatedModel
public function parentDevice(): HasOne public function parentDevice(): HasOne
{ {
return $this->hasOne('App\Models\Device', 'hostname', 'vmwVmDisplayName'); return $this->hasOne(\App\Models\Device::class, 'hostname', 'vmwVmDisplayName');
} }
} }