From b99734c62e1f0ac6406842479f011c86ec45db46 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Sun, 6 Dec 2020 20:10:00 +0330 Subject: [PATCH 1/8] Update BaseRelation.php --- src/BaseRelation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BaseRelation.php b/src/BaseRelation.php index 386757d..3b4f59f 100644 --- a/src/BaseRelation.php +++ b/src/BaseRelation.php @@ -132,7 +132,7 @@ public function getRelationQuery( */ public function getRelationCountHash() { - return 'nested_set_'.self::$selfJoinCount++; + return 'nested_set_'.($incrementJoinCount ? self::$selfJoinCount++ : self::$selfJoinCount); } /** @@ -208,4 +208,4 @@ protected function matchForModel(Model $model, EloquentCollection $results) return $result; } -} \ No newline at end of file +} From 1beac8d6cd8e647aca7f8bd240bd39ed0fd464a9 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Mon, 7 Dec 2020 17:21:05 +0330 Subject: [PATCH 2/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 44292ad..5904d3e 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "kalnoy/nestedset", + "name": "kalnoy/nestedset/editWillaArts", "description": "Nested Set Model for Laravel 5.7 and up", "keywords": ["laravel", "nested sets", "nsm", "database", "hierarchy"], "license": "MIT", From 9cd50bb80f6b31fdef37942165bbf878c4fe1e32 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Mon, 7 Dec 2020 17:22:06 +0330 Subject: [PATCH 3/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5904d3e..06b3355 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "kalnoy/nestedset/editWillaArts", + "name": "WillaArts/kalnoynestedset", "description": "Nested Set Model for Laravel 5.7 and up", "keywords": ["laravel", "nested sets", "nsm", "database", "hierarchy"], "license": "MIT", From 10d26478c68e7d67ee2ad07064149080189be222 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Mon, 7 Dec 2020 17:22:45 +0330 Subject: [PATCH 4/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 06b3355..683712b 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "WillaArts/kalnoynestedset", + "name": "willaarts/kalnoynestedset", "description": "Nested Set Model for Laravel 5.7 and up", "keywords": ["laravel", "nested sets", "nsm", "database", "hierarchy"], "license": "MIT", From 5778593114d0154daefdd10efb1eba6b3b4235d5 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Mon, 7 Dec 2020 17:53:18 +0330 Subject: [PATCH 5/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 683712b..77e2f7b 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "willaarts/kalnoynestedset", + "name": "nestedset/willaarts", "description": "Nested Set Model for Laravel 5.7 and up", "keywords": ["laravel", "nested sets", "nsm", "database", "hierarchy"], "license": "MIT", From 6ce0f09d89423df59b82169c6dbeb30e7a0b4e74 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Mon, 7 Dec 2020 18:29:05 +0330 Subject: [PATCH 6/8] Update BaseRelation.php --- src/BaseRelation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaseRelation.php b/src/BaseRelation.php index 3b4f59f..5807c0e 100644 --- a/src/BaseRelation.php +++ b/src/BaseRelation.php @@ -130,7 +130,7 @@ public function getRelationQuery( * * @return string */ - public function getRelationCountHash() + public function getRelationCountHash($incrementJoinCount = true) { return 'nested_set_'.($incrementJoinCount ? self::$selfJoinCount++ : self::$selfJoinCount); } From 3a817b3b3000f09a261536d7c5ee0aed3027bf22 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Wed, 9 Dec 2020 10:49:33 +0330 Subject: [PATCH 7/8] Update README.markdown --- README.markdown | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.markdown b/README.markdown index 40d6adb..a7b6a22 100644 --- a/README.markdown +++ b/README.markdown @@ -4,13 +4,7 @@ [![Latest Unstable Version](https://poser.pugx.org/kalnoy/nestedset/v/unstable.svg)](https://packagist.org/packages/kalnoy/nestedset) [![License](https://poser.pugx.org/kalnoy/nestedset/license.svg)](https://packagist.org/packages/kalnoy/nestedset) -This is a Laravel 4-8 package for working with trees in relational databases. - -* **Laravel 5.7, 5.8, 6.0, 7.0, 8.0** is supported since v5 -* **Laravel 5.5, 5.6** is supported since v4.3 -* **Laravel 5.2, 5.3, 5.4** is supported since v4 -* **Laravel 5.1** is supported in v3 -* **Laravel 4** is supported in v2 +This is a Laravel 4-8 package for working with trees for LARAVEL8(Speacial) in relational databases. Although this project is completely free for use, I appreciate any support! From 249103dffe6e3a4c1220bb00419d98a40207fa8e Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Wed, 9 Dec 2020 10:49:58 +0330 Subject: [PATCH 8/8] Update README.markdown --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index a7b6a22..089cdc2 100644 --- a/README.markdown +++ b/README.markdown @@ -4,7 +4,7 @@ [![Latest Unstable Version](https://poser.pugx.org/kalnoy/nestedset/v/unstable.svg)](https://packagist.org/packages/kalnoy/nestedset) [![License](https://poser.pugx.org/kalnoy/nestedset/license.svg)](https://packagist.org/packages/kalnoy/nestedset) -This is a Laravel 4-8 package for working with trees for LARAVEL8(Speacial) in relational databases. +This is a Laravel 4-8 package for working with trees for LARAVEL8(Speacial)(edit by aliqasemi) in relational databases. Although this project is completely free for use, I appreciate any support!