[TASK] Deprecate TS property andWhere 00/35800/5
authorGeorg Ringer <georg.ringer@gmail.com>
Mon, 5 Jan 2015 19:24:12 +0000 (20:24 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 8 Jan 2015 11:16:32 +0000 (12:16 +0100)
As the property "where" got full stdWrap support, there is no
need to keep "andWhere".

Resolves: #25112
Releases: master
Change-Id: Iffe166047d022508e2808e681f3693859bc58041
Reviewed-on: http://review.typo3.org/35800
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/core/Documentation/Changelog/master/Deprecation-25112-andWhere.rst [new file with mode: 0644]
typo3/sysext/css_styled_content/static/setup.txt
typo3/sysext/css_styled_content/static/v4.5/setup.txt
typo3/sysext/css_styled_content/static/v4.6/setup.txt
typo3/sysext/css_styled_content/static/v4.7/setup.txt
typo3/sysext/css_styled_content/static/v6.0/setup.txt
typo3/sysext/css_styled_content/static/v6.1/setup.txt
typo3/sysext/css_styled_content/static/v6.2/setup.txt
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-25112-andWhere.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-25112-andWhere.rst
new file mode 100644 (file)
index 0000000..2074c91
--- /dev/null
@@ -0,0 +1,52 @@
+==============================================================
+Deprecation: #25112 - Deprecate TypoScript property "andWhere"
+==============================================================
+
+Description
+===========
+
+The select-property "andWhere" is deprecated.
+
+Impact
+======
+
+A deprecation message is logged for every usage of the property.
+
+
+Affected installations
+======================
+
+All installations or extensions using the select-property "andWhere".
+
+
+Migration
+=========
+
+Use the properties "where" or "markers" instead.
+
+.. code-block:: typoscript
+       page.30 = CONTENT
+       page.30 {
+               table = tt_content
+               select {
+                       pidInList = this
+                       orderBy = sorting
+                       where {
+                               dataWrap = sorting>{field:sorting}
+                       }
+               }
+       }
+       page.60 = CONTENT
+       page.60 {
+         table = tt_content
+         select {
+               pidInList = 73
+               where = header != ###whatever###
+               orderBy = ###sortfield###
+               markers {
+                 whatever.data = GP:first
+                 sortfield.value = sor
+                 sortfield.wrap = |ting
+               }
+         }
+       }
index 84bfbce..114269e 100644 (file)
@@ -1803,7 +1803,7 @@ tt_content.menu {
                                                select {
                                                        pidInList = this
                                                        orderBy = sorting
-                                                       andWhere {
+                                                       where {
                                                                dataWrap = sorting>{field:sorting}
                                                        }
                                                        languageField = sys_language_uid
index 5ac83b6..a1ac612 100644 (file)
@@ -1432,7 +1432,7 @@ tt_content.menu {
                3 < styles.content.get
                3 {
                        wrap = <ul class="csc-menu csc-menu-3">|</ul>
-                       select.andWhere = sectionIndex<>0
+                       select.where = sectionIndex<>0
                        select.pidInList.override.field = pages
                        renderObj = TEXT
                        renderObj {
index 6856d2a..1979861 100644 (file)
@@ -1382,7 +1382,7 @@ tt_content.menu {
                3 < styles.content.get
                3 {
                        wrap = <ul class="csc-menu csc-menu-3">|</ul>
-                       select.andWhere = sectionIndex!=0
+                       select.where = sectionIndex!=0
                        select.pidInList.override.field = pages
                        renderObj = TEXT
                        renderObj {
index df9086c..854c4d3 100644 (file)
@@ -1756,7 +1756,7 @@ tt_content.menu {
                                                select {
                                                        pidInList = this
                                                        orderBy = sorting
-                                                       andWhere {
+                                                       where {
                                                                dataWrap = sorting>{field:sorting}
                                                        }
                                                        languageField = sys_language_uid
index 16272de..0f9f4c4 100644 (file)
@@ -1743,7 +1743,7 @@ tt_content.menu {
                                                select {
                                                        pidInList = this
                                                        orderBy = sorting
-                                                       andWhere {
+                                                       where {
                                                                dataWrap = sorting>{field:sorting}
                                                        }
                                                        languageField = sys_language_uid
index 160137f..f8abe14 100644 (file)
@@ -1744,7 +1744,7 @@ tt_content.menu {
                                                select {
                                                        pidInList = this
                                                        orderBy = sorting
-                                                       andWhere {
+                                                       where {
                                                                dataWrap = sorting>{field:sorting}
                                                        }
                                                        languageField = sys_language_uid
index 0f35b9e..5b107ce 100644 (file)
@@ -1798,7 +1798,7 @@ tt_content.menu {
                                                select {
                                                        pidInList = this
                                                        orderBy = sorting
-                                                       andWhere {
+                                                       where {
                                                                dataWrap = sorting>{field:sorting}
                                                        }
                                                        languageField = sys_language_uid
index 42e09ac..df9f7fb 100644 (file)
@@ -7912,6 +7912,7 @@ class ContentObjectRenderer {
                }
                $andWhere = isset($conf['andWhere.']) ? trim($this->stdWrap($conf['andWhere'], $conf['andWhere.'])) : trim($conf['andWhere']);
                if ($andWhere) {
+                       GeneralUtility::deprecationLog('Usage of TypoScript property "andWhere" is deprecated since 7.1 in favor of "where". It has been used to query the table "' . $table . '".');
                        $query .= ' AND ' . $andWhere;
                }
                // Enablefields