Commit c544e30b authored by Alexander Schnitzler's avatar Alexander Schnitzler Committed by Christian Kuhn
Browse files

[BUGFIX] Fix classes without or broken namespace

The update script unfortunetly didn't successfully
rename all classes in Extbase, so I renamed the
remaining ones manually.

Change-Id: Ia084593b8e9bf13ba487ab3b430eddf9b254d85e
Fixes: #40224
Related: #40095
Releases: 6.0
Reviewed-on: http://review.typo3.org/14112
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
parent 0d3956e4
......@@ -104,7 +104,7 @@ abstract class AbstractConfigurationManager implements \TYPO3\CMS\Core\Singleton
}
/**
* @return tslib_cObj|NULL
* @return \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer|NULL
*/
public function getContentObject() {
if ($this->contentObject !== NULL) {
......
......@@ -35,7 +35,7 @@ namespace TYPO3\CMS\Extbase\Domain\Model;
abstract class AbstractFileFolder extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* @var t3lib_file_ResourceInterface|t3lib_file_Folder|t3lib_file_AbstractFile
* @var \TYPO3\CMS\Core\Resource\ResourceInterface|\TYPO3\CMS\Core\Resource\Folder|\TYPO3\CMS\Core\Resource\AbstractFile
*/
protected $object;
......@@ -47,7 +47,7 @@ abstract class AbstractFileFolder extends \TYPO3\CMS\Extbase\DomainObject\Abstra
}
/**
* @return t3lib_file_ResourceInterface|t3lib_file_Folder|t3lib_file_AbstractFile
* @return \TYPO3\CMS\Core\Resource\ResourceInterface|\TYPO3\CMS\Core\Resource\Folder|\TYPO3\CMS\Core\Resource\AbstractFile
*/
public function getObject() {
return $this->object;
......
......@@ -47,13 +47,13 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
protected $description = '';
/**
* @var Tx_Extbase_Domain_Model_Category|NULL
* @var \TYPO3\CMS\Extbase\Domain\Model\Category|NULL
* @lazy
*/
protected $parent = NULL;
/**
* @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_DomainObject_AbstractEntity>
* @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\AbstractEntity>
* @lazy
*/
protected $items = NULL;
......@@ -66,7 +66,7 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
* Initializes all Tx_Extbase_Persistence_ObjectStorage properties.
* Initializes all \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage properties.
*
* @return void
* @api
......@@ -120,7 +120,7 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Gets the parent category.
*
* @return Tx_Extbase_Domain_Model_Category|NULL the parent category
* @return \TYPO3\CMS\Extbase\Domain\Model\Category|NULL the parent category
* @api
*/
public function getParent() {
......
......@@ -46,7 +46,7 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
protected $password = '';
/**
* @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup>
* @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
*/
protected $usergroup;
......@@ -199,7 +199,7 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
* Sets the usergroups. Keep in mind that the property is called "usergroup"
* although it can hold several usergroups.
*
* @param Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup> $usergroup An object storage containing the usergroups to add
* @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $usergroup
* @return void
* @api
*/
......
......@@ -50,7 +50,7 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
protected $description = '';
/**
* @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup>
* @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
*/
protected $subgroup;
......@@ -131,7 +131,7 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
* Sets the subgroups. Keep in mind that the property is called "subgroup"
* although it can hold several subgroups.
*
* @param Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup> $subgroup An object storage containing the subgroups to add
* @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subgroup An object storage containing the subgroups to add
* @return void
* @api
*/
......
......@@ -29,24 +29,24 @@ namespace TYPO3\CMS\Extbase\Error;
class Result {
/**
* @var array<Tx_Extbase_Error_Error>
* @var array<\TYPO3\CMS\Extbase\Error\Error>
*/
protected $errors = array();
/**
* @var array<Tx_Extbase_Error_Warning>
* @var array<\TYPO3\CMS\Extbase\Error\Warning>
*/
protected $warnings = array();
/**
* @var array<Tx_Extbase_Error_Notice>
* @var array<\TYPO3\CMS\Extbase\Error\Notice>
*/
protected $notices = array();
/**
* The result objects for the sub properties
*
* @var array<Tx_Extbase_Error_Result>
* @var array<\TYPO3\CMS\Extbase\Error\Result>
*/
protected $propertyResults = array();
......@@ -86,7 +86,7 @@ class Result {
/**
* Get all errors in the current Result object (non-recursive)
*
* @return array<Tx_Extbase_Error_Error>
* @return array<\TYPO3\CMS\Extbase\Error\Error>
* @api
*/
public function getErrors() {
......@@ -96,7 +96,7 @@ class Result {
/**
* Get all warnings in the current Result object (non-recursive)
*
* @return array<Tx_Extbase_Error_Warning>
* @return array<\TYPO3\CMS\Extbase\Error\Warning>
* @api
*/
public function getWarnings() {
......@@ -106,7 +106,7 @@ class Result {
/**
* Get all notices in the current Result object (non-recursive)
*
* @return array<Tx_Extbase_Error_Notice>
* @return array<\TYPO3\CMS\Extbase\Error\Notice>
* @api
*/
public function getNotices() {
......@@ -238,7 +238,7 @@ class Result {
* where the key is the property path where the error occured, and the
* value is a list of all errors (stored as array)
*
* @return array<Tx_Extbase_Error_Error>
* @return array<\TYPO3\CMS\Extbase\Error\Error>
* @api
*/
public function getFlattenedErrors() {
......@@ -252,7 +252,7 @@ class Result {
* where the key is the property path where the warning occured, and the
* value is a list of all warnings (stored as array)
*
* @return array<Tx_Extbase_Error_Warning>
* @return array<\TYPO3\CMS\Extbase\Error\Warning>
* @api
*/
public function getFlattenedWarnings() {
......@@ -266,7 +266,7 @@ class Result {
* where the key is the property path where the notice occured, and the
* value is a list of all notices (stored as array)
*
* @return array<Tx_Extbase_Error_Notice>
* @return array<\TYPO3\CMS\Extbase\Error\Notice>
* @api
*/
public function getFlattenedNotices() {
......@@ -331,7 +331,7 @@ class Result {
/**
* Get a list of all sub Result objects available.
*
* @return array<Tx_Extbase_Erro_Result>
* @return array<\TYPO3\CMS\Extbase\Error\Result>
*/
public function getSubResults() {
return $this->propertyResults;
......
......@@ -173,7 +173,7 @@ class Command {
* information about required/optional arguments of this command.
* If the command does not expect any arguments, an empty array is returned
*
* @return array<Tx_Extbase_MVC_CLI_CommandArgumentDefinition>
* @return array<\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition>
* @author Bastian Waidelich <bastian@typo3.org>
*/
public function getArgumentDefinitions() {
......
......@@ -37,7 +37,7 @@ class CommandManager implements \TYPO3\CMS\Core\SingletonInterface {
protected $objectManager;
/**
* @var array<Tx_Extbase_MVC_CLI_Command>
* @var array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
*/
protected $availableCommands = NULL;
......@@ -57,7 +57,7 @@ class CommandManager implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Returns an array of all commands
*
* @return array<Tx_Extbase_MVC_CLI_Command>
* @return array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
* @author Robert Lemke <robert@typo3.org>
* @author Bastian Waidelich <bastian@typo3.org>
* @api
......
......@@ -571,7 +571,7 @@ class Argument {
}
/**
* @return array<Tx_Extbase_Error_Result> Validation errors which have occured.
* @return array<\TYPO3\CMS\Extbase\Error\Result> Validation errors which have occured.
* @author Sebastian Kurfürst <sebastian@typo3.org>
* @api
*/
......
......@@ -107,7 +107,7 @@ class ArgumentsValidator extends \TYPO3\CMS\Extbase\Validation\Validator\Abstrac
* Adds the given errors to $this->errors and creates an ArgumentError
* instance if needed.
*
* @param array $errors Array of Tx_Extbase_Validation_Error
* @param array $errors Array of \TYPO3\CMS\Extbase\Validation\Error
* @param string $argumentName Name of the argument to add errors for
* @return void
*/
......
......@@ -34,7 +34,7 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
class AmbiguousCommandIdentifierException extends \TYPO3\CMS\Extbase\Mvc\Exception\CommandException {
/**
* @var array<Tx_Extbase_MVC_CLI_Command>
* @var array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
*/
protected $matchingCommands = array();
......@@ -44,7 +44,7 @@ class AmbiguousCommandIdentifierException extends \TYPO3\CMS\Extbase\Mvc\Excepti
* @param string $message
* @param integer $code
* @param \Exception|NULL $previousException
* @param array $matchingCommands <Tx_Extbase_MVC_CLI_Command> $matchingCommands Commands that matched the command identifier
* @param array $matchingCommands <\TYPO3\CMS\Extbase\Mvc\Cli\Command> $matchingCommands Commands that matched the command identifier
* @see Exception
* @author Bastian Waidelich <bastian@typo3.org>
*/
......@@ -54,7 +54,7 @@ class AmbiguousCommandIdentifierException extends \TYPO3\CMS\Extbase\Mvc\Excepti
}
/**
* @return array<Tx_Extbase_MVC_CLI_Command>
* @return array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
*/
public function getMatchingCommands() {
return $this->matchingCommands;
......
......@@ -70,7 +70,7 @@ class NotFoundView extends \TYPO3\CMS\Extbase\Mvc\View\AbstractView {
* @author Bastian Waidelich <bastian@typo3.org>
*/
protected function getTemplatePathAndFilename() {
return \t3lib_extmgm::extPath('extbase') . 'Resources/Private/MVC/NotFoundView_Template.html';
return \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Resources/Private/MVC/NotFoundView_Template.html';
}
/**
......
......@@ -73,7 +73,7 @@ class FrontendRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestH
$contentObject = $this->configurationManager->getContentObject();
if ($contentObject->getUserObjectType() === \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::OBJECTTYPE_USER) {
$contentObject->convertToUserIntObject();
// tslib_cObj::convertToUserIntObject() will recreate the object, so we have to stop the request here
// \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::convertToUserIntObject() will recreate the object, so we have to stop the request here
return NULL;
}
$request->setIsCached(FALSE);
......
......@@ -34,7 +34,7 @@ class UriBuilder {
protected $extensionService;
/**
* An instance of tslib_cObj
* An instance of \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
*
* @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
*/
......@@ -514,7 +514,7 @@ class UriBuilder {
* if they are equal to the default controller/action of the target plugin.
* Note: This is only active in FE mode and if feature "skipDefaultArguments" is enabled
*
* @see Tx_Extbase_Configuration_ConfigurationManagerInterface::isFeatureEnabled()
* @see \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::isFeatureEnabled()
* @param array $controllerArguments the current controller arguments to be modified
* @param string $extensionName target extension name
* @param string $pluginName target plugin name
......
......@@ -67,7 +67,7 @@ interface ObjectManagerInterfaceException extends \TYPO3\CMS\Core\SingletonInter
*
* @param string $objectName The name of the object to create
* @return object The new object instance
* @throws Tx_Extbase_Object_Exception_WrongScropeException if the created object is not of scope prototype
* @throws \TYPO3\CMS\Extbase\Object\Exception\WrongScopeException if the created object is not of scope prototype
* @api
*/
public function create($objectName);
......
......@@ -129,7 +129,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
// Delegation to the ObjectStorage methods below
/**
* @see Tx_Extbase_Persistence_ObjectStorage::addAll
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::addAll
*/
public function addAll($storage) {
$this->initialize();
......@@ -137,7 +137,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::attach
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::attach
*/
public function attach($object, $data = NULL) {
$this->initialize();
......@@ -145,7 +145,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::contains
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::contains
*/
public function contains($object) {
$this->initialize();
......@@ -174,7 +174,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::current
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::current
*/
public function current() {
$this->initialize();
......@@ -182,7 +182,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::detach
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::detach
*/
public function detach($object) {
$this->initialize();
......@@ -190,7 +190,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::key
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::key
*/
public function key() {
$this->initialize();
......@@ -198,7 +198,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::next
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::next
*/
public function next() {
$this->initialize();
......@@ -206,7 +206,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::offsetExists
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetExists
*/
public function offsetExists($object) {
$this->initialize();
......@@ -214,7 +214,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::offsetGet
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetGet
*/
public function offsetGet($object) {
$this->initialize();
......@@ -222,7 +222,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::offsetSet
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetSet
*/
public function offsetSet($object, $info) {
$this->initialize();
......@@ -230,7 +230,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::offsetUnset
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetUnset
*/
public function offsetUnset($object) {
$this->initialize();
......@@ -238,7 +238,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::removeAll
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::removeAll
*/
public function removeAll($storage) {
$this->initialize();
......@@ -246,7 +246,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::rewind
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::rewind
*/
public function rewind() {
$this->initialize();
......@@ -254,7 +254,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::valid
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::valid
*/
public function valid() {
$this->initialize();
......@@ -262,7 +262,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
}
/**
* @see Tx_Extbase_Persistence_ObjectStorage::toArray
* @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::toArray
*/
public function toArray() {
$this->initialize();
......
......@@ -37,12 +37,12 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic;
class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface, \TYPO3\CMS\Core\SingletonInterface {
/**
* @var \TYPO3\CMS\Extbase\Persistence\BackendInterface
* @var \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
*/
protected $backend;
/**
* @var \TYPO3\CMS\Extbase\Persistence\Session
* @var \TYPO3\CMS\Extbase\Persistence\Generic\Session
*/
protected $session;
......@@ -61,20 +61,20 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
/**
* Injects the Persistence Backend
*
* @param \TYPO3\CMS\Extbase\Persistence\BackendInterface $backend The persistence backend
* @param \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface $backend The persistence backend
* @return void
*/
public function injectBackend(\TYPO3\CMS\Extbase\Persistence\BackendInterface $backend) {
public function injectBackend(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface $backend) {
$this->backend = $backend;
}
/**
* Injects the Persistence Session
*
* @param \TYPO3\CMS\Extbase\Persistence\Session $session The persistence session
* @param \TYPO3\CMS\Extbase\Persistence\Generic\Session $session The persistence session
* @return void
*/
public function injectSession(\TYPO3\CMS\Extbase\Persistence\Session $session) {
public function injectSession(\TYPO3\CMS\Extbase\Persistence\Generic\Session $session) {
$this->session = $session;
}
......@@ -91,7 +91,7 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
/**
* Returns the current persistence session
*
* @return \TYPO3\CMS\Extbase\Persistence\Session
* @return \TYPO3\CMS\Extbase\Persistence\Generic\Session
* @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
*/
public function getSession() {
......@@ -101,7 +101,7 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
/**
* Returns the persistence backend
*
* @return \TYPO3\CMS\Extbase\Persistence\BackendInterface
* @return \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
* @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
*/
public function getBackend() {
......@@ -177,8 +177,8 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
* @api
*/
public function persistAll() {
$aggregateRootObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
$removedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
$aggregateRootObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
$removedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
// fetch and inspect objects from all known repositories
foreach ($this->repositoryClassNames as $repositoryClassName) {
$repository = $this->objectManager->get($repositoryClassName);
......
......@@ -232,7 +232,7 @@ class DataMap {
* Returns the column map corresponding to the given property name.
*
* @param string $propertyName
* @return Tx_Extbase_Persistence_Mapper_ColumnMap|NULL The column map or NULL if no corresponding column map was found.
* @return \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap|NULL The column map or NULL if no corresponding column map was found.
*/
public function getColumnMap($propertyName) {
return $this->columnMaps[$propertyName];
......
......@@ -317,7 +317,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
* @param string $propertyName The name of the proxied property in it's parent
* @param mixed $fieldValue The raw field value.
* @param bool $enableLazyLoading A flag indication if the related objects should be lazy loaded
* @return Tx_Extbase_Persistence_LazyObjectStorage|Tx_Extbase_Persistence_QueryResultInterface The result
* @return \TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface The result
*/
public function fetchRelated(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $fieldValue = '', $enableLazyLoading = TRUE) {
$propertyMetaData = $this->reflectionService->getClassSchema(get_class($parentObject))->getProperty($propertyName);
......@@ -364,7 +364,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
* @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject
* @param string $propertyName
* @param string $fieldValue
* @return Tx_Extbase_Persistence_QueryResultInterfaces
* @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
*/
protected function getNonEmptyRelationValue(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $fieldValue) {
$query = $this->getPreparedQuery($parentObject, $propertyName, $fieldValue);
......@@ -491,6 +491,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
* @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The object instance this proxy is part of
* @param string $propertyName The name of the proxied property in it's parent
* @param mixed $fieldValue The raw field value.
* @return integer
*/
public function countRelated(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $fieldValue = '') {
$query = $this->getPreparedQuery($parentObject, $propertyName, $fieldValue);
......
......@@ -70,7 +70,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
* @param string $statement The statement
* @param array $boundVariables An array of variables to bind to the statement
* @param object|string $language The language of the statement. Must be a supported languanguage defined as Tx_Extbase_Persistence_QOM_QueryObjectModelFactory::TYPO3_*
* @return Tx_Extbase_Persistence_QOM_StatementInterface
* @return \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement
*/
public function statement($statement, array $boundVariables = array(), $language = \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement::TYPO3_SQL_MYSQL) {
return $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Statement', $statement, $boundVariables, $language);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment