Improve the exception when the APCu extension is not enabled or installed

And fix the tests that where not marked as depending on the extension, tearDown was failing

Signed-off-by: William Desportes <williamdes@wdes.fr>

Author: williamdes

phpstan-baseline.neon

@@ -31,7 +31,7 @@ parameters:
 			path: src/Loader.php
 
 		-
-			message: '#^Offset ''lang'' on array\{0\: string, lang\: non\-falsy\-string, 1\: non\-falsy\-string, country\?\: string, 2\?\: string, charset\?\: string, 3\?\: string, modifier\?\: non\-empty\-string, \.\.\.\} on left side of \?\? always exists and is not nullable\.$#'
+			message: '#^Offset ''lang'' on array\{0\: non\-falsy\-string, lang\: non\-falsy\-string, 1\: non\-falsy\-string, country\?\: string, 2\?\: string, charset\?\: string, 3\?\: string, modifier\?\: non\-empty\-string, \.\.\.\} on left side of \?\? always exists and is not nullable\.$#'
 			identifier: nullCoalesce.offset
 			count: 1
 			path: src/Loader.php
@@ -84,12 +84,6 @@ parameters:
 			count: 1
 			path: tests/Cache/ApcuCacheTest.php
 
-		-
-			message: '#^Dynamic call to static method PHPUnit\\Framework\\Assert\:\:markTestSkipped\(\)\.$#'
-			identifier: staticMethod.dynamicCall
-			count: 1
-			path: tests/Cache/ApcuDisabledTest.php
-
 		-
 			message: '#^Dynamic call to static method PHPUnit\\Framework\\Assert\:\:isInstanceOf\(\)\.$#'
 			identifier: staticMethod.dynamicCall

src/Cache/ApcuCache.php

@@ -32,8 +32,12 @@ public function __construct(
         private bool $reloadOnMiss = true,
         private string $prefix = 'mo_',
     ) {
-        if (! (function_exists('apcu_enabled') && apcu_enabled())) {
-            throw new CacheException('APCu extension must be installed and enabled');
+        if (! function_exists('apcu_enabled')) {
+            throw new CacheException('The APCu extension must be installed.');
+        }
+
+        if (! apcu_enabled()) {
+            throw new CacheException('The APCu extension must be enabled (apc.enabled=1) or (apc.enable_cli=1)');
         }
 
         $this->ensureTranslationsLoaded();

tests/Cache/ApcuCacheFactoryTest.php

@@ -8,27 +8,28 @@
 use PhpMyAdmin\MoTranslator\Cache\ApcuCacheFactory;
 use PhpMyAdmin\MoTranslator\MoParser;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 
 use function apcu_clear_cache;
 use function apcu_delete;
 use function apcu_enabled;
 use function apcu_fetch;
-use function function_exists;
 use function sleep;
 
 #[CoversClass(ApcuCacheFactory::class)]
+#[RequiresPhpExtension('apcu')]
 class ApcuCacheFactoryTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
 
-        if (function_exists('apcu_enabled') && apcu_enabled()) {
+        if (apcu_enabled()) {
             return;
         }
 
-        $this->markTestSkipped('APCu extension is not installed and enabled for CLI');
+        $this->markTestSkipped('The APCu extension is not enabled for the CLI (apc.enable_cli=1)');
     }
 
     protected function tearDown(): void

tests/Cache/ApcuCacheTest.php

@@ -7,6 +7,7 @@
 use PhpMyAdmin\MoTranslator\Cache\ApcuCache;
 use PhpMyAdmin\MoTranslator\MoParser;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use ReflectionMethod;
 
@@ -17,22 +18,22 @@
 use function apcu_fetch;
 use function chr;
 use function explode;
-use function function_exists;
 use function implode;
 use function sleep;
 
 #[CoversClass(ApcuCache::class)]
+#[RequiresPhpExtension('apcu')]
 class ApcuCacheTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
 
-        if (function_exists('apcu_enabled') && apcu_enabled()) {
+        if (apcu_enabled()) {
             return;
         }
 
-        $this->markTestSkipped('APCu extension is not installed and enabled for CLI');
+        $this->markTestSkipped('The APCu extension is not enabled for the CLI (apc.enable_cli=1)');
     }
 
     protected function tearDown(): void

tests/Cache/ApcuDisabledTest.php

@@ -7,21 +7,34 @@
 use PhpMyAdmin\MoTranslator\Cache\ApcuCache;
 use PhpMyAdmin\MoTranslator\CacheException;
 use PhpMyAdmin\MoTranslator\MoParser;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 
 use function apcu_enabled;
 use function function_exists;
 
 final class ApcuDisabledTest extends TestCase
 {
+    public function testConstructorApcuNotInstalledThrowsException(): void
+    {
+        if (function_exists('apcu_enabled')) {
+            self::markTestSkipped('ext-apcu is installed.');
+        }
+
+        $this->expectException(CacheException::class);
+        $this->expectExceptionMessage('The APCu extension must be installed.');
+        new ApcuCache(new MoParser(null), 'foo', 'bar');
+    }
+
+    #[RequiresPhpExtension('apcu')]
     public function testConstructorApcuNotEnabledThrowsException(): void
     {
         if (function_exists('apcu_enabled') && apcu_enabled()) {
-            $this->markTestSkipped('ext-apcu is enabled');
+            self::markTestSkipped('ext-apcu is enabled');
         }
 
         $this->expectException(CacheException::class);
-        $this->expectExceptionMessage('APCu extension must be installed and enabled');
+        $this->expectExceptionMessage('The APCu extension must be enabled (apc.enabled=1) or (apc.enable_cli=1)');
         new ApcuCache(new MoParser(null), 'foo', 'bar');
     }
 }