Merge "[~BUGFIX] correct annotations of Tx_Extbase_Persistence_Mapper_DataMapper"

diff --git a/typo3/sysext/extbase/Classes/Persistence/Backend.php b/typo3/sysext/extbase/Classes/Persistence/Backend.php
index f806b88..48fd626 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Backend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Backend.php
@@ -76,7 +76,7 @@ class Tx_Extbase_Persistence_Backend implements Tx_Extbase_Persistence_BackendIn
        protected $storageBackend;
 
        /**
-        * @var Tx_Extbase_Persistence_DataMapper
+        * @var Tx_Extbase_Persistence_Mapper_DataMapper
         */
        protected $dataMapper;
 

diff --git a/typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php b/typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php
index 9d487e5..6c699d7 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php
+++ b/typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php
@@ -36,7 +36,7 @@
 class Tx_Extbase_Persistence_LazyLoadingProxy implements Iterator, Tx_Extbase_Persistence_LoadingStrategyInterface {
 
        /**
-        * @var Tx_Extbase_Persistence_DataMapper
+        * @var Tx_Extbase_Persistence_Mapper_DataMapper
         */
        protected $dataMapper;
 

diff --git a/typo3/sysext/extbase/Classes/Persistence/LazyObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/LazyObjectStorage.php
index 779480c..63fcc47 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/LazyObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/LazyObjectStorage.php
@@ -46,7 +46,7 @@ class Tx_Extbase_Persistence_LazyObjectStorage extends Tx_Extbase_Persistence_Ob
        private $warning = 'You should never see this warning. If you do, you probably used PHP array functions like current() on the Tx_Extbase_Persistence_LazyObjectStorage. To retrieve the first result, you can use the getFirst() method.';
 
        /**
-        * @var Tx_Extbase_Persistence_DataMapper
+        * @var Tx_Extbase_Persistence_Mapper_DataMapper
         */
        protected $dataMapper;
 

diff --git a/typo3/sysext/extbase/Classes/Persistence/Query.php b/typo3/sysext/extbase/Classes/Persistence/Query.php
index e43fd77..5eb0dbc 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Query.php
@@ -47,7 +47,7 @@ class Tx_Extbase_Persistence_Query implements Tx_Extbase_Persistence_QueryInterf
        protected $objectManager;
 
        /**
-        * @var Tx_Extbase_Persistence_DataMapper
+        * @var Tx_Extbase_Persistence_Mapper_DataMapper
         */
        protected $dataMapper;
 

diff --git a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
index 6c0ee22..05a9b07 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
@@ -45,7 +45,7 @@ class Tx_Extbase_Persistence_Storage_Typo3DbBackend implements Tx_Extbase_Persis
        protected $databaseHandle;
 
        /**
-        * @var Tx_Extbase_Persistence_DataMapper
+        * @var Tx_Extbase_Persistence_Mapper_DataMapper
         */
        protected $dataMapper;
 

diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/QueryResultTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/QueryResultTest.php
index 3017dcf..8fd135f 100644 (file)
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/QueryResultTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/QueryResultTest.php
@@ -40,7 +40,7 @@ class Tx_Extbase_Tests_Unit_Persistence_QueryResultTest extends Tx_Extbase_Tests
        protected $mockPersistenceManager;
 
        /**
-        * @var Tx_Extbase_Persistence_DataMapper
+        * @var Tx_Extbase_Persistence_Mapper_DataMapper
         */
        protected $mockDataMapper;
 

diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/QueryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/QueryTest.php
index b7b2d37..98b9f21 100644 (file)
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/QueryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/QueryTest.php
@@ -51,7 +51,7 @@ class Tx_Extbase_Tests_Unit_Persistence_QueryTest extends Tx_Extbase_Tests_Unit_
        protected $backend;
 
        /**
-        * @var Tx_Extbase_Persistence_DataMapper
+        * @var Tx_Extbase_Persistence_Mapper_DataMapper
         */
        protected $dataMapper;