Reverted not necessary changes

Author: fwolfsjaeger

CHANGELOG.md

@@ -18,6 +18,7 @@ a release.
 ---
 
 ## [Unreleased]
+- Blameable/IpTraceable/SoftDeletable/Timestampable: Added functionality to use setter method instead of setting property values directly (#2644)
 
 ## [3.15.0]
 ### Added
@@ -60,9 +61,6 @@ a release.
 - Fix bug collecting metadata for inherited mapped classes
 
 ## [3.12.0] - 2023-07-08
-### Added
-- Blameable/IpTraceable/SoftDeletable/Timestampable: Added functionality to use setter method instead of setting property values directly (#2644)
-
 ### Added
 - Tree: `setSibling()` and `getSibling()` methods in the `Node` interface through the BC `@method` annotation
 - Tree: Support array of fields and directions in the `$sortByField` and `$direction` parameters at `AbstractTreeRepository::recover()`

src/Blameable/Mapping/Driver/Annotation.php

@@ -46,16 +46,13 @@ public function readExtendedMetadata($meta, array &$config)
         $class = $this->getMetaReflectionClass($meta);
         // property annotations
         foreach ($class->getProperties() as $property) {
-            if (
-                isset($meta->associationMappings[$property->name]['inherited'])
-                || ($meta->isMappedSuperclass && !$property->isPrivate())
+            if ($meta->isMappedSuperclass && !$property->isPrivate()
                 || $meta->isInheritedField($property->name)
+                || isset($meta->associationMappings[$property->name]['inherited'])
             ) {
                 continue;
             }
             if ($blameable = $this->reader->getPropertyAnnotation($property, self::BLAMEABLE)) {
-                assert($blameable instanceof Blameable);
-
                 $field = $property->getName();
 
                 if (!$meta->hasField($field) && !$meta->hasAssociation($field)) {

src/IpTraceable/Mapping/Driver/Annotation.php

@@ -44,16 +44,13 @@ public function readExtendedMetadata($meta, array &$config)
         $class = $this->getMetaReflectionClass($meta);
         // property annotations
         foreach ($class->getProperties() as $property) {
-            if (
-                isset($meta->associationMappings[$property->name]['inherited'])
-                || ($meta->isMappedSuperclass && !$property->isPrivate())
+            if ($meta->isMappedSuperclass && !$property->isPrivate()
                 || $meta->isInheritedField($property->name)
+                || isset($meta->associationMappings[$property->name]['inherited'])
             ) {
                 continue;
             }
             if ($ipTraceable = $this->reader->getPropertyAnnotation($property, self::IP_TRACEABLE)) {
-                assert($ipTraceable instanceof IpTraceable);
-
                 $field = $property->getName();
 
                 if (!$meta->hasField($field)) {

src/SoftDeleteable/Mapping/Driver/Annotation.php

@@ -37,8 +37,6 @@ public function readExtendedMetadata($meta, array &$config)
         $class = $this->getMetaReflectionClass($meta);
         // class annotations
         if (null !== $class && $annot = $this->reader->getClassAnnotation($class, self::SOFT_DELETEABLE)) {
-            assert($annot instanceof SoftDeleteable);
-
             $config['softDeleteable'] = true;
 
             Validator::validateField($meta, $annot->fieldName);

src/Timestampable/Mapping/Driver/Annotation.php

@@ -54,15 +54,13 @@ public function readExtendedMetadata($meta, array &$config)
         $class = $this->getMetaReflectionClass($meta);
         // property annotations
         foreach ($class->getProperties() as $property) {
-            if (
-                isset($meta->associationMappings[$property->name]['inherited'])
-                || ($meta->isMappedSuperclass && !$property->isPrivate())
+            if ($meta->isMappedSuperclass && !$property->isPrivate()
                 || $meta->isInheritedField($property->name)
+                || isset($meta->associationMappings[$property->name]['inherited'])
             ) {
                 continue;
             }
             if ($timestampable = $this->reader->getPropertyAnnotation($property, self::TIMESTAMPABLE)) {
-                assert($timestampable instanceof Timestampable);
                 $field = $property->getName();
                 if (!$meta->hasField($field)) {
                     throw new InvalidMappingException("Unable to find timestampable [{$field}] as mapped property in entity - {$meta->getName()}");