diff --git a/typo3/sysext/backend/Classes/Tree/TreeNode.php b/typo3/sysext/backend/Classes/Tree/TreeNode.php
index ef616a5fb90bf77f7a52c07cdae9bba6b13d0cd5..8999973ce6fa00a207b6325ff0049b720b34ae7a 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNode.php
@@ -64,7 +64,6 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
* This is useful for the deserialization.
*
* @param array $data
- * @return void
*/
public function __construct(array $data = array()) {
if (count($data)) {
@@ -137,7 +136,7 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
/**
* Sets the parent node
*
- * @param \TYPO3\CMS\Backend\Tree\TreeNode $parentNode
+ * @param NULL|\TYPO3\CMS\Backend\Tree\TreeNode $parentNode
* @return void
*/
public function setParentNode(\TYPO3\CMS\Backend\Tree\TreeNode $parentNode = NULL) {
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
index bfb7d2d6488f986c0841669f5c222c04b0292152..b4f34707220568d5271f78667261be3dd0b48ee1 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
@@ -31,7 +31,6 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
*
* @author Steffen Ritter <info@steffen-ritter.net>
* @package TYPO3
- * @subpackage t3lib_tree
*/
abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
@@ -46,10 +45,15 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
protected $levelMaximum = 2;
/**
- * @var t3lib_tree_AbstractNode
+ * @var \TYPO3\CMS\Backend\Tree\TreeNode
*/
protected $treeData = NULL;
+ /**
+ * @var string
+ */
+ protected $treeId;
+
/**
* @var string
*/
@@ -138,7 +142,7 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
/**
* Gets the expanded state of a given node
*
- * @param t3lib_tree_AbstractNode $node
+ * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
* @return boolean
*/
protected function isExpanded(\TYPO3\CMS\Backend\Tree\TreeNode $node) {
@@ -250,6 +254,4 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
}
}
-
-
?>
\ No newline at end of file
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index 86015c650f8d584a53827b99c18602a7b690b303..7e01815c6a1e9ee3f4183a9226ebaf18d95776a0 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -185,7 +185,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
/**
* Gets the root node
*
- * @return t3lib_tree_tca_DatabaseNode
+ * @return \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode
*/
public function getRoot() {
return $this->buildRepresentationForNode($this->treeData);
@@ -216,7 +216,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
* @param string $tableWhere
* @return void
*/
- public function setTableWhere(string $tableWhere) {
+ public function setTableWhere($tableWhere) {
$this->tableWhere = $tableWhere;
}
@@ -233,12 +233,13 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
* Builds a complete node including childs
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $basicNode
- * @param NULL|t3lib_tree_tca_DatabaseNode $parent
+ * @param NULL|\TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode $parent
* @param integer $level
- * @return An object
+ * @return \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode Node object
*/
- protected function buildRepresentationForNode(\TYPO3\CMS\Backend\Tree\TreeNode $basicNode, \t3lib_tree_tca_DatabaseNode $parent = NULL, $level = 0) {
- $node = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_tree_tca_DatabaseNode');
+ protected function buildRepresentationForNode(\TYPO3\CMS\Backend\Tree\TreeNode $basicNode, \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode $parent = NULL, $level = 0) {
+ /** @var $node \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode */
+ $node = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Tree\\TableConfiguration\\DatabaseTreeNode');
$row = array();
if ($basicNode->getId() == 0) {
$node->setSelected(FALSE);
@@ -261,6 +262,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
$node->setParentNode($parent);
if ($basicNode->hasChildNodes()) {
$node->setHasChildren(TRUE);
+ /** @var $childNodes \TYPO3\CMS\Backend\Tree\SortedTreeNodeCollection */
$childNodes = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\SortedTreeNodeCollection');
foreach ($basicNode->getChildNodes() as $child) {
$childNodes->append($this->buildRepresentationForNode($child, $node, $level + 1));
@@ -296,7 +298,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $node
* @param integer $level
- * @return NULL|object
+ * @return NULL|\TYPO3\CMS\Backend\Tree\TreeNodeCollection
*/
protected function getChildrenOf(\TYPO3\CMS\Backend\Tree\TreeNode $node, $level) {
$nodeData = NULL;
@@ -312,6 +314,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
$storage = NULL;
$children = $this->getRelatedRecords($nodeData);
if (count($children)) {
+ /** @var $storage \TYPO3\CMS\Backend\Tree\TreeNodeCollection */
$storage = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNodeCollection');
foreach ($children as $child) {
$node = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNode');
@@ -335,7 +338,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
* @return array
*/
protected function getRelatedRecords(array $row) {
- if ($this->getLookupMode() == \t3lib_tree_tca_DatabaseTreeDataProvider::MODE_PARENT) {
+ if ($this->getLookupMode() == \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider::MODE_PARENT) {
$children = $this->getChildrenUidsFromParentRelation($row);
} else {
$children = $this->getChildrenUidsFromChildrenRelation($row);
@@ -363,6 +366,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
case 'select':
if ($this->columnConfiguration['MM']) {
+ /** @var $dbGroup \TYPO3\CMS\Core\Database\RelationHandler */
$dbGroup = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
// Dummy field for setting "look from other site"
$this->columnConfiguration['MM_oppositeField'] = 'children';
@@ -395,6 +399,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
case 'select':
if ($this->columnConfiguration['MM']) {
+ /** @var $dbGroup \TYPO3\CMS\Core\Database\RelationHandler */
$dbGroup = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
$dbGroup->start($value, $this->getTableName(), $this->columnConfiguration['MM'], $uid, $this->getTableName(), $this->columnConfiguration);
$relatedUids = $dbGroup->tableArray[$this->getTableName()];