Prioritize Vendor\Namespace classes

cundd · Nov 27, 2018 · 8ffdb9a · 8ffdb9a
1 parent 67e2691
commit 8ffdb9a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/Classes/DataProvider/DataProvider.php b/Classes/DataProvider/DataProvider.php
@@ -72,9 +72,9 @@ public function getModelData($model)
     public function getRepositoryClassForResourceType(ResourceType $resourceType)
     {
         list($vendor, $extension, $model) = Utility::getClassNamePartsForResourceType($resourceType);
-        $repositoryClass = 'Tx_' . $extension . '_Domain_Repository_' . $model . 'Repository';
+        $repositoryClass = ($vendor ? $vendor . '\\' : '') . $extension . '\\Domain\\Repository\\' . $model . 'Repository';
         if (!class_exists($repositoryClass)) {
-            $repositoryClass = ($vendor ? $vendor . '\\' : '') . $extension . '\\Domain\\Repository\\' . $model . 'Repository';
+            $repositoryClass = 'Tx_' . $extension . '_Domain_Repository_' . $model . 'Repository';
         }
 
         return $repositoryClass;
@@ -110,9 +110,9 @@ public function getRepositoryForResourceType(ResourceType $resourceType)
     public function getModelClassForResourceType(ResourceType $resourceType)
     {
         list($vendor, $extension, $model) = Utility::getClassNamePartsForResourceType($resourceType);
-        $modelClass = 'Tx_' . $extension . '_Domain_Model_' . $model;
+        $modelClass = ($vendor ? $vendor . '\\' : '') . $extension . '\\Domain\\Model\\' . $model;
         if (!class_exists($modelClass)) {
-            $modelClass = ($vendor ? $vendor . '\\' : '') . $extension . '\\Domain\\Model\\' . $model;
+            $modelClass = 'Tx_' . $extension . '_Domain_Model_' . $model;
         }
 
         return $modelClass;

diff --git a/Tests/Functional/DataProvider/DataProviderTest.php b/Tests/Functional/DataProvider/DataProviderTest.php
@@ -82,18 +82,18 @@ public function convertTest()
         /** @var MethodProphecy $methodProphecy */
         $methodProphecy = $propertyMapperMock->convert(
             Argument::exact($data),
-            Argument::exact('AVendor\\AnotherExt\\Domain\\Model\\MyModel'),
+            Argument::exact('Tx_AnotherExt_Domain_Model_MyModel'),
             Argument::type(PropertyMappingConfigurationInterface::class)
         );
 
         $methodProphecy->shouldBeCalled();
 
-        /** @var ObjectProphecy|ObjectManagerInterface $om */
-        $om = $this->prophesize(ObjectManagerInterface::class);
+        /** @var ObjectProphecy|ObjectManagerInterface $objectManagerProphecy */
+        $objectManagerProphecy = $this->prophesize(ObjectManagerInterface::class);
 
         $propertyMapper = $propertyMapperMock->reveal();
         /** @var MethodProphecy $methodProphecy */
-        $om->get(Argument::type('string'))->will(
+        $objectManagerProphecy->get(Argument::type('string'))->will(
             function ($args) use ($propertyMapper, $concreteObjectManager) {
                 if ($args[0] === PropertyMapper::class) {
                     return $propertyMapper;
@@ -103,10 +103,15 @@ function ($args) use ($propertyMapper, $concreteObjectManager) {
             }
         );
 
+        /** @var ObjectManagerInterface $objectManager */
+        $objectManager = $objectManagerProphecy->reveal();
+
+        /** @var IdentityProviderInterface $identityProvider */
+        $identityProvider = $this->prophesize(IdentityProviderInterface::class)->reveal();
         $this->fixture = new DataProvider(
-            $om->reveal(),
+            $objectManager,
             new Extractor(new ConfigurationProvider()),
-            $this->prophesize(IdentityProviderInterface::class)->reveal()
+            $identityProvider
         );
 
         //$this->injectPropertyIntoObject()