@@ -48,7 +48,7 @@ |
||
48 | 48 | |
49 | 49 | /** |
50 | 50 | * @param string $method |
51 | - * @param array $list |
|
51 | + * @param string[] $list |
|
52 | 52 | * @param array $arguments |
53 | 53 | * @param bool $firstOnly |
54 | 54 | * @return mixed |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace paulzi\autotree\tests; |
9 | 9 | |
10 | 10 | use paulzi\autotree\tests\models\NodeAlMp; |
11 | -use Yii; |
|
12 | 11 | |
13 | 12 | /** |
14 | 13 | * @author PaulZi <[email protected]> |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | |
29 | 29 | $node->refresh(); |
30 | 30 | $this->assertEquals(null, $node->parent_id); |
31 | - $this->assertEquals(0, $node->sort); |
|
32 | - $this->assertEquals(0, $node->depth); |
|
31 | + $this->assertEquals(0, $node->sort); |
|
32 | + $this->assertEquals(0, $node->depth); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public function testMakeRootUpdate() |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | $node->refresh(); |
41 | 41 | $this->assertEquals(null, $node->parent_id); |
42 | - $this->assertEquals(0, $node->sort); |
|
43 | - $this->assertEquals(0, $node->depth); |
|
42 | + $this->assertEquals(0, $node->sort); |
|
43 | + $this->assertEquals(0, $node->depth); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function testPrependTo() |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | $this->assertTrue($node->prependTo(NodeAlMp::findOne(1))->save()); |
50 | 50 | |
51 | 51 | $node->refresh(); |
52 | - $this->assertEquals(1, $node->parent_id); |
|
52 | + $this->assertEquals(1, $node->parent_id); |
|
53 | 53 | $this->assertEquals(-101, $node->sort); |
54 | - $this->assertEquals(1, $node->depth); |
|
54 | + $this->assertEquals(1, $node->depth); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | public function testPrependToAnotherTree() |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | $this->assertTrue($node->prependTo(NodeAlMp::findOne(4))->save()); |
61 | 61 | |
62 | 62 | $node->refresh(); |
63 | - $this->assertEquals(4, $node->parent_id); |
|
63 | + $this->assertEquals(4, $node->parent_id); |
|
64 | 64 | $this->assertEquals(-100, $node->sort); |
65 | - $this->assertEquals(2, $node->depth); |
|
65 | + $this->assertEquals(2, $node->depth); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public function testAppendTo() |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace paulzi\autotree\tests; |
9 | 9 | |
10 | 10 | use paulzi\autotree\tests\models\NodeAlNi; |
11 | -use Yii; |
|
12 | 11 | |
13 | 12 | /** |
14 | 13 | * @author PaulZi <[email protected]> |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function getDataSet() |
23 | 23 | { |
24 | - return new \PHPUnit_Extensions_Database_DataSet_ArrayDataSet(require(__DIR__ . '/data/data-ni.php')); |
|
24 | + return new \PHPUnit_Extensions_Database_DataSet_ArrayDataSet(require(__DIR__.'/data/data-ni.php')); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function getModelClass() |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | $this->assertTrue($node->makeRoot()->save()); |
36 | 36 | |
37 | 37 | $node->refresh(); |
38 | - $this->assertEquals(null, $node->parent_id); |
|
39 | - $this->assertEquals(0, $node->lft); |
|
38 | + $this->assertEquals(null, $node->parent_id); |
|
39 | + $this->assertEquals(0, $node->lft); |
|
40 | 40 | $this->assertEquals(2147483647, $node->rgt); |
41 | - $this->assertEquals(0, $node->depth); |
|
41 | + $this->assertEquals(0, $node->depth); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | public function testMakeRootUpdate() |
@@ -47,10 +47,10 @@ discard block |
||
47 | 47 | $this->assertTrue($node->makeRoot()->save()); |
48 | 48 | |
49 | 49 | $node->refresh(); |
50 | - $this->assertEquals(null, $node->parent_id); |
|
51 | - $this->assertEquals(0, $node->lft); |
|
50 | + $this->assertEquals(null, $node->parent_id); |
|
51 | + $this->assertEquals(0, $node->lft); |
|
52 | 52 | $this->assertEquals(2147483647, $node->rgt); |
53 | - $this->assertEquals(0, $node->depth); |
|
53 | + $this->assertEquals(0, $node->depth); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | public function testPrependTo() |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace paulzi\autotree\tests; |
9 | 9 | |
10 | 10 | use paulzi\autotree\tests\models\NodeAlNs; |
11 | -use Yii; |
|
12 | 11 | |
13 | 12 | /** |
14 | 13 | * @author PaulZi <[email protected]> |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | |
29 | 29 | $node->refresh(); |
30 | 30 | $this->assertEquals(null, $node->parent_id); |
31 | - $this->assertEquals(1, $node->lft); |
|
32 | - $this->assertEquals(2, $node->rgt); |
|
33 | - $this->assertEquals(0, $node->depth); |
|
31 | + $this->assertEquals(1, $node->lft); |
|
32 | + $this->assertEquals(2, $node->rgt); |
|
33 | + $this->assertEquals(0, $node->depth); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function testMakeRootUpdate() |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | |
41 | 41 | $node->refresh(); |
42 | 42 | $this->assertEquals(null, $node->parent_id); |
43 | - $this->assertEquals(1, $node->lft); |
|
44 | - $this->assertEquals(8, $node->rgt); |
|
45 | - $this->assertEquals(0, $node->depth); |
|
43 | + $this->assertEquals(1, $node->lft); |
|
44 | + $this->assertEquals(8, $node->rgt); |
|
45 | + $this->assertEquals(0, $node->depth); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | public function testPrependTo() |
@@ -27,16 +27,16 @@ discard block |
||
27 | 27 | $modelClass = $this->getModelClass(); |
28 | 28 | |
29 | 29 | $data = [1, 4, 9]; |
30 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(21)->parents)); |
|
30 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(21)->parents)); |
|
31 | 31 | |
32 | 32 | $data = []; |
33 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(1)->parents)); |
|
33 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(1)->parents)); |
|
34 | 34 | |
35 | 35 | $data = [2, 7]; |
36 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(17)->getParents(2)->all())); |
|
36 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(17)->getParents(2)->all())); |
|
37 | 37 | |
38 | 38 | $data = [26, 30]; |
39 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(38)->parents)); |
|
39 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(38)->parents)); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function testGetParent() |
@@ -59,17 +59,17 @@ discard block |
||
59 | 59 | $modelClass = $this->getModelClass(); |
60 | 60 | |
61 | 61 | $data = [8, 9, 10, 20, 21, 22, 23, 24, 25]; |
62 | - $data2 = array_map(function ($value) { return $value->id; }, $modelClass::findOne(4)->descendants); |
|
62 | + $data2 = array_map(function($value) { return $value->id; }, $modelClass::findOne(4)->descendants); |
|
63 | 63 | sort($data2); |
64 | 64 | $this->assertEquals($data, $data2); |
65 | 65 | |
66 | 66 | $data = [2, 5, 6, 7]; |
67 | - $data2 = array_map(function ($value) { return $value->id; }, $modelClass::findOne(2)->getDescendants(1, true)->all()); |
|
67 | + $data2 = array_map(function($value) { return $value->id; }, $modelClass::findOne(2)->getDescendants(1, true)->all()); |
|
68 | 68 | sort($data2); |
69 | 69 | $this->assertEquals($data, $data2); |
70 | 70 | |
71 | 71 | $data = []; |
72 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(8)->descendants)); |
|
72 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(8)->descendants)); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | public function testGetChildren() |
@@ -77,10 +77,10 @@ discard block |
||
77 | 77 | $modelClass = $this->getModelClass(); |
78 | 78 | |
79 | 79 | $data = [8, 9, 10]; |
80 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(4)->children)); |
|
80 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(4)->children)); |
|
81 | 81 | |
82 | 82 | $data = []; |
83 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(28)->getChildren()->all())); |
|
83 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(28)->getChildren()->all())); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | public function testGetLeaves() |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | $modelClass = $this->getModelClass(); |
89 | 89 | |
90 | 90 | $data = [8, 20, 21, 22, 23, 24, 25]; |
91 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(4)->leaves)); |
|
91 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(4)->leaves)); |
|
92 | 92 | |
93 | 93 | $data = [3, 8]; |
94 | - $this->assertEquals($data, array_map(function ($value) { return $value->id; }, $modelClass::findOne(1)->getLeaves(2)->all())); |
|
94 | + $this->assertEquals($data, array_map(function($value) { return $value->id; }, $modelClass::findOne(1)->getLeaves(2)->all())); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | public function testGetPrev() |
@@ -1,45 +1,45 @@ |
||
1 | 1 | <?php |
2 | 2 | return array( |
3 | 3 | 'tree' => array( |
4 | - array('id' => '1','parent_id' => null,'sort' => '0', 'tree' => '1','lft' => '1','rgt' => '50','depth' => '0','path' => '1','slug' => 'r1'), |
|
5 | - array('id' => '2','parent_id' => '1','sort' => '-1','tree' => '1','lft' => '2','rgt' => '27','depth' => '1','path' => '1/2','slug' => 'n1'), |
|
6 | - array('id' => '3','parent_id' => '1','sort' => '0','tree' => '1','lft' => '28','rgt' => '29','depth' => '1','path' => '1/3','slug' => 'n2'), |
|
7 | - array('id' => '4','parent_id' => '1','sort' => '1','tree' => '1','lft' => '30','rgt' => '49','depth' => '1','path' => '1/4','slug' => 'n3'), |
|
8 | - array('id' => '5','parent_id' => '2','sort' => '0','tree' => '1','lft' => '3','rgt' => '10','depth' => '2','path' => '1/2/5','slug' => 'n11'), |
|
9 | - array('id' => '6','parent_id' => '2','sort' => '100','tree' => '1','lft' => '11','rgt' => '18','depth' => '2','path' => '1/2/6','slug' => 'n12'), |
|
10 | - array('id' => '7','parent_id' => '2','sort' => '200','tree' => '1','lft' => '19','rgt' => '26','depth' => '2','path' => '1/2/7','slug' => 'n13'), |
|
11 | - array('id' => '8','parent_id' => '4','sort' => '0','tree' => '1','lft' => '31','rgt' => '32','depth' => '2','path' => '1/4/8','slug' => 'n31'), |
|
12 | - array('id' => '9','parent_id' => '4','sort' => '1','tree' => '1','lft' => '33','rgt' => '40','depth' => '2','path' => '1/4/9','slug' => 'n32'), |
|
13 | - array('id' => '10','parent_id' => '4','sort' => '100','tree' => '1','lft' => '41','rgt' => '48','depth' => '2','path' => '1/4/10','slug' => 'n33'), |
|
14 | - array('id' => '11','parent_id' => '5','sort' => '0','tree' => '1','lft' => '4','rgt' => '5','depth' => '3','path' => '1/2/5/11','slug' => 'n111'), |
|
15 | - array('id' => '12','parent_id' => '5','sort' => '99','tree' => '1','lft' => '6','rgt' => '7','depth' => '3','path' => '1/2/5/12','slug' => 'n112'), |
|
16 | - array('id' => '13','parent_id' => '5','sort' => '100','tree' => '1','lft' => '8','rgt' => '9','depth' => '3','path' => '1/2/5/13','slug' => 'n113'), |
|
17 | - array('id' => '14','parent_id' => '6','sort' => '-100','tree' => '1','lft' => '12','rgt' => '13','depth' => '3','path' => '1/2/6/14','slug' => 'n121'), |
|
18 | - array('id' => '15','parent_id' => '6','sort' => '-99','tree' => '1','lft' => '14','rgt' => '15','depth' => '3','path' => '1/2/6/15','slug' => 'n122'), |
|
19 | - array('id' => '16','parent_id' => '6','sort' => '-98','tree' => '1','lft' => '16','rgt' => '17','depth' => '3','path' => '1/2/6/16','slug' => 'n123'), |
|
20 | - array('id' => '17','parent_id' => '7','sort' => '-100','tree' => '1','lft' => '20','rgt' => '21','depth' => '3','path' => '1/2/7/17','slug' => 'n131'), |
|
21 | - array('id' => '18','parent_id' => '7','sort' => '0','tree' => '1','lft' => '22','rgt' => '23','depth' => '3','path' => '1/2/7/18','slug' => 'n132'), |
|
22 | - array('id' => '19','parent_id' => '7','sort' => '100','tree' => '1','lft' => '24','rgt' => '25','depth' => '3','path' => '1/2/7/19','slug' => 'n133'), |
|
23 | - array('id' => '20','parent_id' => '9','sort' => '0','tree' => '1','lft' => '34','rgt' => '35','depth' => '3','path' => '1/4/9/20','slug' => 'n321'), |
|
24 | - array('id' => '21','parent_id' => '9','sort' => '2','tree' => '1','lft' => '36','rgt' => '37','depth' => '3','path' => '1/4/9/21','slug' => 'n322'), |
|
25 | - array('id' => '22','parent_id' => '9','sort' => '4','tree' => '1','lft' => '38','rgt' => '39','depth' => '3','path' => '1/4/9/22','slug' => 'n323'), |
|
26 | - array('id' => '23','parent_id' => '10','sort' => '0','tree' => '1','lft' => '42','rgt' => '43','depth' => '3','path' => '1/4/10/23','slug' => 'n331'), |
|
27 | - array('id' => '24','parent_id' => '10','sort' => '100','tree' => '1','lft' => '44','rgt' => '45','depth' => '3','path' => '1/4/10/24','slug' => 'n332'), |
|
28 | - array('id' => '25','parent_id' => '10','sort' => '200','tree' => '1','lft' => '46','rgt' => '47','depth' => '3','path' => '1/4/10/25','slug' => 'n333'), |
|
4 | + array('id' => '1', 'parent_id' => null, 'sort' => '0', 'tree' => '1', 'lft' => '1', 'rgt' => '50', 'depth' => '0', 'path' => '1', 'slug' => 'r1'), |
|
5 | + array('id' => '2', 'parent_id' => '1', 'sort' => '-1', 'tree' => '1', 'lft' => '2', 'rgt' => '27', 'depth' => '1', 'path' => '1/2', 'slug' => 'n1'), |
|
6 | + array('id' => '3', 'parent_id' => '1', 'sort' => '0', 'tree' => '1', 'lft' => '28', 'rgt' => '29', 'depth' => '1', 'path' => '1/3', 'slug' => 'n2'), |
|
7 | + array('id' => '4', 'parent_id' => '1', 'sort' => '1', 'tree' => '1', 'lft' => '30', 'rgt' => '49', 'depth' => '1', 'path' => '1/4', 'slug' => 'n3'), |
|
8 | + array('id' => '5', 'parent_id' => '2', 'sort' => '0', 'tree' => '1', 'lft' => '3', 'rgt' => '10', 'depth' => '2', 'path' => '1/2/5', 'slug' => 'n11'), |
|
9 | + array('id' => '6', 'parent_id' => '2', 'sort' => '100', 'tree' => '1', 'lft' => '11', 'rgt' => '18', 'depth' => '2', 'path' => '1/2/6', 'slug' => 'n12'), |
|
10 | + array('id' => '7', 'parent_id' => '2', 'sort' => '200', 'tree' => '1', 'lft' => '19', 'rgt' => '26', 'depth' => '2', 'path' => '1/2/7', 'slug' => 'n13'), |
|
11 | + array('id' => '8', 'parent_id' => '4', 'sort' => '0', 'tree' => '1', 'lft' => '31', 'rgt' => '32', 'depth' => '2', 'path' => '1/4/8', 'slug' => 'n31'), |
|
12 | + array('id' => '9', 'parent_id' => '4', 'sort' => '1', 'tree' => '1', 'lft' => '33', 'rgt' => '40', 'depth' => '2', 'path' => '1/4/9', 'slug' => 'n32'), |
|
13 | + array('id' => '10', 'parent_id' => '4', 'sort' => '100', 'tree' => '1', 'lft' => '41', 'rgt' => '48', 'depth' => '2', 'path' => '1/4/10', 'slug' => 'n33'), |
|
14 | + array('id' => '11', 'parent_id' => '5', 'sort' => '0', 'tree' => '1', 'lft' => '4', 'rgt' => '5', 'depth' => '3', 'path' => '1/2/5/11', 'slug' => 'n111'), |
|
15 | + array('id' => '12', 'parent_id' => '5', 'sort' => '99', 'tree' => '1', 'lft' => '6', 'rgt' => '7', 'depth' => '3', 'path' => '1/2/5/12', 'slug' => 'n112'), |
|
16 | + array('id' => '13', 'parent_id' => '5', 'sort' => '100', 'tree' => '1', 'lft' => '8', 'rgt' => '9', 'depth' => '3', 'path' => '1/2/5/13', 'slug' => 'n113'), |
|
17 | + array('id' => '14', 'parent_id' => '6', 'sort' => '-100', 'tree' => '1', 'lft' => '12', 'rgt' => '13', 'depth' => '3', 'path' => '1/2/6/14', 'slug' => 'n121'), |
|
18 | + array('id' => '15', 'parent_id' => '6', 'sort' => '-99', 'tree' => '1', 'lft' => '14', 'rgt' => '15', 'depth' => '3', 'path' => '1/2/6/15', 'slug' => 'n122'), |
|
19 | + array('id' => '16', 'parent_id' => '6', 'sort' => '-98', 'tree' => '1', 'lft' => '16', 'rgt' => '17', 'depth' => '3', 'path' => '1/2/6/16', 'slug' => 'n123'), |
|
20 | + array('id' => '17', 'parent_id' => '7', 'sort' => '-100', 'tree' => '1', 'lft' => '20', 'rgt' => '21', 'depth' => '3', 'path' => '1/2/7/17', 'slug' => 'n131'), |
|
21 | + array('id' => '18', 'parent_id' => '7', 'sort' => '0', 'tree' => '1', 'lft' => '22', 'rgt' => '23', 'depth' => '3', 'path' => '1/2/7/18', 'slug' => 'n132'), |
|
22 | + array('id' => '19', 'parent_id' => '7', 'sort' => '100', 'tree' => '1', 'lft' => '24', 'rgt' => '25', 'depth' => '3', 'path' => '1/2/7/19', 'slug' => 'n133'), |
|
23 | + array('id' => '20', 'parent_id' => '9', 'sort' => '0', 'tree' => '1', 'lft' => '34', 'rgt' => '35', 'depth' => '3', 'path' => '1/4/9/20', 'slug' => 'n321'), |
|
24 | + array('id' => '21', 'parent_id' => '9', 'sort' => '2', 'tree' => '1', 'lft' => '36', 'rgt' => '37', 'depth' => '3', 'path' => '1/4/9/21', 'slug' => 'n322'), |
|
25 | + array('id' => '22', 'parent_id' => '9', 'sort' => '4', 'tree' => '1', 'lft' => '38', 'rgt' => '39', 'depth' => '3', 'path' => '1/4/9/22', 'slug' => 'n323'), |
|
26 | + array('id' => '23', 'parent_id' => '10', 'sort' => '0', 'tree' => '1', 'lft' => '42', 'rgt' => '43', 'depth' => '3', 'path' => '1/4/10/23', 'slug' => 'n331'), |
|
27 | + array('id' => '24', 'parent_id' => '10', 'sort' => '100', 'tree' => '1', 'lft' => '44', 'rgt' => '45', 'depth' => '3', 'path' => '1/4/10/24', 'slug' => 'n332'), |
|
28 | + array('id' => '25', 'parent_id' => '10', 'sort' => '200', 'tree' => '1', 'lft' => '46', 'rgt' => '47', 'depth' => '3', 'path' => '1/4/10/25', 'slug' => 'n333'), |
|
29 | 29 | |
30 | - array('id' => '26','parent_id' => null,'sort' => '0','tree' => '26','lft' => '1','rgt' => '28','depth' => '0','path' => '26','slug' => 'r2'), |
|
31 | - array('id' => '27','parent_id' => '26','sort' => '-1','tree' => '26','lft' => '2','rgt' => '11','depth' => '1','path' => '26/27','slug' => 'n1'), |
|
32 | - array('id' => '28','parent_id' => '26','sort' => '0','tree' => '26','lft' => '12','rgt' => '13','depth' => '1','path' => '26/28','slug' => 'n2'), |
|
33 | - array('id' => '29','parent_id' => '26','sort' => '1','tree' => '26','lft' => '14','rgt' => '17','depth' => '1','path' => '26/29','slug' => 'n3'), |
|
34 | - array('id' => '30','parent_id' => '26','sort' => '2','tree' => '26','lft' => '18','rgt' => '27','depth' => '1','path' => '26/30','slug' => 'n4'), |
|
35 | - array('id' => '31','parent_id' => '27','sort' => '0','tree' => '26','lft' => '3','rgt' => '4','depth' => '2','path' => '26/27/31','slug' => 'n11'), |
|
36 | - array('id' => '32','parent_id' => '27','sort' => '1','tree' => '26','lft' => '5','rgt' => '6','depth' => '2','path' => '26/27/32','slug' => 'n12'), |
|
37 | - array('id' => '33','parent_id' => '27','sort' => '2','tree' => '26','lft' => '7','rgt' => '8','depth' => '2','path' => '26/27/33','slug' => 'n13'), |
|
38 | - array('id' => '34','parent_id' => '27','sort' => '4','tree' => '26','lft' => '9','rgt' => '10','depth' => '2','path' => '26/27/34','slug' => 'n14'), |
|
39 | - array('id' => '35','parent_id' => '29','sort' => '0','tree' => '26','lft' => '15','rgt' => '16','depth' => '2','path' => '26/29/35','slug' => 'n31'), |
|
40 | - array('id' => '36','parent_id' => '30','sort' => '0','tree' => '26','lft' => '19','rgt' => '20','depth' => '2','path' => '26/30/36','slug' => 'n41'), |
|
41 | - array('id' => '37','parent_id' => '30','sort' => '100','tree' => '26','lft' => '21','rgt' => '22','depth' => '2','path' => '26/30/36','slug' => 'n42'), |
|
42 | - array('id' => '38','parent_id' => '30','sort' => '200','tree' => '26','lft' => '23','rgt' => '24','depth' => '2','path' => '26/30/36','slug' => 'n43'), |
|
43 | - array('id' => '39','parent_id' => '30','sort' => '300','tree' => '26','lft' => '25','rgt' => '26','depth' => '2','path' => '26/30/36','slug' => 'n44'), |
|
30 | + array('id' => '26', 'parent_id' => null, 'sort' => '0', 'tree' => '26', 'lft' => '1', 'rgt' => '28', 'depth' => '0', 'path' => '26', 'slug' => 'r2'), |
|
31 | + array('id' => '27', 'parent_id' => '26', 'sort' => '-1', 'tree' => '26', 'lft' => '2', 'rgt' => '11', 'depth' => '1', 'path' => '26/27', 'slug' => 'n1'), |
|
32 | + array('id' => '28', 'parent_id' => '26', 'sort' => '0', 'tree' => '26', 'lft' => '12', 'rgt' => '13', 'depth' => '1', 'path' => '26/28', 'slug' => 'n2'), |
|
33 | + array('id' => '29', 'parent_id' => '26', 'sort' => '1', 'tree' => '26', 'lft' => '14', 'rgt' => '17', 'depth' => '1', 'path' => '26/29', 'slug' => 'n3'), |
|
34 | + array('id' => '30', 'parent_id' => '26', 'sort' => '2', 'tree' => '26', 'lft' => '18', 'rgt' => '27', 'depth' => '1', 'path' => '26/30', 'slug' => 'n4'), |
|
35 | + array('id' => '31', 'parent_id' => '27', 'sort' => '0', 'tree' => '26', 'lft' => '3', 'rgt' => '4', 'depth' => '2', 'path' => '26/27/31', 'slug' => 'n11'), |
|
36 | + array('id' => '32', 'parent_id' => '27', 'sort' => '1', 'tree' => '26', 'lft' => '5', 'rgt' => '6', 'depth' => '2', 'path' => '26/27/32', 'slug' => 'n12'), |
|
37 | + array('id' => '33', 'parent_id' => '27', 'sort' => '2', 'tree' => '26', 'lft' => '7', 'rgt' => '8', 'depth' => '2', 'path' => '26/27/33', 'slug' => 'n13'), |
|
38 | + array('id' => '34', 'parent_id' => '27', 'sort' => '4', 'tree' => '26', 'lft' => '9', 'rgt' => '10', 'depth' => '2', 'path' => '26/27/34', 'slug' => 'n14'), |
|
39 | + array('id' => '35', 'parent_id' => '29', 'sort' => '0', 'tree' => '26', 'lft' => '15', 'rgt' => '16', 'depth' => '2', 'path' => '26/29/35', 'slug' => 'n31'), |
|
40 | + array('id' => '36', 'parent_id' => '30', 'sort' => '0', 'tree' => '26', 'lft' => '19', 'rgt' => '20', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n41'), |
|
41 | + array('id' => '37', 'parent_id' => '30', 'sort' => '100', 'tree' => '26', 'lft' => '21', 'rgt' => '22', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n42'), |
|
42 | + array('id' => '38', 'parent_id' => '30', 'sort' => '200', 'tree' => '26', 'lft' => '23', 'rgt' => '24', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n43'), |
|
43 | + array('id' => '39', 'parent_id' => '30', 'sort' => '300', 'tree' => '26', 'lft' => '25', 'rgt' => '26', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n44'), |
|
44 | 44 | ), |
45 | 45 | ); |
46 | 46 | \ No newline at end of file |
@@ -1,45 +1,45 @@ |
||
1 | 1 | <?php |
2 | 2 | return array( |
3 | 3 | 'tree' => array( |
4 | - array('id' => '1','parent_id' => null,'sort' => '0', 'tree' => '1','lft' => '0','rgt' => '2147483647','depth' => '0','path' => '1','slug' => 'r1'), |
|
5 | - array('id' => '2','parent_id' => '1','sort' => '-1','tree' => '1','lft' => '1','rgt' => '1000021','depth' => '1','path' => '1/2','slug' => 'n1'), |
|
6 | - array('id' => '3','parent_id' => '1','sort' => '0','tree' => '1','lft' => '10000000','rgt' => '20000000','depth' => '1','path' => '1/3','slug' => 'n2'), |
|
7 | - array('id' => '4','parent_id' => '1','sort' => '1','tree' => '1','lft' => '100000000','rgt' => '1987654321','depth' => '1','path' => '1/4','slug' => 'n3'), |
|
8 | - array('id' => '5','parent_id' => '2','sort' => '0','tree' => '1','lft' => '2','rgt' => '30002','depth' => '2','path' => '1/2/5','slug' => 'n11'), |
|
9 | - array('id' => '6','parent_id' => '2','sort' => '100','tree' => '1','lft' => '30003','rgt' => '1000000','depth' => '2','path' => '1/2/6','slug' => 'n12'), |
|
10 | - array('id' => '7','parent_id' => '2','sort' => '200','tree' => '1','lft' => '1000001','rgt' => '1000020','depth' => '2','path' => '1/2/7','slug' => 'n13'), |
|
11 | - array('id' => '8','parent_id' => '4','sort' => '0','tree' => '1','lft' => '200000000','rgt' => '200000002','depth' => '2','path' => '1/4/8','slug' => 'n31'), |
|
12 | - array('id' => '9','parent_id' => '4','sort' => '1','tree' => '1','lft' => '300000000','rgt' => '300000007','depth' => '2','path' => '1/4/9','slug' => 'n32'), |
|
13 | - array('id' => '10','parent_id' => '4','sort' => '100','tree' => '1','lft' => '1234567890','rgt' => '1234567901','depth' => '2','path' => '1/4/10','slug' => 'n33'), |
|
14 | - array('id' => '11','parent_id' => '5','sort' => '0','tree' => '1','lft' => '3','rgt' => '4','depth' => '3','path' => '1/2/5/11','slug' => 'n111'), |
|
15 | - array('id' => '12','parent_id' => '5','sort' => '99','tree' => '1','lft' => '10000','rgt' => '20000','depth' => '3','path' => '1/2/5/12','slug' => 'n112'), |
|
16 | - array('id' => '13','parent_id' => '5','sort' => '100','tree' => '1','lft' => '20001','rgt' => '30000','depth' => '3','path' => '1/2/5/13','slug' => 'n113'), |
|
17 | - array('id' => '14','parent_id' => '6','sort' => '-100','tree' => '1','lft' => '444444','rgt' => '444544','depth' => '3','path' => '1/2/6/14','slug' => 'n121'), |
|
18 | - array('id' => '15','parent_id' => '6','sort' => '-99','tree' => '1','lft' => '666666','rgt' => '777777','depth' => '3','path' => '1/2/6/15','slug' => 'n122'), |
|
19 | - array('id' => '16','parent_id' => '6','sort' => '-98','tree' => '1','lft' => '888888','rgt' => '888898','depth' => '3','path' => '1/2/6/16','slug' => 'n123'), |
|
20 | - array('id' => '17','parent_id' => '7','sort' => '-100','tree' => '1','lft' => '1000004','rgt' => '1000007','depth' => '3','path' => '1/2/7/17','slug' => 'n131'), |
|
21 | - array('id' => '18','parent_id' => '7','sort' => '0','tree' => '1','lft' => '1000010','rgt' => '1000013','depth' => '3','path' => '1/2/7/18','slug' => 'n132'), |
|
22 | - array('id' => '19','parent_id' => '7','sort' => '100','tree' => '1','lft' => '1000016','rgt' => '1000019','depth' => '3','path' => '1/2/7/19','slug' => 'n133'), |
|
23 | - array('id' => '20','parent_id' => '9','sort' => '0','tree' => '1','lft' => '300000001','rgt' => '300000002','depth' => '3','path' => '1/4/9/20','slug' => 'n321'), |
|
24 | - array('id' => '21','parent_id' => '9','sort' => '2','tree' => '1','lft' => '300000003','rgt' => '300000004','depth' => '3','path' => '1/4/9/21','slug' => 'n322'), |
|
25 | - array('id' => '22','parent_id' => '9','sort' => '4','tree' => '1','lft' => '300000005','rgt' => '300000006','depth' => '3','path' => '1/4/9/22','slug' => 'n323'), |
|
26 | - array('id' => '23','parent_id' => '10','sort' => '0','tree' => '1','lft' => '1234567892','rgt' => '1234567893','depth' => '3','path' => '1/4/10/23','slug' => 'n331'), |
|
27 | - array('id' => '24','parent_id' => '10','sort' => '100','tree' => '1','lft' => '1234567895','rgt' => '1234567896','depth' => '3','path' => '1/4/10/24','slug' => 'n332'), |
|
28 | - array('id' => '25','parent_id' => '10','sort' => '200','tree' => '1','lft' => '1234567898','rgt' => '1234567899','depth' => '3','path' => '1/4/10/25','slug' => 'n333'), |
|
4 | + array('id' => '1', 'parent_id' => null, 'sort' => '0', 'tree' => '1', 'lft' => '0', 'rgt' => '2147483647', 'depth' => '0', 'path' => '1', 'slug' => 'r1'), |
|
5 | + array('id' => '2', 'parent_id' => '1', 'sort' => '-1', 'tree' => '1', 'lft' => '1', 'rgt' => '1000021', 'depth' => '1', 'path' => '1/2', 'slug' => 'n1'), |
|
6 | + array('id' => '3', 'parent_id' => '1', 'sort' => '0', 'tree' => '1', 'lft' => '10000000', 'rgt' => '20000000', 'depth' => '1', 'path' => '1/3', 'slug' => 'n2'), |
|
7 | + array('id' => '4', 'parent_id' => '1', 'sort' => '1', 'tree' => '1', 'lft' => '100000000', 'rgt' => '1987654321', 'depth' => '1', 'path' => '1/4', 'slug' => 'n3'), |
|
8 | + array('id' => '5', 'parent_id' => '2', 'sort' => '0', 'tree' => '1', 'lft' => '2', 'rgt' => '30002', 'depth' => '2', 'path' => '1/2/5', 'slug' => 'n11'), |
|
9 | + array('id' => '6', 'parent_id' => '2', 'sort' => '100', 'tree' => '1', 'lft' => '30003', 'rgt' => '1000000', 'depth' => '2', 'path' => '1/2/6', 'slug' => 'n12'), |
|
10 | + array('id' => '7', 'parent_id' => '2', 'sort' => '200', 'tree' => '1', 'lft' => '1000001', 'rgt' => '1000020', 'depth' => '2', 'path' => '1/2/7', 'slug' => 'n13'), |
|
11 | + array('id' => '8', 'parent_id' => '4', 'sort' => '0', 'tree' => '1', 'lft' => '200000000', 'rgt' => '200000002', 'depth' => '2', 'path' => '1/4/8', 'slug' => 'n31'), |
|
12 | + array('id' => '9', 'parent_id' => '4', 'sort' => '1', 'tree' => '1', 'lft' => '300000000', 'rgt' => '300000007', 'depth' => '2', 'path' => '1/4/9', 'slug' => 'n32'), |
|
13 | + array('id' => '10', 'parent_id' => '4', 'sort' => '100', 'tree' => '1', 'lft' => '1234567890', 'rgt' => '1234567901', 'depth' => '2', 'path' => '1/4/10', 'slug' => 'n33'), |
|
14 | + array('id' => '11', 'parent_id' => '5', 'sort' => '0', 'tree' => '1', 'lft' => '3', 'rgt' => '4', 'depth' => '3', 'path' => '1/2/5/11', 'slug' => 'n111'), |
|
15 | + array('id' => '12', 'parent_id' => '5', 'sort' => '99', 'tree' => '1', 'lft' => '10000', 'rgt' => '20000', 'depth' => '3', 'path' => '1/2/5/12', 'slug' => 'n112'), |
|
16 | + array('id' => '13', 'parent_id' => '5', 'sort' => '100', 'tree' => '1', 'lft' => '20001', 'rgt' => '30000', 'depth' => '3', 'path' => '1/2/5/13', 'slug' => 'n113'), |
|
17 | + array('id' => '14', 'parent_id' => '6', 'sort' => '-100', 'tree' => '1', 'lft' => '444444', 'rgt' => '444544', 'depth' => '3', 'path' => '1/2/6/14', 'slug' => 'n121'), |
|
18 | + array('id' => '15', 'parent_id' => '6', 'sort' => '-99', 'tree' => '1', 'lft' => '666666', 'rgt' => '777777', 'depth' => '3', 'path' => '1/2/6/15', 'slug' => 'n122'), |
|
19 | + array('id' => '16', 'parent_id' => '6', 'sort' => '-98', 'tree' => '1', 'lft' => '888888', 'rgt' => '888898', 'depth' => '3', 'path' => '1/2/6/16', 'slug' => 'n123'), |
|
20 | + array('id' => '17', 'parent_id' => '7', 'sort' => '-100', 'tree' => '1', 'lft' => '1000004', 'rgt' => '1000007', 'depth' => '3', 'path' => '1/2/7/17', 'slug' => 'n131'), |
|
21 | + array('id' => '18', 'parent_id' => '7', 'sort' => '0', 'tree' => '1', 'lft' => '1000010', 'rgt' => '1000013', 'depth' => '3', 'path' => '1/2/7/18', 'slug' => 'n132'), |
|
22 | + array('id' => '19', 'parent_id' => '7', 'sort' => '100', 'tree' => '1', 'lft' => '1000016', 'rgt' => '1000019', 'depth' => '3', 'path' => '1/2/7/19', 'slug' => 'n133'), |
|
23 | + array('id' => '20', 'parent_id' => '9', 'sort' => '0', 'tree' => '1', 'lft' => '300000001', 'rgt' => '300000002', 'depth' => '3', 'path' => '1/4/9/20', 'slug' => 'n321'), |
|
24 | + array('id' => '21', 'parent_id' => '9', 'sort' => '2', 'tree' => '1', 'lft' => '300000003', 'rgt' => '300000004', 'depth' => '3', 'path' => '1/4/9/21', 'slug' => 'n322'), |
|
25 | + array('id' => '22', 'parent_id' => '9', 'sort' => '4', 'tree' => '1', 'lft' => '300000005', 'rgt' => '300000006', 'depth' => '3', 'path' => '1/4/9/22', 'slug' => 'n323'), |
|
26 | + array('id' => '23', 'parent_id' => '10', 'sort' => '0', 'tree' => '1', 'lft' => '1234567892', 'rgt' => '1234567893', 'depth' => '3', 'path' => '1/4/10/23', 'slug' => 'n331'), |
|
27 | + array('id' => '24', 'parent_id' => '10', 'sort' => '100', 'tree' => '1', 'lft' => '1234567895', 'rgt' => '1234567896', 'depth' => '3', 'path' => '1/4/10/24', 'slug' => 'n332'), |
|
28 | + array('id' => '25', 'parent_id' => '10', 'sort' => '200', 'tree' => '1', 'lft' => '1234567898', 'rgt' => '1234567899', 'depth' => '3', 'path' => '1/4/10/25', 'slug' => 'n333'), |
|
29 | 29 | |
30 | - array('id' => '26','parent_id' => null,'sort' => '0','tree' => '26','lft' => '0','rgt' => '2147483647','depth' => '0','path' => '26','slug' => 'r2'), |
|
31 | - array('id' => '27','parent_id' => '26','sort' => '-1','tree' => '26','lft' => '10000','rgt' => '10018','depth' => '1','path' => '26/27','slug' => 'n1'), |
|
32 | - array('id' => '28','parent_id' => '26','sort' => '0','tree' => '26','lft' => '2323287','rgt' => '2323288','depth' => '1','path' => '26/28','slug' => 'n2'), |
|
33 | - array('id' => '29','parent_id' => '26','sort' => '1','tree' => '26','lft' => '72938298','rgt' => '72938302','depth' => '1','path' => '26/29','slug' => 'n3'), |
|
34 | - array('id' => '30','parent_id' => '26','sort' => '2','tree' => '26','lft' => '2039849384','rgt' => '2147483646','depth' => '1','path' => '26/30','slug' => 'n4'), |
|
35 | - array('id' => '31','parent_id' => '27','sort' => '0','tree' => '26','lft' => '10002','rgt' => '10004','depth' => '2','path' => '26/27/31','slug' => 'n11'), |
|
36 | - array('id' => '32','parent_id' => '27','sort' => '1','tree' => '26','lft' => '10006','rgt' => '10008','depth' => '2','path' => '26/27/32','slug' => 'n12'), |
|
37 | - array('id' => '33','parent_id' => '27','sort' => '2','tree' => '26','lft' => '10010','rgt' => '10012','depth' => '2','path' => '26/27/33','slug' => 'n13'), |
|
38 | - array('id' => '34','parent_id' => '27','sort' => '4','tree' => '26','lft' => '10014','rgt' => '10016','depth' => '2','path' => '26/27/34','slug' => 'n14'), |
|
39 | - array('id' => '35','parent_id' => '29','sort' => '0','tree' => '26','lft' => '72938299','rgt' => '72938301','depth' => '2','path' => '26/29/35','slug' => 'n31'), |
|
40 | - array('id' => '36','parent_id' => '30','sort' => '0','tree' => '26','lft' => '2147483637','rgt' => '2147483638','depth' => '2','path' => '26/30/36','slug' => 'n41'), |
|
41 | - array('id' => '37','parent_id' => '30','sort' => '100','tree' => '26','lft' => '2147483639','rgt' => '2147483640','depth' => '2','path' => '26/30/36','slug' => 'n42'), |
|
42 | - array('id' => '38','parent_id' => '30','sort' => '200','tree' => '26','lft' => '2147483642','rgt' => '2147483643','depth' => '2','path' => '26/30/36','slug' => 'n43'), |
|
43 | - array('id' => '39','parent_id' => '30','sort' => '300','tree' => '26','lft' => '2147483644','rgt' => '2147483645','depth' => '2','path' => '26/30/36','slug' => 'n44'), |
|
30 | + array('id' => '26', 'parent_id' => null, 'sort' => '0', 'tree' => '26', 'lft' => '0', 'rgt' => '2147483647', 'depth' => '0', 'path' => '26', 'slug' => 'r2'), |
|
31 | + array('id' => '27', 'parent_id' => '26', 'sort' => '-1', 'tree' => '26', 'lft' => '10000', 'rgt' => '10018', 'depth' => '1', 'path' => '26/27', 'slug' => 'n1'), |
|
32 | + array('id' => '28', 'parent_id' => '26', 'sort' => '0', 'tree' => '26', 'lft' => '2323287', 'rgt' => '2323288', 'depth' => '1', 'path' => '26/28', 'slug' => 'n2'), |
|
33 | + array('id' => '29', 'parent_id' => '26', 'sort' => '1', 'tree' => '26', 'lft' => '72938298', 'rgt' => '72938302', 'depth' => '1', 'path' => '26/29', 'slug' => 'n3'), |
|
34 | + array('id' => '30', 'parent_id' => '26', 'sort' => '2', 'tree' => '26', 'lft' => '2039849384', 'rgt' => '2147483646', 'depth' => '1', 'path' => '26/30', 'slug' => 'n4'), |
|
35 | + array('id' => '31', 'parent_id' => '27', 'sort' => '0', 'tree' => '26', 'lft' => '10002', 'rgt' => '10004', 'depth' => '2', 'path' => '26/27/31', 'slug' => 'n11'), |
|
36 | + array('id' => '32', 'parent_id' => '27', 'sort' => '1', 'tree' => '26', 'lft' => '10006', 'rgt' => '10008', 'depth' => '2', 'path' => '26/27/32', 'slug' => 'n12'), |
|
37 | + array('id' => '33', 'parent_id' => '27', 'sort' => '2', 'tree' => '26', 'lft' => '10010', 'rgt' => '10012', 'depth' => '2', 'path' => '26/27/33', 'slug' => 'n13'), |
|
38 | + array('id' => '34', 'parent_id' => '27', 'sort' => '4', 'tree' => '26', 'lft' => '10014', 'rgt' => '10016', 'depth' => '2', 'path' => '26/27/34', 'slug' => 'n14'), |
|
39 | + array('id' => '35', 'parent_id' => '29', 'sort' => '0', 'tree' => '26', 'lft' => '72938299', 'rgt' => '72938301', 'depth' => '2', 'path' => '26/29/35', 'slug' => 'n31'), |
|
40 | + array('id' => '36', 'parent_id' => '30', 'sort' => '0', 'tree' => '26', 'lft' => '2147483637', 'rgt' => '2147483638', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n41'), |
|
41 | + array('id' => '37', 'parent_id' => '30', 'sort' => '100', 'tree' => '26', 'lft' => '2147483639', 'rgt' => '2147483640', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n42'), |
|
42 | + array('id' => '38', 'parent_id' => '30', 'sort' => '200', 'tree' => '26', 'lft' => '2147483642', 'rgt' => '2147483643', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n43'), |
|
43 | + array('id' => '39', 'parent_id' => '30', 'sort' => '300', 'tree' => '26', 'lft' => '2147483644', 'rgt' => '2147483645', 'depth' => '2', 'path' => '26/30/36', 'slug' => 'n44'), |
|
44 | 44 | ), |
45 | 45 | ); |
46 | 46 | \ No newline at end of file |
@@ -8,8 +8,8 @@ |
||
8 | 8 | defined('YII_DEBUG') or define('YII_DEBUG', true); |
9 | 9 | defined('YII_ENV') or define('YII_ENV', 'test'); |
10 | 10 | |
11 | -require(__DIR__ . '/../vendor/autoload.php'); |
|
12 | -require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); |
|
11 | +require(__DIR__.'/../vendor/autoload.php'); |
|
12 | +require(__DIR__.'/../vendor/yiisoft/yii2/Yii.php'); |
|
13 | 13 | |
14 | 14 | Yii::setAlias('@tests', __DIR__); |
15 | 15 |
@@ -29,14 +29,14 @@ |
||
29 | 29 | } |
30 | 30 | $this->createTable('{{%tree}}', [ |
31 | 31 | 'id' => Schema::TYPE_PK, |
32 | - 'parent_id' => Schema::TYPE_INTEGER . ' NULL', |
|
33 | - 'sort' => Schema::TYPE_INTEGER . ' NULL', |
|
34 | - 'tree' => Schema::TYPE_INTEGER . ' NULL', |
|
35 | - 'lft' => Schema::TYPE_INTEGER . ' NULL', |
|
36 | - 'rgt' => Schema::TYPE_INTEGER . ' NULL', |
|
37 | - 'depth' => Schema::TYPE_INTEGER . ' NULL', |
|
38 | - 'path' => Schema::TYPE_STRING . ' NULL', |
|
39 | - 'slug' => Schema::TYPE_STRING . ' NOT NULL', |
|
32 | + 'parent_id' => Schema::TYPE_INTEGER.' NULL', |
|
33 | + 'sort' => Schema::TYPE_INTEGER.' NULL', |
|
34 | + 'tree' => Schema::TYPE_INTEGER.' NULL', |
|
35 | + 'lft' => Schema::TYPE_INTEGER.' NULL', |
|
36 | + 'rgt' => Schema::TYPE_INTEGER.' NULL', |
|
37 | + 'depth' => Schema::TYPE_INTEGER.' NULL', |
|
38 | + 'path' => Schema::TYPE_STRING.' NULL', |
|
39 | + 'slug' => Schema::TYPE_STRING.' NOT NULL', |
|
40 | 40 | ], $tableOptions); |
41 | 41 | $this->createIndex('parent_sort', '{{%tree}}', ['parent_id', 'sort']); |
42 | 42 | $this->createIndex('lft', '{{%tree}}', ['tree', 'lft', 'rgt']); |