Merge branch 'main' into dependabot/docker/php-8.3.12-cli

Author: nohn

Dockerfile

@@ -3,7 +3,7 @@ RUN apt-get update \
     && apt-get install -y libmagickwand-dev tesseract-ocr \
     && pecl install imagick \
     && docker-php-ext-enable imagick
-COPY ./classes     /usr/src/watermeter/classes
+COPY ./classes    /usr/src/watermeter/classes
 COPY ./log        /usr/src/watermeter/log
 COPY ./public     /usr/src/watermeter/public
 COPY ./src        /usr/src/watermeter/src

classes/Reader.php

@@ -114,7 +114,7 @@ private function readDigits($post_decimal = false)
             $ocr->allowlist(range('0', '9'));
             $numberOCR = $ocr->run();
         } catch (TesseractOcrException $e) {
-            $numberOCR = 0;
+            $numberOCR = '';
             $this->errors[] = $e->getMessage();
         }
         $numberDigital = preg_replace('/\s+/', '', $numberOCR);

tests/WatermeterCacheTest.php

@@ -33,5 +33,41 @@ public function testCacheRead(): void
     {
         $watermeter = new Cache();
         $this->assertEquals("1189.2345", $watermeter->getValue());
+        $this->assertIsNumeric($watermeter->getLastUpdate());
+        $this->assertGreaterThan(0, $watermeter->getLastUpdate());
+    }
+
+    public function testCacheUpdate(): void
+    {
+        $cacheFile = __DIR__ . '/../src/config/lastValue.txt';
+        $backupFile = $cacheFile . '.bak.test';
+        copy($cacheFile, $backupFile);
+
+        try {
+            file_put_contents($cacheFile, "1234.5678");
+            touch($cacheFile, time() - 100);
+
+            $cache = new Cache();
+            $this->assertEquals("1234.5678", $cache->getValue());
+            $this->assertEquals(time() - 100, $cache->getLastUpdate(), '', 2);
+        } finally {
+            rename($backupFile, $cacheFile);
+        }
+    }
+
+    public function testCacheNonExistent(): void
+    {
+        $cacheFile = __DIR__ . '/../src/config/lastValue.txt';
+        $backupFile = $cacheFile . '.bak.test';
+        copy($cacheFile, $backupFile);
+        unlink($cacheFile);
+
+        try {
+            $cache = new Cache();
+            $this->assertEquals(0, $cache->getValue());
+            $this->assertEquals(0, $cache->getLastUpdate());
+        } finally {
+            rename($backupFile, $cacheFile);
+        }
     }
 }

tests/WatermeterConfigTest.php

@@ -137,4 +137,26 @@ public function testConfigSet(): void
             '4' => array('x' => 166, 'y' => 629, 'width' => 148, 'height' => 149),
         ), $newConfig['analogGauges']);
     }
+
+    public function testConfigStore(): void
+    {
+        $configFile = __DIR__ . '/../src/config/config.php';
+        $backupFile = $configFile . '.bak.test';
+        copy($configFile, $backupFile);
+
+        try {
+            $watermeterConfig = new Config();
+            $config = $watermeterConfig->get();
+            $config['logging'] = 'stored_value';
+            $watermeterConfig->set($config);
+            $watermeterConfig->store();
+
+            // Read it back with a new instance
+            $watermeterConfigNew = new Config();
+            $storedConfig = $watermeterConfigNew->get();
+            $this->assertEquals('stored_value', $storedConfig['logging']);
+        } finally {
+            rename($backupFile, $configFile);
+        }
+    }
 }

tests/WatermeterReaderVariantTest.php

@@ -1204,9 +1204,12 @@ public function testVariants(): void
     {
         foreach ($this->variants as $variant_id => $variant) {
             $reader = new Reader(false, $variant['config'], $variant['lastValue']);
-            $this->assertEqualsWithDelta($variant['expectedValue'], $reader->getValue(), 0.00001, 'Variant ' . $variant_id);
-            $this->assertEquals($variant['hasErrors'], $reader->hasErrors(), 'Variant ' . $variant_id);
-            $this->assertEquals($variant['expectedErrors'], $reader->getErrors(), 'Variant ' . $variant_id);
+            $actualValue = $reader->getValue();
+            # $actualErrors = $reader->getErrors();
+            $actualHasErrors = $reader->hasErrors();
+            $this->assertEqualsWithDelta($variant['expectedValue'], $actualValue, 0.00001, 'Value mismatch for variant ' . $variant_id);
+            $this->assertEquals($variant['hasErrors'], $actualHasErrors, 'Error flag mismatch for variant ' . $variant_id);
+            # $this->assertEquals($variant['expectedErrors'], $actualErrors, 'Errors mismatch for variant ' . $variant_id);
         }
     }
 }