Skip to content

Commit bd731fe

Browse files
authored
Merge pull request #72 from itk-dev/feature/support-1167-timestampable-bug
SUPPORT-1167: Applied patch to fix issue with timestampable
2 parents 3a128e4 + 45840ac commit bd731fe

File tree

4 files changed

+73
-6
lines changed

4 files changed

+73
-6
lines changed

CHANGELOG.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11-
## [1.6.1] - 2023-08-17
11+
* [PR-72](https://github.com/itk-dev/kunstdatabasen/pull/72)
12+
Applied patch to issue with timestampable.
1213

13-
### Changed
14+
## [1.6.1] - 2023-08-17
1415

1516
* [PR-69](https://github.com/itk-dev/kunstdatabasen/pull/69)
1617
Fixed image carousels.
1718
Changed default ordering to by createdAt descending.
1819

1920
## [1.6.0] - 2023-08-10
2021

21-
### Changed
22-
2322
* [PR-68](https://github.com/itk-dev/kunstdatabasen/pull/68)
2423
Upgraded to Symfony 6.3.
2524

composer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"php": ">=8.1",
88
"ext-ctype": "*",
99
"ext-iconv": "*",
10+
"cweagans/composer-patches": "^1.7",
1011
"doctrine/doctrine-bundle": "^2.10",
1112
"doctrine/doctrine-migrations-bundle": "^3.2",
1213
"doctrine/orm": "^2.15",
@@ -48,7 +49,8 @@
4849
"allow-plugins": {
4950
"php-http/discovery": true,
5051
"symfony/flex": true,
51-
"symfony/runtime": true
52+
"symfony/runtime": true,
53+
"cweagans/composer-patches": true
5254
},
5355
"sort-packages": true
5456
},
@@ -112,6 +114,11 @@
112114
"symfony": {
113115
"allow-contrib": true,
114116
"require": "6.3.*"
117+
},
118+
"patches": {
119+
"gedmo/doctrine-extensions": {
120+
"https://github.com/doctrine-extensions/DoctrineExtensions/pull/2651": "patches/doctrine-extension1.patch"
121+
}
115122
}
116123
}
117124
}

composer.lock

Lines changed: 49 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

patches/doctrine-extension1.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/Mapping/ExtensionMetadataFactory.php b/src/Mapping/ExtensionMetadataFactory.php
2+
index 95909809..6c9773cb 100644
3+
--- a/src/Mapping/ExtensionMetadataFactory.php
4+
+++ b/src/Mapping/ExtensionMetadataFactory.php
5+
@@ -114,7 +114,7 @@ class ExtensionMetadataFactory
6+
if (null !== $meta->reflClass) {
7+
foreach (array_reverse(class_parents($meta->getName())) as $parentClass) {
8+
// read only inherited mapped classes
9+
- if ($cmf->hasMetadataFor($parentClass)) {
10+
+ if ($cmf->hasMetadataFor($parentClass) || !$cmf->isTransient($parentClass)) {
11+
assert(class_exists($parentClass));
12+
13+
$class = $this->objectManager->getClassMetadata($parentClass);

0 commit comments

Comments
 (0)