[!!!][CLEANUP] Remove deprecated code in sysext extbase 71/33771/7
authorMarkus Klein <klein.t3@reelworx.at>
Tue, 4 Nov 2014 01:30:15 +0000 (02:30 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Thu, 20 Nov 2014 11:20:38 +0000 (12:20 +0100)
Resolves: #62673
Releases: master
Change-Id: If468f183fa0e31624e7bf4621728066d4e770066
Reviewed-on: http://review.typo3.org/33771
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
23 files changed:
typo3/sysext/compatibility6/Migrations/Code/ClassAliasMap.php
typo3/sysext/compatibility6/Migrations/Code/LegacyClassesForIde.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-62673-ExtbaseDeprecatedCodeRemoved.rst [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
typo3/sysext/extbase/Classes/Object/ObjectManager.php
typo3/sysext/extbase/Classes/Object/ObjectManagerInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelConstantsInterface.php [deleted file]
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelFactoryInterface.php [deleted file]
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Statement.php
typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php
typo3/sysext/extbase/Classes/Persistence/Generic/Typo3QuerySettings.php
typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
typo3/sysext/extbase/Classes/Persistence/Repository.php
typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php

index 04360b4..5e7e59b 100644 (file)
@@ -466,9 +466,7 @@ return array(
        'Tx_Extbase_Persistence_QOM_OrInterface' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\OrInterface',
        'Tx_Extbase_Persistence_QOM_PropertyValue' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\PropertyValue',
        'Tx_Extbase_Persistence_QOM_PropertyValueInterface' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\PropertyValueInterface',
-       'Tx_Extbase_Persistence_QOM_QueryObjectModelConstantsInterface' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\QueryObjectModelConstantsInterface',
        'Tx_Extbase_Persistence_QOM_QueryObjectModelFactory' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\QueryObjectModelFactory',
-       'Tx_Extbase_Persistence_QOM_QueryObjectModelFactoryInterface' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\QueryObjectModelFactoryInterface',
        'Tx_Extbase_Persistence_QOM_Selector' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Selector',
        'Tx_Extbase_Persistence_QOM_SelectorInterface' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\SelectorInterface',
        'Tx_Extbase_Persistence_QOM_SourceInterface' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\SourceInterface',
index 0c1c1f0..3a316e7 100644 (file)
@@ -921,8 +921,6 @@ interface Tx_Extbase_Persistence_QOM_LowerCaseInterface extends \TYPO3\CMS\Extba
 
 interface Tx_Extbase_Persistence_QOM_NotInterface extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\NotInterface {}
 
-class Tx_Extbase_Persistence_QOM_Operand extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Operand {}
-
 interface Tx_Extbase_Persistence_QOM_OperandInterface extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\OperandInterface {}
 
 class Tx_Extbase_Persistence_QOM_Ordering extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Ordering {}
@@ -935,12 +933,8 @@ class Tx_Extbase_Persistence_QOM_PropertyValue extends \TYPO3\CMS\Extbase\Persis
 
 interface Tx_Extbase_Persistence_QOM_PropertyValueInterface extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\PropertyValueInterface {}
 
-interface Tx_Extbase_Persistence_QOM_QueryObjectModelConstantsInterface extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelConstantsInterface {}
-
 class Tx_Extbase_Persistence_QOM_QueryObjectModelFactory extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelFactory {}
 
-interface Tx_Extbase_Persistence_QOM_QueryObjectModelFactoryInterface extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelFactoryInterface {}
-
 class Tx_Extbase_Persistence_QOM_Selector extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector {}
 
 interface Tx_Extbase_Persistence_QOM_SelectorInterface extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\SelectorInterface {}
@@ -949,8 +943,6 @@ interface Tx_Extbase_Persistence_QOM_SourceInterface extends \TYPO3\CMS\Extbase\
 
 class Tx_Extbase_Persistence_QOM_Statement extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement {}
 
-class Tx_Extbase_Persistence_QOM_StaticOperand extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\StaticOperand {}
-
 interface Tx_Extbase_Persistence_QOM_StaticOperandInterface extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\StaticOperandInterface {}
 
 class Tx_Extbase_Persistence_QOM_UpperCase extends \TYPO3\CMS\Extbase\Persistence\Generic\Qom\UpperCase {}
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-62673-ExtbaseDeprecatedCodeRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-62673-ExtbaseDeprecatedCodeRemoved.rst
new file mode 100644 (file)
index 0000000..c0a231b
--- /dev/null
@@ -0,0 +1,61 @@
+=====================================================
+Breaking: #62673 - Deprecated extbase code is removed
+=====================================================
+
+Description
+===========
+
+Generic\Qom\Statement
+---------------------
+
+You may no longer use bound variables without using a prepared statement.
+
+ActionController
+----------------
+
+Support for old view configuration options templateRootPath, layoutRootPath and partialRootPath is dropped.
+Use the new options with fallback mechanism.
+
+
+Removed PHP classes
+-------------------
+
+* QueryObjectModelConstantsInterface
+* QueryObjectModelFactoryInterface
+
+
+Removed PHP class members
+-------------------------
+
+* ActionController::$viewObjectNamePattern is removed without replacement
+* Repository::$backend is removed, use persistence manager instead
+
+
+Removed PHP methods
+-------------------
+
+* ObjectManager::create() is removed, use ObjectManager::get() instead
+* ObjectManagerInterface::create() is removed
+* Persistence\Generic\Backend::replaceObject() is removed without replacement
+* QuerySettingsInterface::setReturnRawQueryResult() is removed without replacement
+* QuerySettingsInterface::getReturnRawQueryResult() is removed, use the parameter on $query->execute() directly
+* Typo3QuerySettings::setSysLanguageUid() is removed, use setLanguageUid() instead
+* Typo3QuerySettings::getSysLanguageUid() is removed, use getLanguageUid() instead
+
+
+Impact
+======
+
+A call to any of the aforementioned methods by third party code will result in a fatal PHP error.
+
+
+Affected installations
+======================
+
+Any installation which contains third party code still using these deprecated methods.
+
+
+Migration
+=========
+
+Replace the calls with the suggestions outlined above.
index 15259ed..722959f 100644 (file)
@@ -13,9 +13,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Controller;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Request as WebRequest;
+use TYPO3\CMS\Extbase\Utility\ArrayUtility;
 use TYPO3\CMS\Extbase\Validation\Validator\AbstractCompositeValidator;
 
 /**
@@ -46,16 +48,6 @@ class ActionController extends AbstractController {
        protected $view = NULL;
 
        /**
-        * Pattern after which the view object name is built if no Fluid template
-        * is found.
-        *
-        * @var string
-        * @api
-        * @deprecated since Extbase 6.2, will be removed two versions later
-        */
-       protected $viewObjectNamePattern = 'Tx_@extension_View_@controller_@action@format';
-
-       /**
         * @var string
         * @api
         */
@@ -362,9 +354,8 @@ class ActionController extends AbstractController {
                // set TemplateRootPaths
                $viewFunctionName = 'setTemplateRootPaths';
                if (method_exists($view, $viewFunctionName)) {
-                       $deprecatedSetting = 'templateRootPath';
                        $setting = 'templateRootPaths';
-                       $parameter = $this->getViewProperty($extbaseFrameworkConfiguration, $setting, $deprecatedSetting);
+                       $parameter = $this->getViewProperty($extbaseFrameworkConfiguration, $setting);
                        // no need to bother if there is nothing to set
                        if ($parameter) {
                                $view->$viewFunctionName($parameter);
@@ -374,9 +365,8 @@ class ActionController extends AbstractController {
                // set LayoutRootPaths
                $viewFunctionName = 'setLayoutRootPaths';
                if (method_exists($view, $viewFunctionName)) {
-                       $deprecatedSetting = 'layoutRootPath';
                        $setting = 'layoutRootPaths';
-                       $parameter = $this->getViewProperty($extbaseFrameworkConfiguration, $setting, $deprecatedSetting);
+                       $parameter = $this->getViewProperty($extbaseFrameworkConfiguration, $setting);
                        // no need to bother if there is nothing to set
                        if ($parameter) {
                                $view->$viewFunctionName($parameter);
@@ -386,9 +376,8 @@ class ActionController extends AbstractController {
                // set PartialRootPaths
                $viewFunctionName = 'setPartialRootPaths';
                if (method_exists($view, $viewFunctionName)) {
-                       $deprecatedSetting = 'partialRootPath';
                        $setting = 'partialRootPaths';
-                       $parameter = $this->getViewProperty($extbaseFrameworkConfiguration, $setting, $deprecatedSetting);
+                       $parameter = $this->getViewProperty($extbaseFrameworkConfiguration, $setting);
                        // no need to bother if there is nothing to set
                        if ($parameter) {
                                $view->$viewFunctionName($parameter);
@@ -398,37 +387,24 @@ class ActionController extends AbstractController {
 
        /**
         * Handles the path resolving for *rootPath(s)
-        * singular one is deprecated and will be removed two versions after 6.2
-        * if deprecated setting is found, use it as the very last fallback target
         *
         * numerical arrays get ordered by key ascending
         *
         * @param array $extbaseFrameworkConfiguration
         * @param string $setting parameter name from TypoScript
-        * @param string $deprecatedSetting parameter name from TypoScript
         *
         * @return array
         */
-       protected function getViewProperty($extbaseFrameworkConfiguration, $setting, $deprecatedSetting = '') {
-
+       protected function getViewProperty($extbaseFrameworkConfiguration, $setting) {
                $values = array();
-
                if (
                        !empty($extbaseFrameworkConfiguration['view'][$setting])
                        && is_array($extbaseFrameworkConfiguration['view'][$setting])
                ) {
-                       $values = \TYPO3\CMS\Extbase\Utility\ArrayUtility::sortArrayWithIntegerKeys($extbaseFrameworkConfiguration['view'][$setting]);
+                       $values = ArrayUtility::sortArrayWithIntegerKeys($extbaseFrameworkConfiguration['view'][$setting]);
                        $values = array_reverse($values, TRUE);
                }
 
-               // @todo remove handling of deprecatedSetting two versions after 6.2
-               if (
-                       isset($extbaseFrameworkConfiguration['view'][$deprecatedSetting])
-                       && strlen($extbaseFrameworkConfiguration['view'][$deprecatedSetting]) > 0
-               ) {
-                       $values[] = $extbaseFrameworkConfiguration['view'][$deprecatedSetting];
-               }
-
                return $values;
        }
 
@@ -440,25 +416,24 @@ class ActionController extends AbstractController {
         */
        protected function resolveViewObjectName() {
                $vendorName = $this->request->getControllerVendorName();
-
-               if ($vendorName !== NULL) {
-                       $possibleViewName = str_replace('@vendor', $vendorName, $this->namespacesViewObjectNamePattern);
-               } else {
-                       $possibleViewName = $this->viewObjectNamePattern;
+               if ($vendorName === NULL) {
+                       return FALSE;
                }
 
                $possibleViewName = str_replace(
                        array(
+                               '@vendor',
                                '@extension',
                                '@controller',
                                '@action'
                        ),
                        array(
+                               $vendorName,
                                $this->request->getControllerExtensionName(),
                                $this->request->getControllerName(),
                                ucfirst($this->request->getControllerActionName())
                        ),
-                       $possibleViewName
+                       $this->namespacesViewObjectNamePattern
                );
                $format = $this->request->getFormat();
                $viewObjectName = str_replace('@format', ucfirst($format), $possibleViewName);
@@ -514,10 +489,10 @@ class ActionController extends AbstractController {
                $this->clearCacheOnError();
                $errorFlashMessage = $this->getErrorFlashMessage();
                if ($errorFlashMessage !== FALSE) {
-                       $errorFlashMessageObject = new \TYPO3\CMS\Core\Messaging\FlashMessage(
+                       $errorFlashMessageObject = new FlashMessage(
                                $errorFlashMessage,
                                '',
-                               \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR
+                               FlashMessage::ERROR
                        );
                        $this->controllerContext->getFlashMessageQueue()->enqueue($errorFlashMessageObject);
                }
index 20df796..22c209d 100644 (file)
@@ -112,25 +112,6 @@ class ObjectManager implements ObjectManagerInterface {
        }
 
        /**
-        * Creates a fresh instance of the object specified by $objectName.
-        *
-        * This factory method can only create objects of the scope prototype.
-        * Singleton objects must be either injected by some type of Dependency Injection or
-        * if that is not possible, be retrieved by the get() method of the
-        * Object Manager
-        *
-        * @param string $objectName The name of the object to create
-        * @return object The new object instance
-        * @deprecated since Extbase 6.1.0; will be removed in Extbase 6.3.0
-        */
-       public function create($objectName) {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               $arguments = func_get_args();
-               $instance = call_user_func_array(array($this, 'get'), $arguments);
-               return $instance;
-       }
-
-       /**
         * Create an instance of $className without calling its constructor
         *
         * @param string $className
index a9be27d..2ee8d6c 100644 (file)
@@ -36,20 +36,6 @@ interface ObjectManagerInterface extends \TYPO3\CMS\Core\SingletonInterface {
        public function get($objectName);
 
        /**
-        * Creates a fresh instance of the object specified by $objectName.
-        *
-        * This factory method can only create objects of the scope prototype.
-        * Singleton objects must be either injected by some type of Dependency Injection or
-        * if that is not possible, be retrieved by the get() method of the
-        * Object Manager
-        *
-        * @param string $objectName The name of the object to create
-        * @return object The new object instance
-        * @deprecated since 6.1
-        */
-       public function create($objectName);
-
-       /**
         * Create an instance of $className without calling its constructor
         *
         * @param string $className
index c3d7c34..32d9656 100644 (file)
@@ -247,27 +247,6 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
        }
 
        /**
-        * Replaces the given object by the second object.
-        *
-        * This method will unregister the existing object at the identity map and
-        * register the new object instead. The existing object must therefore
-        * already be registered at the identity map which is the case for all
-        * reconstituted objects.
-        *
-        * The new object will be identified by the uid which formerly belonged
-        * to the existing object. The existing object looses its uid.
-        *
-        * @param object $existingObject The existing object
-        * @param object $newObject The new object
-        * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
-        * @return void
-        * @deprecated since 6.1, will be removed two versions later
-        */
-       public function replaceObject($existingObject, $newObject) {
-               $this->session->replaceReconstitutedEntity($existingObject, $newObject);
-       }
-
-       /**
         * Sets the aggregate root objects
         *
         * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects
index 4f38c83..ec61993 100644 (file)
@@ -73,8 +73,7 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
        /**
         * Registers a repository
         *
-        * @param string $className The class name of the repository to be reigistered
-        * @deprecated since 6.1, will be remove two versions later
+        * @param string $className The class name of the repository to be registered
         * @return void
         */
        public function registerRepositoryClassName($className) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelConstantsInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelConstantsInterface.php
deleted file mode 100644 (file)
index 66b4885..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-namespace TYPO3\CMS\Extbase\Persistence\Generic\Qom;
-
-/**
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-/**
- * Defines constants used in the query object model.
- *
- * @deprecated since Extbase 1.1; use \TYPO3\CMS\Extbase\Persistence\QueryInterface::* instead
- */
-interface QueryObjectModelConstantsInterface {
-
-       /**
-        * An inner join.
-        */
-       const JCR_JOIN_TYPE_INNER = '{http://www.jcp.org/jcr/1.0}joinTypeInner';
-
-       /**
-        * A left-outer join.
-        */
-       const JCR_JOIN_TYPE_LEFT_OUTER = '{http://www.jcp.org/jcr/1.0}joinTypeLeftOuter';
-
-       /**
-        * A right-outer join.
-        */
-       const JCR_JOIN_TYPE_RIGHT_OUTER = '{http://www.jcp.org/jcr/1.0}joinTypeRightOuter';
-
-       /**
-        * The '=' comparison operator.
-        */
-       const JCR_OPERATOR_EQUAL_TO = '{http://www.jcp.org/jcr/1.0}operatorEqualTo';
-
-       /**
-        * The '!=' comparison operator.
-        */
-       const JCR_OPERATOR_NOT_EQUAL_TO = '{http://www.jcp.org/jcr/1.0}operatorNotEqualTo';
-
-       /**
-        * The '<' comparison operator.
-        */
-       const JCR_OPERATOR_LESS_THAN = '{http://www.jcp.org/jcr/1.0}operatorLessThan';
-
-       /**
-        * The '<=' comparison operator.
-        */
-       const JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO = '{http://www.jcp.org/jcr/1.0}operatorLessThanOrEqualTo';
-
-       /**
-        * The '>' comparison operator.
-        */
-       const JCR_OPERATOR_GREATER_THAN = '{http://www.jcp.org/jcr/1.0}operatorGreaterThan';
-
-       /**
-        * The '>=' comparison operator.
-        */
-       const JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO = '{http://www.jcp.org/jcr/1.0}operatorGreaterThanOrEqualTo';
-
-       /**
-        * The 'like' comparison operator.
-        */
-       const JCR_OPERATOR_LIKE = '{http://www.jcp.org/jcr/1.0}operatorLike';
-
-       /**
-        * Ascending order.
-        */
-       const JCR_ORDER_ASCENDING = '{http://www.jcp.org/jcr/1.0}orderAscending';
-
-       /**
-        * Descending order.
-        */
-       const JCR_ORDER_DESCENDING = '{http://www.jcp.org/jcr/1.0}orderDescending';
-}
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelFactoryInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelFactoryInterface.php
deleted file mode 100644 (file)
index 061cbce..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace TYPO3\CMS\Extbase\Persistence\Generic\Qom;
-
-/**
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-/**
- * A QueryObjectModelFactory creates instances of the JCR query object model.
- *
- * Refer to QueryObjectModelInterface for a description of the query object model.
- *
- * @deprecated since Extbase 6.2; no replacement, will be removed two versions later
- */
-interface QueryObjectModelFactoryInterface extends QueryObjectModelConstantsInterface {
-
-}
index a8f6d63..26bf9c1 100644 (file)
@@ -35,15 +35,6 @@ class Statement implements ConstraintInterface {
         * @param array $boundVariables An array of variables to bind to the statement, only to be used with preparedStatement
         */
        public function __construct($statement, array $boundVariables = array()) {
-               // @deprecated since 6.2, using $boundVariables without preparedStatement will be removed in two versions
-               if (
-                       !empty($boundVariables)
-                       && !($statement instanceof \TYPO3\CMS\Core\Database\PreparedStatement)
-               ) {
-                       \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog('Using boundVariables'
-                               . ' in Extbase\'s custom statement without using preparedStatement is'
-                               . ' deprecated since TYPO3 6.2 and will be removed in two versions.');
-               }
                $this->statement = $statement;
                $this->boundVariables = $boundVariables;
        }
index c12b2dd..64547de 100644 (file)
@@ -197,7 +197,7 @@ class Query implements QueryInterface {
         * @api
         */
        public function execute($returnRawQueryResult = FALSE) {
-               if ($returnRawQueryResult === TRUE || $this->getQuerySettings()->getReturnRawQueryResult() === TRUE) {
+               if ($returnRawQueryResult) {
                        return $this->persistenceManager->getObjectDataByQuery($this);
                } else {
                        return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\QueryResultInterface', $this);
index 3b07a10..77f9037 100644 (file)
@@ -163,23 +163,6 @@ interface QuerySettingsInterface {
        public function getIncludeDeleted();
 
        /**
-        * Sets the state, if the QueryResult should be returned unmapped.
-        *
-        * @param bool $returnRawQueryResult TRUE, if the QueryResult should be returned unmapped; otherwise FALSE.
-        * @return void
-        * @deprecated since Extbase 6.2, will be removed two versions later
-        */
-       public function setReturnRawQueryResult($returnRawQueryResult);
-
-       /**
-        * Returns the state, if the QueryResult should be returned unmapped.
-        *
-        * @return bool TRUE, if the QueryResult should be returned unmapped; otherwise FALSE.
-        * @deprecated since Extbase 6.2, will be removed two versions later
-        */
-       public function getReturnRawQueryResult();
-
-       /**
         * @return bool
         */
        public function getUseQueryCache();
index 4ba6455..e4ccfd7 100644 (file)
@@ -403,14 +403,6 @@ class Typo3DbBackend implements BackendInterface, \TYPO3\CMS\Core\SingletonInter
 
                        $realStatement->free();
                } else {
-                       /**
-                        * @deprecated since 6.2, this block will be removed in two versions
-                        * the deprecation log is in Qom\Statement
-                        */
-                       if (!empty($parameters)) {
-                               $this->replacePlaceholders($realStatement, $parameters);
-                       }
-
                        $result = $this->databaseHandle->sql_query($realStatement);
                        $this->checkSqlErrors();
 
index 7d5feb5..8157883 100644 (file)
@@ -291,13 +291,9 @@ class Typo3DbQueryParser implements \TYPO3\CMS\Core\SingletonInterface {
        protected function parseOrderings(array $orderings, Qom\SourceInterface $source, array &$sql) {
                foreach ($orderings as $propertyName => $order) {
                        switch ($order) {
-                               case Qom\QueryObjectModelConstantsInterface::JCR_ORDER_ASCENDING:
-
                                case QueryInterface::ORDER_ASCENDING:
                                        $order = 'ASC';
                                        break;
-                               case Qom\QueryObjectModelConstantsInterface::JCR_ORDER_DESCENDING:
-
                                case QueryInterface::ORDER_DESCENDING:
                                        $order = 'DESC';
                                        break;
index f42e183..3f4f70d 100644 (file)
@@ -90,14 +90,6 @@ class Typo3QuerySettings implements QuerySettingsInterface {
        protected $languageUid = 0;
 
        /**
-        * Flag if the the query result should be returned as raw QueryResult.
-        *
-        * @var bool
-        * @deprecated since Extbase 6.2, will be removed two versions later
-        */
-       protected $returnRawQueryResult = FALSE;
-
-       /**
         * Flag whether the query should use a prepared statement
         *
         * @var bool
@@ -251,29 +243,6 @@ class Typo3QuerySettings implements QuerySettingsInterface {
        }
 
        /**
-        * Sets the language uid for the language overlay.
-        *
-        * @param int $sysLanguageUid language uid for the language overlay
-        * @return QuerySettingsInterface instance of $this to allow method chaining
-        * @deprecated since Extbase 6.2, will be removed two versions later. Use setLanguageUid() instead.
-        */
-       public function setSysLanguageUid($sysLanguageUid) {
-               GeneralUtility::logDeprecatedFunction();
-               return $this->setLanguageUid($sysLanguageUid);
-       }
-
-       /**
-        * Returns the language uid for the language overlay
-        *
-        * @return int language uid for the language overlay
-        * @deprecated since Extbase 6.2, will be removed two versions later. Use getLanguageUid() instead.
-        */
-       public function getSysLanguageUid() {
-               GeneralUtility::logDeprecatedFunction();
-               return $this->getLanguageUid();
-       }
-
-       /**
         * Sets a flag indicating whether all or some enable fields should be ignored. If TRUE, all enable fields are ignored.
         * If--in addition to this--enableFieldsToBeIgnored is set, only fields specified there are ignored. If FALSE, all
         * enable fields are taken into account, regardless of the enableFieldsToBeIgnored setting.
@@ -349,30 +318,6 @@ class Typo3QuerySettings implements QuerySettingsInterface {
        }
 
        /**
-        * Sets the state, if the QueryResult should be returned unmapped.
-        *
-        * @param bool $returnRawQueryResult TRUE, if the QueryResult should be returned unmapped; otherwise FALSE.
-        * @return QuerySettingsInterface
-        * @deprecated since Extbase 6.2, will be removed two versions later. Please use argument in query->execute() instead.
-        */
-       public function setReturnRawQueryResult($returnRawQueryResult) {
-               GeneralUtility::logDeprecatedFunction();
-               $this->returnRawQueryResult = $returnRawQueryResult;
-               return $this;
-       }
-
-       /**
-        * Returns the state, if the QueryResult should be returned unmapped.
-        *
-        * @return bool TRUE, if the QueryResult should be returned unmapped; otherwise FALSE.
-        * @deprecated since Extbase 6.2, will be removed two versions later. Please use argument in query->execute() instead.
-        */
-       public function getReturnRawQueryResult() {
-               // We do not log this call intentionally, otherwise the deprecation log would be filled up
-               return $this->returnRawQueryResult;
-       }
-
-       /**
         * @param bool $usePreparedStatement
         * @return QuerySettingsInterface
         */
index 9e15699..219751f 100644 (file)
@@ -99,7 +99,7 @@ interface PersistenceManagerInterface {
        /**
         * Registers a repository
         *
-        * @param string $className The class name of the repository to be reigistered
+        * @param string $className The class name of the repository to be registered
         * @deprecated since Extbase 6.0, will be removed in Extbase 7.0. It is deprecated only in the interface to be more
         * in sync with Flow in future and will stay in Generic Persistence.
         * @return void
index c2d781c..ea0ce47 100644 (file)
@@ -28,13 +28,6 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
        protected $identityMap;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
-        * @deprecated since 6.1, will be removed two versions later, use the persistence manager instead
-        * @inject
-        */
-       protected $backend;
-
-       /**
         * @var \TYPO3\CMS\Extbase\Persistence\Generic\Session
         * @deprecated since 6.1 will be removed two versions later, use the persistence manager instead
         * @inject
index ec669d9..d42186b 100644 (file)
@@ -59,7 +59,7 @@ class AddTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         */
        public function addSimpleObjectTest() {
                $newBlogTitle = 'aDi1oogh';
-               $newBlog = $this->objectManager->create('ExtbaseTeam\\BlogExample\\Domain\\Model\\Blog');
+               $newBlog = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Model\\Blog');
                $newBlog->setTitle($newBlogTitle);
 
                /** @var \ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository $blogRepository */
index fbfed3c..a60434f 100644 (file)
@@ -108,7 +108,7 @@ class InTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $blog1 = $this->blogRepository->findByUid(1);
                $blog2 = $this->blogRepository->findByUid(2);
 
-               $objectStorage = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
+               $objectStorage = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
                $objectStorage->attach($blog1);
                $objectStorage->attach($blog2);
 
@@ -128,7 +128,7 @@ class InTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $blog1 = $this->blogRepository->findByUid(1);
                $blog2 = $this->blogRepository->findByUid(2);
 
-               $objectStorage = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
+               $objectStorage = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
                $objectStorage->attach($blog1);
                $objectStorage->attach($blog2);
 
@@ -140,7 +140,7 @@ class InTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 
                $this->assertSame(11, $inQuery->count());
 
-               $newObjectStorage = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
+               $newObjectStorage = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
                $newObjectStorage->attach($blog1);
 
                $newInQuery = $this->postRepository->createQuery();
index 4cbff0b..8fb26bd 100644 (file)
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Controller;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 /**
  * Test case
@@ -131,29 +133,6 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @test
         */
-       public function resolveViewObjectNameUsesDeprecatedViewObjectNamePatternForExtensionsWithoutVendor() {
-               eval('class Tx_MyPackage_View_MyController_MyActionMyFormat {}');
-
-               $mockRequest = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Request', array(), array(), '', FALSE);
-               $mockRequest->expects($this->once())->method('getControllerExtensionName')->will($this->returnValue('MyPackage'));
-               $mockRequest->expects($this->once())->method('getControllerName')->will($this->returnValue('MyController'));
-               $mockRequest->expects($this->once())->method('getControllerActionName')->will($this->returnValue('MyAction'));
-               $mockRequest->expects($this->once())->method('getControllerVendorName')->will($this->returnValue(NULL));
-               $mockRequest->expects($this->atLeastOnce())->method('getFormat')->will($this->returnValue('MyFormat'));
-               $mockObjectManager = $this->getMock('TYPO3\\CMS\\Extbase\\Object\\ObjectManagerInterface', array(), array(), '', FALSE);
-               $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('dummy'), array(), '', FALSE);
-               $mockController->_set('request', $mockRequest);
-               $mockController->_set('objectManager', $mockObjectManager);
-
-               $this->assertEquals(
-                       'Tx_MyPackage_View_MyController_MyActionMyFormat',
-                       $mockController->_call('resolveViewObjectName')
-               );
-       }
-
-       /**
-        * @test
-        */
        public function resolveViewObjectNameUsesNamespacedViewObjectNamePatternForExtensionsWithVendor() {
                eval('namespace MyVendor\MyPackage\View\MyController; class MyActionMyFormat {}');
 
@@ -328,7 +307,9 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @param array $expected
         */
        public function setViewConfigurationResolvesTemplateRootPathsForTemplateRootPath($configuration, $expected) {
+               /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $mockController */
                $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('dummy'), array(), '', FALSE);
+               /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
                $mockConfigurationManager = $this->getMock('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
                $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($configuration));
                $mockController->injectConfigurationManager($mockConfigurationManager);
@@ -343,15 +324,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function templateRootPathDataProvider() {
                return array(
-                       'old behaviour only' => array(
-                               array(
-                                       'view' => array(
-                                               'templateRootPath' => 'some path'
-                                       )
-                               ),
-                               array('some path')
-                       ),
-                       'new behaviour only with text keys' => array(
+                       'text keys' => array(
                                array(
                                        'view' => array(
                                                'templateRootPaths' => array(
@@ -365,7 +338,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        'default' => 'some path'
                                )
                        ),
-                       'new behaviour only with numerical keys' => array(
+                       'numerical keys' => array(
                                array(
                                        'view' => array(
                                                'templateRootPaths' => array(
@@ -381,7 +354,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        '10' => 'some path'
                                )
                        ),
-                       'new behaviour only with mixed keys' => array(
+                       'mixed keys' => array(
                                array(
                                        'view' => array(
                                                'templateRootPaths' => array(
@@ -397,60 +370,6 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        '10' => 'some path'
                                )
                        ),
-                       'old and new behaviour mixed with text keys' => array(
-                               array(
-                                       'view' => array(
-                                               'templateRootPaths' => array(
-                                                       'default' => 'some path',
-                                                       'specific' => 'intermediate specific path',
-                                                       'very_specific' => 'some other path'
-                                               ),
-                                               'templateRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       'very_specific' => 'some other path',
-                                       'specific' => 'intermediate specific path',
-                                       'default' => 'some path',
-                                       '0' => 'old path'
-                               )
-                       ),
-                       'old and new behaviour mixed with numerical keys' => array(
-                               array(
-                                       'view' => array(
-                                               'templateRootPaths' => array(
-                                                       '10' => 'some path',
-                                                       '20' => 'intermediate specific path',
-                                                       '30' => 'some other path'
-                                               ),
-                                               'templateRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       '30' => 'some other path',
-                                       '20' => 'intermediate specific path',
-                                       '10' => 'some path',
-                                       '31' => 'old path'
-                               )
-                       ),
-                       'old and new behaviour mixed with mixed keys' => array(
-                               array(
-                                       'view' => array(
-                                               'templateRootPaths' => array(
-                                                       '10' => 'some path',
-                                                       'very_specific' => 'some other path',
-                                                       '15' => 'intermediate specific path'
-                                               ),
-                                               'templateRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       '15' => 'intermediate specific path',
-                                       'very_specific' => 'some other path',
-                                       '10' => 'some path',
-                                       '16' => 'old path'
-                               )
-                       )
                );
        }
 
@@ -462,7 +381,9 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @param array $expected
         */
        public function setViewConfigurationResolvesLayoutRootPathsForLayoutRootPath($configuration, $expected) {
+               /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $mockController */
                $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('dummy'), array(), '', FALSE);
+               /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
                $mockConfigurationManager = $this->getMock('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
                $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($configuration));
                $mockController->injectConfigurationManager($mockConfigurationManager);
@@ -477,15 +398,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function layoutRootPathDataProvider() {
                return array(
-                       'old behaviour only' => array(
-                               array(
-                                       'view' => array(
-                                               'layoutRootPath' => 'some path'
-                                       )
-                               ),
-                               array('some path')
-                       ),
-                       'new behaviour only with text keys' => array(
+                       'text keys' => array(
                                array(
                                        'view' => array(
                                                'layoutRootPaths' => array(
@@ -499,7 +412,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        'default' => 'some path'
                                )
                        ),
-                       'new behaviour only with numerical keys' => array(
+                       'numerical keys' => array(
                                array(
                                        'view' => array(
                                                'layoutRootPaths' => array(
@@ -515,7 +428,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        '10' => 'some path'
                                )
                        ),
-                       'new behaviour only with mixed keys' => array(
+                       'mixed keys' => array(
                                array(
                                        'view' => array(
                                                'layoutRootPaths' => array(
@@ -531,60 +444,6 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        '10' => 'some path'
                                )
                        ),
-                       'old and new behaviour mixed with text keys' => array(
-                               array(
-                                       'view' => array(
-                                               'layoutRootPaths' => array(
-                                                       'default' => 'some path',
-                                                       'specific' => 'intermediate specific path',
-                                                       'very_specific' => 'some other path'
-                                               ),
-                                               'layoutRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       'very_specific' => 'some other path',
-                                       'specific' => 'intermediate specific path',
-                                       'default' => 'some path',
-                                       '0' => 'old path'
-                               )
-                       ),
-                       'old and new behaviour mixed with numerical keys' => array(
-                               array(
-                                       'view' => array(
-                                               'layoutRootPaths' => array(
-                                                       '10' => 'some path',
-                                                       '20' => 'intermediate specific path',
-                                                       '30' => 'some other path'
-                                               ),
-                                               'layoutRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       '30' => 'some other path',
-                                       '20' => 'intermediate specific path',
-                                       '10' => 'some path',
-                                       '31' => 'old path'
-                               )
-                       ),
-                       'old and new behaviour mixed with mixed keys' => array(
-                               array(
-                                       'view' => array(
-                                               'layoutRootPaths' => array(
-                                                       '10' => 'some path',
-                                                       'very_specific' => 'some other path',
-                                                       '15' => 'intermediate specific path'
-                                               ),
-                                               'layoutRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       '15' => 'intermediate specific path',
-                                       'very_specific' => 'some other path',
-                                       '10' => 'some path',
-                                       '16' => 'old path'
-                               )
-                       )
                );
        }
 
@@ -596,7 +455,9 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @param array $expected
         */
        public function setViewConfigurationResolvesPartialRootPathsForPartialRootPath($configuration, $expected) {
+               /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $mockController */
                $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('dummy'), array(), '', FALSE);
+               /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
                $mockConfigurationManager = $this->getMock('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
                $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($configuration));
                $mockController->injectConfigurationManager($mockConfigurationManager);
@@ -611,15 +472,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function partialRootPathDataProvider() {
                return array(
-                       'old behaviour only' => array(
-                               array(
-                                       'view' => array(
-                                               'partialRootPath' => 'some path'
-                                       )
-                               ),
-                               array('some path')
-                       ),
-                       'new behaviour only with text keys' => array(
+                       'text keys' => array(
                                array(
                                        'view' => array(
                                                'partialRootPaths' => array(
@@ -633,7 +486,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        'default' => 'some path'
                                )
                        ),
-                       'new behaviour only with numerical keys' => array(
+                       'numerical keys' => array(
                                array(
                                        'view' => array(
                                                'partialRootPaths' => array(
@@ -649,7 +502,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        '10' => 'some path'
                                )
                        ),
-                       'new behaviour only with mixed keys' => array(
+                       'mixed keys' => array(
                                array(
                                        'view' => array(
                                                'partialRootPaths' => array(
@@ -665,60 +518,6 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                        '10' => 'some path'
                                )
                        ),
-                       'old and new behaviour mixed with text keys' => array(
-                               array(
-                                       'view' => array(
-                                               'partialRootPath' => 'old path',
-                                               'partialRootPaths' => array(
-                                                       'default' => 'some path',
-                                                       'specific' => 'intermediate specific path',
-                                                       'very_specific' => 'some other path'
-                                               )
-                                       )
-                               ),
-                               array(
-                                       'very_specific' => 'some other path',
-                                       'specific' => 'intermediate specific path',
-                                       'default' => 'some path',
-                                       '0' => 'old path'
-                               )
-                       ),
-                       'old and new behaviour mixed with numerical keys' => array(
-                               array(
-                                       'view' => array(
-                                               'partialRootPaths' => array(
-                                                       '10' => 'some path',
-                                                       '20' => 'intermediate specific path',
-                                                       '30' => 'some other path'
-                                               ),
-                                               'partialRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       '30' => 'some other path',
-                                       '20' => 'intermediate specific path',
-                                       '10' => 'some path',
-                                       '31' => 'old path'
-                               )
-                       ),
-                       'old and new behaviour mixed with mixed keys' => array(
-                               array(
-                                       'view' => array(
-                                               'partialRootPaths' => array(
-                                                       '10' => 'some path',
-                                                       'very_specific' => 'some other path',
-                                                       '15' => 'intermediate specific path'
-                                               ),
-                                               'partialRootPath' => 'old path'
-                                       )
-                               ),
-                               array(
-                                       '15' => 'intermediate specific path',
-                                       'very_specific' => 'some other path',
-                                       '10' => 'some path',
-                                       '16' => 'old path'
-                               )
-                       )
                );
        }
 }
index 7802336..f70aabe 100644 (file)
@@ -78,17 +78,6 @@ class QueryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @test
         */
-       public function executeReturnsRawObjectDataIfRawQueryResultSettingIsTrue() {
-               $this->querySettings->expects($this->once())->method('getReturnRawQueryResult')->will($this->returnValue(TRUE));
-               $this->persistenceManager->expects($this->once())->method('getObjectDataByQuery')->with($this->query)->will($this->returnValue('rawQueryResult'));
-               $expectedResult = 'rawQueryResult';
-               $actualResult = $this->query->execute();
-               $this->assertEquals($expectedResult, $actualResult);
-       }
-
-       /**
-        * @test
-        */
        public function executeReturnsRawObjectDataIfReturnRawQueryResultIsSet() {
                $this->persistenceManager->expects($this->once())->method('getObjectDataByQuery')->with($this->query)->will($this->returnValue('rawQueryResult'));
                $expectedResult = 'rawQueryResult';
index a27e783..37fed7a 100644 (file)
@@ -176,22 +176,4 @@ class Typo3QuerySettingsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function setIncludeDeletedAllowsChaining() {
                $this->assertTrue($this->typo3QuerySettings->setIncludeDeleted(TRUE) instanceof \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface);
        }
-
-       /**
-        * @test
-        * @dataProvider booleanValueProvider
-        *
-        * @param bool $input
-        */
-       public function setReturnRawQueryResultSetsReturnRawQueryResultCorrectly($input) {
-               $this->typo3QuerySettings->setReturnRawQueryResult($input);
-               $this->assertEquals($input, $this->typo3QuerySettings->getReturnRawQueryResult());
-       }
-
-       /**
-        * @test
-        */
-       public function setReturnRawQueryResultAllowsChaining() {
-               $this->assertTrue($this->typo3QuerySettings->setReturnRawQueryResult(TRUE) instanceof \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface);
-       }
 }