Merge branch 'develop'

Author: tuj

CHANGELOG.md

@@ -8,18 +8,19 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-## [1.6.1] - 2023-08-17
+## [1.6.2] - 2023-08-20
+
+* [PR-72](https://github.com/itk-dev/kunstdatabasen/pull/72)
+  Applied patch to issue with timestampable.
 
-### Changed
+## [1.6.1] - 2023-08-17
 
 * [PR-69](https://github.com/itk-dev/kunstdatabasen/pull/69)
   Fixed image carousels.
   Changed default ordering to by createdAt descending.
 
 ## [1.6.0] - 2023-08-10
 
-### Changed
-
 * [PR-68](https://github.com/itk-dev/kunstdatabasen/pull/68)
   Upgraded to Symfony 6.3.
 

composer.json

@@ -7,6 +7,7 @@
         "php": ">=8.1",
         "ext-ctype": "*",
         "ext-iconv": "*",
+        "cweagans/composer-patches": "^1.7",
         "doctrine/doctrine-bundle": "^2.10",
         "doctrine/doctrine-migrations-bundle": "^3.2",
         "doctrine/orm": "^2.15",
@@ -48,7 +49,8 @@
         "allow-plugins": {
             "php-http/discovery": true,
             "symfony/flex": true,
-            "symfony/runtime": true
+            "symfony/runtime": true,
+            "cweagans/composer-patches": true
         },
         "sort-packages": true
     },
@@ -112,6 +114,11 @@
         "symfony": {
             "allow-contrib": true,
             "require": "6.3.*"
+        },
+        "patches": {
+            "gedmo/doctrine-extensions": {
+                "https://github.com/doctrine-extensions/DoctrineExtensions/pull/2651": "patches/doctrine-extension1.patch"
+            }
         }
     }
 }

composer.lock

@@ -0,0 +1,13 @@
+diff --git a/src/Mapping/ExtensionMetadataFactory.php b/src/Mapping/ExtensionMetadataFactory.php
+index 95909809..6c9773cb 100644
+--- a/src/Mapping/ExtensionMetadataFactory.php
++++ b/src/Mapping/ExtensionMetadataFactory.php
+@@ -114,7 +114,7 @@ class ExtensionMetadataFactory
+         if (null !== $meta->reflClass) {
+             foreach (array_reverse(class_parents($meta->getName())) as $parentClass) {
+                 // read only inherited mapped classes
+-                if ($cmf->hasMetadataFor($parentClass)) {
++                if ($cmf->hasMetadataFor($parentClass) || !$cmf->isTransient($parentClass)) {
+                     assert(class_exists($parentClass));
+ 
+                     $class = $this->objectManager->getClassMetadata($parentClass);