From 57d11253dd8997f8d3ff82c63a5034d980cc28a4 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Mon, 20 Nov 2023 08:44:37 -0300 Subject: [PATCH] Better namespace. --- composer.json | 4 +- phpstan.neon | 7 +- src/NestedSetsBehavior.php | 25 ++---- src/NestedSetsQueryBehavior.php | 16 +--- tests/NestedSetsBehaviorTest.php | 83 +++++++++---------- tests/NestedSetsQueryBehaviorTest.php | 21 ++--- .../Model}/MultipleTree.php | 11 +-- tests/Support/Model/MultipleTreeQuery.php | 20 +++++ tests/{models => Support/Model}/Tree.php | 11 +-- tests/Support/Model/TreeQuery.php | 20 +++++ tests/{ => Support}/data/clean.xml | 0 .../test-append-to-exists-another-tree.xml | 0 .../data/test-append-to-exists-down.xml | 0 .../data/test-append-to-exists-up.xml | 0 .../{ => Support}/data/test-append-to-new.xml | 0 ...test-children-multiple-tree-with-depth.php | 0 .../data/test-children-multiple-tree.php | 0 .../data/test-children-with-depth.php | 0 tests/{ => Support}/data/test-children.php | 0 .../data/test-delete-with-children.xml | 0 tests/{ => Support}/data/test-delete.xml | 0 .../test-insert-after-exists-another-tree.xml | 0 .../data/test-insert-after-exists-down.xml | 0 .../data/test-insert-after-exists-up.xml | 0 .../data/test-insert-after-new.xml | 0 ...test-insert-before-exists-another-tree.xml | 0 .../data/test-insert-before-exists-down.xml | 0 .../data/test-insert-before-exists-up.xml | 0 .../data/test-insert-before-new.xml | 0 .../data/test-leaves-multiple-tree-query.php | 0 .../data/test-leaves-multiple-tree.php | 0 .../{ => Support}/data/test-leaves-query.php | 0 tests/{ => Support}/data/test-leaves.php | 0 .../data/test-make-root-exists.xml | 0 .../{ => Support}/data/test-make-root-new.xml | 0 .../data/test-next-multiple-tree.php | 0 tests/{ => Support}/data/test-next.php | 0 .../test-parents-multiple-tree-with-depth.php | 0 .../data/test-parents-multiple-tree.php | 0 .../data/test-parents-with-depth.php | 0 tests/{ => Support}/data/test-parents.php | 0 .../test-prepend-to-exists-another-tree.xml | 0 .../data/test-prepend-to-exists-down.xml | 0 .../data/test-prepend-to-exists-up.xml | 0 .../data/test-prepend-to-new.xml | 0 .../data/test-prev-multiple-tree.php | 0 tests/{ => Support}/data/test-prev.php | 0 .../data/test-roots-multiple-tree-query.php | 0 tests/{ => Support}/data/test-roots-query.php | 0 tests/{ => Support}/data/test.xml | 0 tests/TestCase.php | 8 +- tests/models/MultipleTreeQuery.php | 30 ------- tests/models/TreeQuery.php | 30 ------- 53 files changed, 107 insertions(+), 179 deletions(-) rename tests/{models => Support/Model}/MultipleTree.php (79%) create mode 100644 tests/Support/Model/MultipleTreeQuery.php rename tests/{models => Support/Model}/Tree.php (76%) create mode 100644 tests/Support/Model/TreeQuery.php rename tests/{ => Support}/data/clean.xml (100%) rename tests/{ => Support}/data/test-append-to-exists-another-tree.xml (100%) rename tests/{ => Support}/data/test-append-to-exists-down.xml (100%) rename tests/{ => Support}/data/test-append-to-exists-up.xml (100%) rename tests/{ => Support}/data/test-append-to-new.xml (100%) rename tests/{ => Support}/data/test-children-multiple-tree-with-depth.php (100%) rename tests/{ => Support}/data/test-children-multiple-tree.php (100%) rename tests/{ => Support}/data/test-children-with-depth.php (100%) rename tests/{ => Support}/data/test-children.php (100%) rename tests/{ => Support}/data/test-delete-with-children.xml (100%) rename tests/{ => Support}/data/test-delete.xml (100%) rename tests/{ => Support}/data/test-insert-after-exists-another-tree.xml (100%) rename tests/{ => Support}/data/test-insert-after-exists-down.xml (100%) rename tests/{ => Support}/data/test-insert-after-exists-up.xml (100%) rename tests/{ => Support}/data/test-insert-after-new.xml (100%) rename tests/{ => Support}/data/test-insert-before-exists-another-tree.xml (100%) rename tests/{ => Support}/data/test-insert-before-exists-down.xml (100%) rename tests/{ => Support}/data/test-insert-before-exists-up.xml (100%) rename tests/{ => Support}/data/test-insert-before-new.xml (100%) rename tests/{ => Support}/data/test-leaves-multiple-tree-query.php (100%) rename tests/{ => Support}/data/test-leaves-multiple-tree.php (100%) rename tests/{ => Support}/data/test-leaves-query.php (100%) rename tests/{ => Support}/data/test-leaves.php (100%) rename tests/{ => Support}/data/test-make-root-exists.xml (100%) rename tests/{ => Support}/data/test-make-root-new.xml (100%) rename tests/{ => Support}/data/test-next-multiple-tree.php (100%) rename tests/{ => Support}/data/test-next.php (100%) rename tests/{ => Support}/data/test-parents-multiple-tree-with-depth.php (100%) rename tests/{ => Support}/data/test-parents-multiple-tree.php (100%) rename tests/{ => Support}/data/test-parents-with-depth.php (100%) rename tests/{ => Support}/data/test-parents.php (100%) rename tests/{ => Support}/data/test-prepend-to-exists-another-tree.xml (100%) rename tests/{ => Support}/data/test-prepend-to-exists-down.xml (100%) rename tests/{ => Support}/data/test-prepend-to-exists-up.xml (100%) rename tests/{ => Support}/data/test-prepend-to-new.xml (100%) rename tests/{ => Support}/data/test-prev-multiple-tree.php (100%) rename tests/{ => Support}/data/test-prev.php (100%) rename tests/{ => Support}/data/test-roots-multiple-tree-query.php (100%) rename tests/{ => Support}/data/test-roots-query.php (100%) rename tests/{ => Support}/data/test.xml (100%) delete mode 100644 tests/models/MultipleTreeQuery.php delete mode 100644 tests/models/TreeQuery.php diff --git a/composer.json b/composer.json index 3e3e32e..153ea70 100644 --- a/composer.json +++ b/composer.json @@ -22,12 +22,12 @@ }, "autoload": { "psr-4": { - "yii\\behavior\\nested\\sets\\": "src" + "Yii2\\Extensions\\NestedSets\\": "src" } }, "autoload-dev": { "psr-4": { - "yii\\behavior\\nested\\sets\\tests\\": "tests" + "Yii2\\Extensions\\NestedSets\\Tests\\": "tests" } }, "extra": { diff --git a/phpstan.neon b/phpstan.neon index bfa8725..cf94983 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,12 +1,13 @@ includes: - vendor/yii2-extensions/phpstan/extension.neon + parameters: + bootstrapFiles: + - tests/bootstrap.php + dynamicConstantNames: - YII_DEBUG - YII_ENV - - YII_ENV_DEV - - YII_ENV_PROD - - YII_ENV_TEST level: 1 diff --git a/src/NestedSetsBehavior.php b/src/NestedSetsBehavior.php index 9030233..ec70ff7 100644 --- a/src/NestedSetsBehavior.php +++ b/src/NestedSetsBehavior.php @@ -2,14 +2,7 @@ declare(strict_types=1); -/** - * @link https://github.com/creocoder/yii2-nested-sets - * - * @copyright Copyright (c) 2015 Alexander Kochetov - * @license http://opensource.org/licenses/BSD-3-Clause - */ - -namespace yii\behavior\nested\sets; +namespace Yii2\Extensions\NestedSets; use yii\base\Behavior; use yii\base\NotSupportedException; @@ -18,13 +11,6 @@ use yii\db\Exception; use yii\db\Expression; -/** - * NestedSetsBehavior - * - * @property ActiveRecord $owner - * - * @author Alexander Kochetov - */ class NestedSetsBehavior extends Behavior { public const OPERATION_MAKE_ROOT = 'makeRoot'; @@ -379,8 +365,9 @@ public function beforeInsert(): void $this->beforeInsertNode($this->node->getAttribute($this->rightAttribute) + 1, 0); break; default: - throw new NotSupportedException('Method "' . get_class($this->owner) . - '::insert" is not supported for inserting new nodes.'); + throw new NotSupportedException( + 'Method "' . get_class($this->owner) . '::insert" is not supported for inserting new nodes.' + ); } } @@ -631,7 +618,9 @@ public function beforeDelete(): void } if ($this->owner->isRoot() && $this->operation !== self::OPERATION_DELETE_WITH_CHILDREN) { - throw new NotSupportedException('Method "' . get_class($this->owner) . '::delete" is not supported for deleting root nodes.'); + throw new NotSupportedException( + 'Method "' . get_class($this->owner) . '::delete" is not supported for deleting root nodes.' + ); } $this->owner->refresh(); diff --git a/src/NestedSetsQueryBehavior.php b/src/NestedSetsQueryBehavior.php index 8186ae9..be1b4f8 100644 --- a/src/NestedSetsQueryBehavior.php +++ b/src/NestedSetsQueryBehavior.php @@ -2,26 +2,12 @@ declare(strict_types=1); -/** - * @link https://github.com/creocoder/yii2-nested-sets - * - * @copyright Copyright (c) 2015 Alexander Kochetov - * @license http://opensource.org/licenses/BSD-3-Clause - */ - -namespace yii\behavior\nested\sets; +namespace Yii2\Extensions\NestedSets; use yii\base\Behavior; use yii\db\ActiveQuery; use yii\db\Expression; -/** - * NestedSetsQueryBehavior - * - * @property ActiveQuery $owner - * - * @author Alexander Kochetov - */ class NestedSetsQueryBehavior extends Behavior { /** diff --git a/tests/NestedSetsBehaviorTest.php b/tests/NestedSetsBehaviorTest.php index 198bf51..3691f42 100644 --- a/tests/NestedSetsBehaviorTest.php +++ b/tests/NestedSetsBehaviorTest.php @@ -2,18 +2,11 @@ declare(strict_types=1); -/** - * @link https://github.com/creocoder/yii2-nested-sets - * - * @copyright Copyright (c) 2015 Alexander Kochetov - * @license http://opensource.org/licenses/BSD-3-Clause - */ - -namespace yii\behavior\nested\sets\tests; +namespace Yii2\Extensions\NestedSets\Tests; +use Yii2\Extensions\NestedSets\Tests\Support\Model\MultipleTree; +use Yii2\Extensions\NestedSets\Tests\Support\Model\Tree; use yii\base\NotSupportedException; -use yii\behavior\nested\sets\tests\models\MultipleTree; -use yii\behavior\nested\sets\tests\models\Tree; use yii\db\Exception; use yii\helpers\ArrayHelper; @@ -34,7 +27,7 @@ public function testMakeRootNewNew(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-make-root-new.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-make-root-new.xml')->asXML(), ); } @@ -61,7 +54,7 @@ public function testPrependToNew(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-prepend-to-new.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-prepend-to-new.xml')->asXML(), ); } @@ -88,7 +81,7 @@ public function testInsertBeforeNew(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-insert-before-new.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-before-new.xml')->asXML(), ); } @@ -126,7 +119,7 @@ public function testInsertAfterNew(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-insert-after-new.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-after-new.xml')->asXML(), ); } @@ -162,7 +155,7 @@ public function testMakeRootExists() $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSetMultipleTree()), - simplexml_load_file(__DIR__ . '/data/test-make-root-exists.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-make-root-exists.xml')->asXML(), ); } @@ -202,7 +195,7 @@ public function testPrependToExistsUp(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-prepend-to-exists-up.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-prepend-to-exists-up.xml')->asXML(), ); } @@ -220,7 +213,7 @@ public function testPrependToExistsDown(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-prepend-to-exists-down.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-prepend-to-exists-down.xml')->asXML(), ); } @@ -234,7 +227,7 @@ public function testPrependToExistsAnotherTree(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSetMultipleTree()), - simplexml_load_file(__DIR__ . '/data/test-prepend-to-exists-another-tree.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-prepend-to-exists-another-tree.xml')->asXML(), ); } @@ -285,7 +278,7 @@ public function testAppendToExistsUp(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-append-to-exists-up.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-append-to-exists-up.xml')->asXML(), ); } @@ -303,7 +296,7 @@ public function testAppendToExistsDown(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-append-to-exists-down.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-append-to-exists-down.xml')->asXML(), ); } @@ -317,7 +310,7 @@ public function testAppendToExistsAnotherTree(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSetMultipleTree()), - simplexml_load_file(__DIR__ . '/data/test-append-to-exists-another-tree.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-append-to-exists-another-tree.xml')->asXML(), ); } @@ -368,7 +361,7 @@ public function testInsertBeforeExistsUp(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-insert-before-exists-up.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-before-exists-up.xml')->asXML(), ); } @@ -386,7 +379,7 @@ public function testInsertBeforeExistsDown(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-insert-before-exists-down.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-before-exists-down.xml')->asXML(), ); } @@ -400,7 +393,7 @@ public function testInsertBeforeExistsAnotherTree(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSetMultipleTree()), - simplexml_load_file(__DIR__ . '/data/test-insert-before-exists-another-tree.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-before-exists-another-tree.xml')->asXML(), ); } @@ -462,7 +455,7 @@ public function testInsertAfterExistsUp(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-insert-after-exists-up.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-after-exists-up.xml')->asXML(), ); } @@ -480,7 +473,7 @@ public function testInsertAfterExistsDown(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-insert-after-exists-down.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-after-exists-down.xml')->asXML(), ); } @@ -494,7 +487,7 @@ public function testInsertAfterExistsAnotherTree(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSetMultipleTree()), - simplexml_load_file(__DIR__ . '/data/test-insert-after-exists-another-tree.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-insert-after-exists-another-tree.xml')->asXML(), ); } @@ -551,7 +544,7 @@ public function testDeleteWithChildren(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-delete-with-children.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-delete-with-children.xml')->asXML(), ); } @@ -575,7 +568,7 @@ public function testDelete(): void $this->assertEquals( $this->buildFlatXMLDataSet($this->getDataSet()), - simplexml_load_file(__DIR__ . '/data/test-delete.xml')->asXML(), + simplexml_load_file(__DIR__ . '/Support/data/test-delete.xml')->asXML(), ); } @@ -596,7 +589,7 @@ public function testDeleteExceptionIsRaisedWhenNodeIsRoot(): void $this->expectException(NotSupportedException::class); $this->expectExceptionMessage( - 'Method "yii\behavior\nested\sets\tests\models\Tree::delete" is not supported for deleting root nodes.' + 'Method "Yii2\Extensions\NestedSets\Tests\Support\Model\Tree::delete" is not supported for deleting root nodes.' ); $node = Tree::findOne(1); @@ -609,7 +602,7 @@ public function testExceptionIsRaisedWhenInsertIsCalled(): void $this->expectException(NotSupportedException::class); $this->expectExceptionMessage( - 'Method "yii\behavior\nested\sets\tests\models\Tree::insert" is not supported for inserting new nodes.' + 'Method "Yii2\Extensions\NestedSets\Tests\Support\Model\Tree::insert" is not supported for inserting new nodes.' ); $node = new Tree(['name' => 'Node']); @@ -630,22 +623,22 @@ public function testParents(): void $this->generateFixtureTree(); $this->assertEquals( - require(__DIR__ . '/data/test-parents.php'), + require(__DIR__ . '/Support/data/test-parents.php'), ArrayHelper::toArray(Tree::findOne(11)->parents()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-parents-multiple-tree.php'), + require(__DIR__ . '/Support/data/test-parents-multiple-tree.php'), ArrayHelper::toArray(MultipleTree::findOne(33)->parents()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-parents-with-depth.php'), + require(__DIR__ . '/Support/data/test-parents-with-depth.php'), ArrayHelper::toArray(Tree::findOne(11)->parents(1)->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-parents-multiple-tree-with-depth.php'), + require(__DIR__ . '/Support/data/test-parents-multiple-tree-with-depth.php'), ArrayHelper::toArray(MultipleTree::findOne(33)->parents(1)->all()) ); } @@ -655,22 +648,22 @@ public function testChildren(): void $this->generateFixtureTree(); $this->assertEquals( - require(__DIR__ . '/data/test-children.php'), + require(__DIR__ . '/Support/data/test-children.php'), ArrayHelper::toArray(Tree::findOne(9)->children()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-children-multiple-tree.php'), + require(__DIR__ . '/Support/data/test-children-multiple-tree.php'), ArrayHelper::toArray(MultipleTree::findOne(31)->children()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-children-with-depth.php'), + require(__DIR__ . '/Support/data/test-children-with-depth.php'), ArrayHelper::toArray(Tree::findOne(9)->children(1)->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-children-multiple-tree-with-depth.php'), + require(__DIR__ . '/Support/data/test-children-multiple-tree-with-depth.php'), ArrayHelper::toArray(MultipleTree::findOne(31)->children(1)->all()) ); } @@ -680,12 +673,12 @@ public function testLeaves(): void $this->generateFixtureTree(); $this->assertEquals( - require(__DIR__ . '/data/test-leaves.php'), + require(__DIR__ . '/Support/data/test-leaves.php'), ArrayHelper::toArray(Tree::findOne(9)->leaves()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-leaves-multiple-tree.php'), + require(__DIR__ . '/Support/data/test-leaves-multiple-tree.php'), ArrayHelper::toArray(MultipleTree::findOne(31)->leaves()->all()) ); } @@ -695,12 +688,12 @@ public function testPrev(): void $this->generateFixtureTree(); $this->assertEquals( - require(__DIR__ . '/data/test-prev.php'), + require(__DIR__ . '/Support/data/test-prev.php'), ArrayHelper::toArray(Tree::findOne(9)->prev()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-prev-multiple-tree.php'), + require(__DIR__ . '/Support/data/test-prev-multiple-tree.php'), ArrayHelper::toArray(MultipleTree::findOne(31)->prev()->all()) ); } @@ -710,12 +703,12 @@ public function testNext(): void $this->generateFixtureTree(); $this->assertEquals( - require(__DIR__ . '/data/test-next.php'), + require(__DIR__ . '/Support/data/test-next.php'), ArrayHelper::toArray(Tree::findOne(9)->next()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-next-multiple-tree.php'), + require(__DIR__ . '/Support/data/test-next-multiple-tree.php'), ArrayHelper::toArray(MultipleTree::findOne(31)->next()->all()) ); } diff --git a/tests/NestedSetsQueryBehaviorTest.php b/tests/NestedSetsQueryBehaviorTest.php index c4f8280..6333737 100644 --- a/tests/NestedSetsQueryBehaviorTest.php +++ b/tests/NestedSetsQueryBehaviorTest.php @@ -2,17 +2,10 @@ declare(strict_types=1); -/** - * @link https://github.com/creocoder/yii2-nested-sets - * - * @copyright Copyright (c) 2015 Alexander Kochetov - * @license http://opensource.org/licenses/BSD-3-Clause - */ +namespace Yii2\Extensions\NestedSets\Tests; -namespace yii\behavior\nested\sets\tests; - -use yii\behavior\nested\sets\tests\models\MultipleTree; -use yii\behavior\nested\sets\tests\models\Tree; +use Yii2\Extensions\NestedSets\Tests\Support\Model\MultipleTree; +use Yii2\Extensions\NestedSets\Tests\Support\Model\Tree; use yii\helpers\ArrayHelper; final class NestedSetsQueryBehaviorTest extends TestCase @@ -22,12 +15,12 @@ public function testRoots(): void $this->generateFixtureTree(); $this->assertEquals( - require(__DIR__ . '/data/test-roots-query.php'), + require(__DIR__ . '/Support/data/test-roots-query.php'), ArrayHelper::toArray(Tree::find()->roots()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-roots-multiple-tree-query.php'), + require(__DIR__ . '/Support/data/test-roots-multiple-tree-query.php'), ArrayHelper::toArray(MultipleTree::find()->roots()->all()) ); } @@ -37,12 +30,12 @@ public function testLeaves(): void $this->generateFixtureTree(); $this->assertEquals( - require(__DIR__ . '/data/test-leaves-query.php'), + require(__DIR__ . '/Support/data/test-leaves-query.php'), ArrayHelper::toArray(Tree::find()->leaves()->all()) ); $this->assertEquals( - require(__DIR__ . '/data/test-leaves-multiple-tree-query.php'), + require(__DIR__ . '/Support/data/test-leaves-multiple-tree-query.php'), ArrayHelper::toArray(MultipleTree::find()->leaves()->all()) ); } diff --git a/tests/models/MultipleTree.php b/tests/Support/Model/MultipleTree.php similarity index 79% rename from tests/models/MultipleTree.php rename to tests/Support/Model/MultipleTree.php index 0afa3be..a421d28 100644 --- a/tests/models/MultipleTree.php +++ b/tests/Support/Model/MultipleTree.php @@ -2,16 +2,9 @@ declare(strict_types=1); -/** - * @link https://github.com/creocoder/yii2-nested-sets - * - * @copyright Copyright (c) 2015 Alexander Kochetov - * @license http://opensource.org/licenses/BSD-3-Clause - */ - -namespace yii\behavior\nested\sets\tests\models; +namespace Yii2\Extensions\NestedSets\Tests\Support\Model; -use yii\behavior\nested\sets\NestedSetsBehavior; +use Yii2\Extensions\NestedSets\NestedSetsBehavior; /** * MultipleTree diff --git a/tests/Support/Model/MultipleTreeQuery.php b/tests/Support/Model/MultipleTreeQuery.php new file mode 100644 index 0000000..3952448 --- /dev/null +++ b/tests/Support/Model/MultipleTreeQuery.php @@ -0,0 +1,20 @@ +getDb()->createCommand(); // Carga el XML en la tabla `tree` - $xml = new SimpleXMLElement(__DIR__ . '/data/test.xml', 0, true); + $xml = new SimpleXMLElement(__DIR__ . '/Support/data/test.xml', 0, true); foreach ($xml->children() as $element => $treeElement) { match ($element === 'tree') { diff --git a/tests/models/MultipleTreeQuery.php b/tests/models/MultipleTreeQuery.php deleted file mode 100644 index 89e04be..0000000 --- a/tests/models/MultipleTreeQuery.php +++ /dev/null @@ -1,30 +0,0 @@ -