Revert "[BUGFIX] Do not treat all classes as entities in ClassSchema" 98/59798/2
authorAnja Leichsenring <aleichsenring@ab-softlab.de>
Mon, 25 Feb 2019 09:07:48 +0000 (10:07 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Tue, 26 Feb 2019 08:55:24 +0000 (09:55 +0100)
This reverts commit 7b320c723a59f677fefb56e12cc43da3fbcb4a08.

Reason for revert: see ticket, attempt to fix and discussion here: https://review.typo3.org/c/Packages/TYPO3.CMS/+/59793

Change-Id: I2dbbfe0246814b50e5e6ad9eb1828590c6506445
Reviewed-on: https://review.typo3.org/c/59798
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php
typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithAllTypesOfProperties.php

index 9136fd9..4aa4860 100644 (file)
@@ -78,7 +78,7 @@ class ClassSchema
      *
      * @var int
      */
-    protected $modelType = 0;
+    protected $modelType = self::MODELTYPE_ENTITY;
 
     /**
      * Whether a repository exists for the class this schema is referring to
index 1d767f6..de1a3c3 100644 (file)
@@ -66,11 +66,6 @@ class ClassSchemaTest extends UnitTestCase
                 'propertyWithCascadeAnnotationWithoutVarAnnotation',
                 'propertyWithObjectStorageAnnotation',
                 'propertyWithObjectStorageAnnotationWithoutFQCN',
-                'uid',
-                '_localizedUid',
-                '_languageUid',
-                '_versionedUid',
-                'pid',
             ],
             array_keys((new ClassSchema(Fixture\DummyClassWithAllTypesOfProperties::class))->getProperties())
         );
index 3876c69..bfa9128 100644 (file)
@@ -16,13 +16,12 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Reflection\Fixture;
 
 use TYPO3\CMS\Extbase\Annotation as Extbase;
 use TYPO3\CMS\Extbase\Annotation\ORM\Transient;
-use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
 /**
  * Fixture class with getters and setters
  */
-class DummyClassWithAllTypesOfProperties extends AbstractEntity
+class DummyClassWithAllTypesOfProperties
 {
     public $publicProperty;