tests: fix tests and phpstan config

Author: janpalicka

composer.json

@@ -20,7 +20,8 @@
   "require-dev": {
     "contributte/phpstan": "^0.1",
     "contributte/qa": "^0.4",
-    "contributte/tester": "^0.3"
+    "contributte/tester": "^0.3",
+    "symfony/cache": "^7.2"
   },
   "autoload": {
     "psr-4": {

phpstan.neon

@@ -16,6 +16,3 @@ parameters:
 		- .docs
 
 	ignoreErrors:
-		# No replacement available
-		- '#Call to deprecated method registerUniqueLoader\(\) of class Doctrine\\Common\\Annotations\\AnnotationRegistry.#'
-		- '#Fetching class constant class of deprecated class Doctrine\\Common\\Annotations\\CachedReader#'

tests/Cases/DI/AnnotationsExtensionTest.php

@@ -5,15 +5,13 @@
 use Contributte\Tester\Environment;
 use Contributte\Tester\Utils\ContainerBuilder;
 use Contributte\Tester\Utils\Neonkit;
-use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\ApcuCache;
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\PhpFileCache;
 use Nette\DI\Compiler;
 use Nette\InvalidStateException;
 use Nettrine\Annotations\DI\AnnotationsExtension;
-use Nettrine\Cache\DI\CacheExtension;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
 use Tester\Assert;
 use Tester\TestCase;
 
@@ -27,18 +25,20 @@ public function testAutowiredCache(): void
 		$container = ContainerBuilder::of()
 			->withCompiler(function (Compiler $compiler): void {
 				$compiler->addExtension('annotations', new AnnotationsExtension());
-				$compiler->addExtension('cache', new CacheExtension());
 				$compiler->addConfig([
 					'parameters' => [
 						'tempDir' => Environment::getTestDir(),
 					],
+					'annotations' => [
+						'cache' => PhpFilesAdapter::class, // Use PSR-6 cache
+					],
 				]);
 				$compiler->addDependencies([__FILE__]);
 			})
 			->build();
 
-		Assert::type(CachedReader::class, $container->getByType(Reader::class));
-		Assert::type(PhpFileCache::class, $container->getService('cache.driver'));
+		Assert::type(PsrCachedReader::class, $container->getByType(Reader::class));
+		Assert::type(PhpFilesAdapter::class, $container->getService('annotations.cache'));
 	}
 
 	public function testProvidedCache(): void
@@ -47,16 +47,15 @@ public function testProvidedCache(): void
 			->withCompiler(function (Compiler $compiler): void {
 				$compiler->addExtension('annotations', new AnnotationsExtension());
 				$compiler->addConfig(Neonkit::load('
-					annotations:
-						cache: Doctrine\Common\Cache\ApcuCache
-				'));
+                    annotations:
+                        cache: Symfony\Component\Cache\Adapter\ArrayAdapter
+                '));
 				$compiler->addDependencies([__FILE__]);
 			})
 			->build();
 
-		Assert::type(CachedReader::class, $container->getByType(Reader::class));
-		Assert::type(ApcuCache::class, $container->getService('annotations.cache'));
-		Assert::null($container->getByType(Cache::class, false));
+		Assert::type(PsrCachedReader::class, $container->getByType(Reader::class));
+		Assert::type(ArrayAdapter::class, $container->getService('annotations.cache'));
 	}
 
 	public function testNoCache(): void

tests/Cases/Reader/ReaderTest.php

@@ -4,11 +4,11 @@
 
 use Contributte\Tester\Environment;
 use Contributte\Tester\Utils\ContainerBuilder;
-use Contributte\Tester\Utils\Neonkit;
 use Doctrine\Common\Annotations\Reader;
 use Nette\DI\Compiler;
 use Nettrine\Annotations\DI\AnnotationsExtension;
 use ReflectionClass;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Tester\Assert;
 use Tester\TestCase;
 use Tests\Fixtures\SampleAnnotation;
@@ -25,12 +25,15 @@ public function testIgnoreAnnotations(): void
 			->withCompiler(function (Compiler $compiler): void {
 				$compiler->addExtension('annotations', new AnnotationsExtension());
 				$compiler->addConfig(['parameters' => ['tempDir' => Environment::getTestDir()]]);
-				$compiler->addConfig(Neonkit::load('
-					annotations:
-						cache: Doctrine\Common\Cache\FilesystemCache(%tempDir%/nettrine.annotations)
-						ignore:
-							- ignoredAnnotation
-				'));
+				$compiler->addConfig([
+					'parameters' => [
+						'tempDir' => Environment::getTestDir(),
+					],
+					'annotations' => [
+						'cache' => FilesystemAdapter::class,
+						'ignore' => ['ignoredAnnotation'],
+					],
+				]);
 				$compiler->addDependencies([__FILE__]);
 			})
 			->build();