Skip to content

Commit ac33680

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch 'MAGETWO-62107' into 2.3-bugfixes-150818
2 parents 05f9df7 + 62326e7 commit ac33680

File tree

4 files changed

+79
-116
lines changed

4 files changed

+79
-116
lines changed

lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php

Lines changed: 0 additions & 116 deletions
This file was deleted.

lib/internal/Magento/Framework/DB/Tree.php

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* Magento Library
1616
*
1717
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
18+
*
19+
* @deprecated Not used anymore.
1820
*/
1921
class Tree
2022
{
@@ -77,6 +79,8 @@ class Tree
7779
* @throws LocalizedException
7880
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
7981
* @SuppressWarnings(PHPMD.NPathComplexity)
82+
*
83+
* @deprecated Not used anymore.
8084
*/
8185
public function __construct($config = [])
8286
{
@@ -149,6 +153,8 @@ public function __construct($config = [])
149153
*
150154
* @param string $name
151155
* @return $this
156+
*
157+
* @deprecated Not used anymore.
152158
*/
153159
public function setIdField($name)
154160
{
@@ -161,6 +167,8 @@ public function setIdField($name)
161167
*
162168
* @param string $name
163169
* @return $this
170+
*
171+
* @deprecated Not used anymore.
164172
*/
165173
public function setLeftField($name)
166174
{
@@ -173,6 +181,8 @@ public function setLeftField($name)
173181
*
174182
* @param string $name
175183
* @return $this
184+
*
185+
* @deprecated Not used anymore.
176186
*/
177187
public function setRightField($name)
178188
{
@@ -185,6 +195,8 @@ public function setRightField($name)
185195
*
186196
* @param string $name
187197
* @return $this
198+
*
199+
* @deprecated Not used anymore.
188200
*/
189201
public function setLevelField($name)
190202
{
@@ -197,6 +209,8 @@ public function setLevelField($name)
197209
*
198210
* @param string $name
199211
* @return $this
212+
*
213+
* @deprecated Not used anymore.
200214
*/
201215
public function setPidField($name)
202216
{
@@ -209,6 +223,8 @@ public function setPidField($name)
209223
*
210224
* @param string $name
211225
* @return $this
226+
*
227+
* @deprecated Not used anymore.
212228
*/
213229
public function setTable($name)
214230
{
@@ -218,6 +234,8 @@ public function setTable($name)
218234

219235
/**
220236
* @return array
237+
*
238+
* @deprecated Not used anymore.
221239
*/
222240
public function getKeys()
223241
{
@@ -235,6 +253,8 @@ public function getKeys()
235253
*
236254
* @param array $data
237255
* @return string
256+
*
257+
* @deprecated Not used anymore.
238258
*/
239259
public function clear($data = [])
240260
{
@@ -260,6 +280,8 @@ public function clear($data = [])
260280
*
261281
* @param string|int $nodeId
262282
* @return array
283+
*
284+
* @deprecated Not used anymore.
263285
*/
264286
public function getNodeInfo($nodeId)
265287
{
@@ -279,6 +301,8 @@ public function getNodeInfo($nodeId)
279301
* @param array $data
280302
* @return false|string
281303
* @SuppressWarnings(PHPMD.ExitExpression)
304+
*
305+
* @deprecated Not used anymore.
282306
*/
283307
public function appendChild($nodeId, $data)
284308
{
@@ -345,6 +369,8 @@ public function appendChild($nodeId, $data)
345369

346370
/**
347371
* @return array
372+
*
373+
* @deprecated Not used anymore.
348374
*/
349375
public function checkNodes()
350376
{
@@ -375,6 +401,8 @@ public function checkNodes()
375401
/**
376402
* @param string|int $nodeId
377403
* @return bool|Node|void
404+
*
405+
* @deprecated Not used anymore.
378406
*/
379407
public function removeNode($nodeId)
380408
{
@@ -450,6 +478,8 @@ public function removeNode($nodeId)
450478
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
451479
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
452480
* @SuppressWarnings(PHPMD.ExitExpression)
481+
*
482+
* @deprecated Not used anymore.
453483
*/
454484
public function moveNode($eId, $pId, $aId = 0)
455485
{
@@ -785,6 +815,8 @@ public function moveNode($eId, $pId, $aId = 0)
785815
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
786816
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
787817
* @SuppressWarnings(PHPMD.ExitExpression)
818+
*
819+
* @deprecated Not used anymore.
788820
*/
789821
public function moveNodes($eId, $pId, $aId = 0)
790822
{
@@ -983,6 +1015,8 @@ public function moveNodes($eId, $pId, $aId = 0)
9831015
* @param string $joinCondition
9841016
* @param string $fields
9851017
* @return void
1018+
*
1019+
* @deprecated Not used anymore.
9861020
*/
9871021
public function addTable($tableName, $joinCondition, $fields = '*')
9881022
{
@@ -992,6 +1026,8 @@ public function addTable($tableName, $joinCondition, $fields = '*')
9921026
/**
9931027
* @param Select $select
9941028
* @return void
1029+
*
1030+
* @deprecated Not used anymore.
9951031
*/
9961032
protected function _addExtTablesToSelect(Select &$select)
9971033
{
@@ -1006,6 +1042,8 @@ protected function _addExtTablesToSelect(Select &$select)
10061042
* @param int $endLevel
10071043
* @return NodeSet
10081044
* @SuppressWarnings(PHPMD.ExitExpression)
1045+
*
1046+
* @deprecated Not used anymore.
10091047
*/
10101048
public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
10111049
{
@@ -1051,6 +1089,8 @@ public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
10511089
/**
10521090
* @param string|int $nodeId
10531091
* @return Node
1092+
*
1093+
* @deprecated Not used anymore.
10541094
*/
10551095
public function getNode($nodeId)
10561096
{

lib/internal/Magento/Framework/DB/Tree/Node.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* @SuppressWarnings(PHPMD.UnusedPrivateField)
13+
*
14+
* @deprecated Not used anymore.
1315
*/
1416
class Node
1517
{
@@ -50,18 +52,24 @@ class Node
5052

5153
/**
5254
* @var bool
55+
*
56+
* @deprecated
5357
*/
5458
public $hasChild = false;
5559

5660
/**
5761
* @var float|int
62+
*
63+
* @deprecated
5864
*/
5965
public $numChild = 0;
6066

6167
/**
6268
* @param array $nodeData
6369
* @param array $keys
6470
* @throws LocalizedException
71+
*
72+
* @deprecated
6573
*/
6674
public function __construct($nodeData, $keys)
6775
{
@@ -94,6 +102,8 @@ public function __construct($nodeData, $keys)
94102
/**
95103
* @param string $name
96104
* @return null|array
105+
*
106+
* @deprecated
97107
*/
98108
public function getData($name)
99109
{
@@ -106,6 +116,8 @@ public function getData($name)
106116

107117
/**
108118
* @return int
119+
*
120+
* @deprecated
109121
*/
110122
public function getLevel()
111123
{
@@ -114,6 +126,8 @@ public function getLevel()
114126

115127
/**
116128
* @return int
129+
*
130+
* @deprecated
117131
*/
118132
public function getLeft()
119133
{
@@ -122,6 +136,8 @@ public function getLeft()
122136

123137
/**
124138
* @return int
139+
*
140+
* @deprecated
125141
*/
126142
public function getRight()
127143
{
@@ -130,6 +146,8 @@ public function getRight()
130146

131147
/**
132148
* @return string|int
149+
*
150+
* @deprecated
133151
*/
134152
public function getPid()
135153
{
@@ -138,6 +156,8 @@ public function getPid()
138156

139157
/**
140158
* @return string|int
159+
*
160+
* @deprecated
141161
*/
142162
public function getId()
143163
{
@@ -148,6 +168,8 @@ public function getId()
148168
* Return true if node has child
149169
*
150170
* @return bool
171+
*
172+
* @deprecated
151173
*/
152174
public function isParent()
153175
{

0 commit comments

Comments
 (0)