Merge branch 'master' into deprecated-string-var

murrant · Nov 23, 2024 · 4947755 · 4947755
2 parents be585d7 + 12559a5
commit 4947755
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1]
+        php: [8.3]
     steps:
       -
         name: Checkout Code

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,12 +24,12 @@ jobs:
             skip-web-check: 1
             database: mariadb:10.5
           -
-            php-version: 8.1
+            php-version: 8.2
             name: Unit
             skip-web-check: 1
             database: mysql:8.0
           -
-            php-version: 8.1
+            php-version: 8.2
             name: Web
             skip-unit-check: 1
             database: mariadb:10.11

diff --git a/LibreNMS/Util/DynamicConfigItem.php b/LibreNMS/Util/DynamicConfigItem.php
@@ -25,7 +25,7 @@
 
 namespace LibreNMS\Util;
 
-use LibreNMS\Config;
+use App\Facades\LibrenmsConfig;
 use Validator;
 
 #[\AllowDynamicProperties]
@@ -50,7 +50,7 @@ class DynamicConfigItem implements \ArrayAccess
     public function __construct($name, $settings = [])
     {
         $this->name = $name;
-        $this->value = Config::get($this->name, $this->default);
+        $this->value = LibrenmsConfig::get($this->name, $this->default);
 
         foreach ($settings as $key => $value) {
             $this->$key = $value;

diff --git a/app/Models/Device.php b/app/Models/Device.php
@@ -547,7 +547,6 @@ public function scopeIsDown($query)
     {
         return $query->where([
             ['status', '=', 0],
-            ['disable_notify', '=', 0],
             ['ignore', '=', 0],
             ['disabled', '=', 0],
         ]);

diff --git a/tests/Unit/ConfigItemTest.php b/tests/Unit/ConfigItemTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
+use LibreNMS\Tests\TestCase;
 use LibreNMS\Util\DynamicConfigItem;
-use PHPUnit\Framework\TestCase;
 
 class ConfigItemTest extends TestCase
 {