Skip to content

Commit edc0e5f

Browse files
committed
Change config file name to avoid conflicts with non-Nova breadcrumbs packages
1 parent b216131 commit edc0e5f

7 files changed

+16
-16
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ composer require formfeed-uk/nova-breadcrumbs
5656
2) Publish the config file (optional)
5757

5858
```bash
59-
php artisan vendor:publish --tag=breadcrumbs-config
59+
php artisan vendor:publish --tag=nova-breadcrumbs-config
6060
```
6161

6262
## Usage
@@ -155,8 +155,8 @@ The closure provided should return either an instance of Breadcrumb or an array
155155

156156
```php
157157

158-
use FormFeed\Breadcrumbs\Breadcrumbs;
159158
use FormFeed\Breadcrumbs\Breadcrumb;
159+
use FormFeed\Breadcrumbs\Breadcrumbs;
160160

161161
class NovaServiceProvider extends ServiceProvider {
162162

File renamed without changes.

src/Breadcrumb.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public function shouldLinkToParent($resource) {
8585
return $novaClass::$linkToParent;
8686
}
8787

88-
if (!is_null(config("breadcrumbs.linkToParent"))) {
89-
if (config("breadcrumbs.linkToParent") === true && $this->hasParentResource($resource)) {
88+
if (!is_null(config("nova-breadcrumbs.linkToParent"))) {
89+
if (config("nova-breadcrumbs.linkToParent") === true && $this->hasParentResource($resource)) {
9090
return true;
9191
}
9292
}
@@ -142,11 +142,11 @@ public function getTabs(Resource $resource) {
142142
}
143143

144144
protected static function label() {
145-
return config("breadcrumbs.label", "label");
145+
return config("nova-breadcrumbs.label", "label");
146146
}
147147

148148
protected static function title() {
149-
return config("breadcrumbs.title", "title");
149+
return config("nova-breadcrumbs.title", "title");
150150
}
151151

152152
public function getTabPreservedName($tab) {

src/BreadcrumbServiceProvider.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public function boot() {
1919
$this->addMiddleware();
2020

2121
$this->publishes([
22-
__DIR__.'/../config/breadcrumbs.php' => config_path('breadcrumbs.php'),
23-
], "breadcrumbs-config");
22+
__DIR__.'/../config/nova-breadcrumbs.php' => config_path('nova-breadcrumbs.php'),
23+
], "nova-breadcrumbs-config");
2424
}
2525

2626
/**

src/Breadcrumbs.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ protected function groupBreadcrumb(NovaRequest $request, $resource) {
151151
return Arr::wrap(call_user_func_array(static::$groupBreadcrumbCallback, [$request, $this, $groupBreadcrumb]));
152152
}
153153

154-
if (config("breadcrumbs.includeGroup", false) === false || is_null($resource::group()) || ($resource::group() === "Other" && config("breadcrumbs.includeOtherGroup", false) !== true)) {
154+
if (config("nova-breadcrumbs.includeGroup", false) === false || is_null($resource::group()) || ($resource::group() === "Other" && config("nova-breadcrumbs.includeOtherGroup", false) !== true)) {
155155
return [];
156156
}
157157

src/Concerns/InteractsWithParentResources.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected function getParentResource(Resource $resource) {
2222
}
2323

2424
protected function getParentMethod() {
25-
return config("breadcrumbs.parentMethod", "parent");
25+
return config("nova-breadcrumbs.parentMethod", "parent");
2626
}
2727

2828
}

src/Concerns/InteractsWithRelationships.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace Formfeed\Breadcrumbs\Concerns;
44

5-
use Laravel\Nova\Http\Requests\NovaRequest;
6-
use Laravel\Nova\Resource;
7-
use Laravel\Nova\Fields\BelongsTo as BelongsToField;
8-
95
use Illuminate\Database\Eloquent\Model;
10-
use Illuminate\Database\Eloquent\Relations\Relation;
116
use Illuminate\Database\Eloquent\Relations\BelongsTo;
7+
use Illuminate\Database\Eloquent\Relations\Relation;
8+
9+
use Laravel\Nova\Fields\BelongsTo as BelongsToField;
10+
use Laravel\Nova\Http\Requests\NovaRequest;
11+
use Laravel\Nova\Resource;
1212

1313
use ReflectionClass;
1414
use ReflectionMethod;
@@ -29,7 +29,7 @@ protected function relationshipsViaMethod($model) {
2929
}
3030

3131
protected function relationshipsViaInvoke(Model|Null $model, Resource $resource) {
32-
$invoke = (property_exists($resource::class, 'invokingReflection') ? $resource::class::$invokingReflection : config("breadcrumbs.invokingReflection", false)) ?? false;
32+
$invoke = (property_exists($resource::class, 'invokingReflection') ? $resource::class::$invokingReflection : config("nova-breadcrumbs.invokingReflection", false)) ?? false;
3333
if ($invoke !== true) {
3434
return null;
3535
}

0 commit comments

Comments
 (0)