replace kdyby/cache with doctrine/cache directly and kdyby/annotations with nettrine/annotations

Author: dakorpar

composer.json

@@ -24,9 +24,10 @@
 		"nette/php-generator": "^3.0",
 		"nette/tokenizer": "~3.0",
 		"nette/reflection": "^2.4",
-		"kdyby/annotations": "^3.0",
+		"nettrine/annotations": "^0.7",
 		"symfony/property-access": "^4.4|~5.0",
-		"symfony/polyfill-ctype": "^1.0"
+		"symfony/polyfill-ctype": "^1.0",
+		"nettrine/cache": "^0.3"
 	},
 	"require-dev": {
 		"nette/application": "^3.0.1",
@@ -45,7 +46,6 @@
 		"nette/utils": "^3.1",
 		"latte/latte": "~2.5",
 		"tracy/tracy": "~2.6",
-		"kdyby/doctrine-cache": "^2.6",
 		"nette/tester": "^2.3.4",
 		"doctrine/collections": "~1.6"
 	},

docs/en/index.md

@@ -17,7 +17,7 @@ You can enable the extension using your neon config.
 ```yml
 extensions:
 	aop: Kdyby\Aop\DI\AopExtension
-	annotations: Kdyby\Annotations\DI\AnnotationsExtension
+	annotations: Nettrine\Annotations\DI\AnnotationsExtension
 	aspects: Kdyby\Aop\DI\AspectsExtension
 ```
 

tests/KdybyTests/Aop/Extension.phpt

@@ -44,7 +44,7 @@ class ExtensionTest extends Tester\TestCase
 		$config->addConfig(__DIR__ . '/config/' . $configFile . '.neon');
 
 		$config->onCompile[] = function (Nette\Configurator $config, Nette\DI\Compiler $compiler): void {
-			$compiler->addExtension('annotations', new Kdyby\Annotations\DI\AnnotationsExtension());
+			$compiler->addExtension('annotations', new Nettrine\Cache\DI\CacheExtension());
 		};
 		Kdyby\Aop\DI\AspectsExtension::register($config);
 		Kdyby\Aop\DI\AopExtension::register($config);