[~CLEANUP] smaller deprecated clean-ups

As a backport Extbase is influenced by all the changes in FLOW. It's
important to keep both in sync and thus deprecate code which is not
in FLOW3 anymore or which has changed.

All deprecated annotations should now match the CGL and all removals
are terminated in the future.

* clean up deprecation annotation
* remove code which was deprecated long enough

Change-Id: Ic1b6217bc6c9100b6c48c5d30eca6068417265a8

diff --git a/typo3/sysext/extbase/Classes/Persistence/Query.php b/typo3/sysext/extbase/Classes/Persistence/Query.php
index 5eb0dbc..cca1e75 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Query.php
@@ -226,18 +226,6 @@ class Tx_Extbase_Persistence_Query implements Tx_Extbase_Persistence_QueryInterf
                }
        }
 
-       /**
-        * Executes the number of matching objects for the query
-        *
-        * @return integer The number of matching objects
-        * @deprecated since Extbase 1.3.0; was removed in FLOW3; will be removed in Extbase 1.4.0; use Query::execute()::count() instead
-        * @api
-        */
-       public function count() {
-               t3lib_div::logDeprecatedFunction();
-               return $this->persistenceManager->getObjectCountByQuery($this);
-       }
-
        /**
         * Sets the property names to order the result by. Expected like this:
         * array(
@@ -428,22 +416,6 @@ class Tx_Extbase_Persistence_Query implements Tx_Extbase_Persistence_QueryInterf
                return $this->qomFactory->not($constraint);
        }
 
-       /**
-        * Matches against the (internal) uid.
-        *
-        * @param int $uid The uid to match against
-        * @return Tx_Extbase_Persistence_QOM_ComparisonInterface
-        * @deprecated since Extbase 1.2.0; was removed in FLOW3; will be removed in Extbase 1.3.0; use equals() instead
-        */
-       public function withUid($operand) {
-               t3lib_div::logDeprecatedFunction();
-               return $this->qomFactory->comparison(
-                       $this->qomFactory->propertyValue('uid', $this->getSelectorName()),
-                       Tx_Extbase_Persistence_QueryInterface::OPERATOR_EQUAL_TO,
-                       $operand
-                       );
-       }
-
        /**
         * Returns an equals criterion used for matching objects against a query
         *

diff --git a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
index db182df..fb901b9 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
@@ -517,8 +517,12 @@ class Tx_Extbase_Persistence_Storage_Typo3DbBackend implements Tx_Extbase_Persis
                $operand1 = $comparison->getOperand1();
                $operator = $comparison->getOperator();
                $operand2 = $comparison->getOperand2();
+
+                       /**
+                        * This if enables equals() to behave like in(). Use in() instead.
+                        * @deprecated since Extbase 1.3; will be removed in Extbase 1.5
+                        */
                if (($operator === Tx_Extbase_Persistence_QueryInterface::OPERATOR_EQUAL_TO) && (is_array($operand2) || ($operand2 instanceof ArrayAccess) || ($operand2 instanceof Traversable))) {
-                       // this else branch enables equals() to behave like in(). This behavior is deprecated and will be removed in future. Use in() instead.
                        $operator = Tx_Extbase_Persistence_QueryInterface::OPERATOR_IN;
                }
 

diff --git a/typo3/sysext/extbase/Tests/BaseTestCase.php b/typo3/sysext/extbase/Tests/BaseTestCase.php
index b36f88b..7d1cb41 100644 (file)
--- a/typo3/sysext/extbase/Tests/BaseTestCase.php
+++ b/typo3/sysext/extbase/Tests/BaseTestCase.php
@@ -28,8 +28,9 @@
 
 
 /**
- * Base testcase for the Extbase extension.
- * @deprecated use Tx_Extbase_Tests_Unit_BaseTestCase instead
+ * Was the base testcase for the Extbase extension.
+ * Use Tx_Extbase_Tests_Unit_BaseTestCase instead.
+ * @deprecated since Extbase 1.3; will be removed in Extbase 1.5
  */
 abstract class Tx_Extbase_BaseTestCase extends Tx_Extbase_Tests_Unit_BaseTestCase {