Fixed doctrine cache

68publishers · Jan 6, 2023 · a7b141f · a7b141f
1 parent 6bf1d08
commit a7b141f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
 	],
 	"require": {
 		"php": "^7.1 || ^8.1",
-		"doctrine/orm": "^2.7",
+		"doctrine/orm": "^2.11",
 		"behat/transliterator": "^1.2"
 	},
 	"require-dev": {

diff --git a/src/DefinitionStorage/AnnotationSluggableDefinitionStorage.php b/src/DefinitionStorage/AnnotationSluggableDefinitionStorage.php
@@ -27,6 +27,7 @@ public function __construct(Doctrine\Common\Annotations\Reader $reader)
 	 * {@inheritDoc}
 	 *
 	 * @throws Doctrine\ORM\Mapping\MappingException
+	 * @throws \Psr\Cache\InvalidArgumentException
 	 * @throws \ReflectionException
 	 */
 	public function findSluggableDefinitions(Doctrine\ORM\EntityManagerInterface $em, string $entityClassName): array
@@ -38,19 +39,19 @@ public function findSluggableDefinitions(Doctrine\ORM\EntityManagerInterface $em
 			return $this->definitionStorage[$name];
 		}
 
-		/** @var \Doctrine\Common\Cache\Cache|NULL $cache */
-		$cache = $em->getMetadataFactory()->getCacheDriver();
+		$cache = $em->getConfiguration()->getMetadataCache();
+		$cacheItem = $cache ? $cache->getItem($name) : NULL;
 
-		if (NULL !== $cache && $cache->contains($name)) {
-			return $this->definitionStorage[$name] = unserialize($cache->fetch($name), [
+		if (NULL !== $cacheItem && $cacheItem->isHit()) {
+			return $this->definitionStorage[$name] = unserialize($cacheItem->get(), [
 				'allowed_classes' => TRUE,
 			]);
 		}
 
 		$this->definitionStorage[$name] = $this->createSluggableDefinitions($metadata);
 
-		if (NULL !== $cache) {
-			$cache->save($name, serialize($this->definitionStorage[$name]));
+		if (NULL !== $cacheItem) {
+			$cacheItem->set(serialize($this->definitionStorage[$name]));
 		}
 
 		return $this->definitionStorage[$name];
@@ -61,6 +62,7 @@ public function findSluggableDefinitions(Doctrine\ORM\EntityManagerInterface $em
 	 *
 	 * @throws Doctrine\ORM\Mapping\MappingException
 	 * @throws \ReflectionException
+	 * @throws \Psr\Cache\InvalidArgumentException
 	 */
 	public function getSluggableDefinition(Doctrine\ORM\EntityManagerInterface $em, string $entityClassName, string $fieldName): SixtyEightPublishers\DoctrineSluggable\Definition\SluggableDefinition
 	{