Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 4315e1d

Browse files
ctf0ctf0
committed
remove deprecation
1 parent 1e760a4 commit 4315e1d

File tree

4 files changed

+38
-35
lines changed

4 files changed

+38
-35
lines changed

‎src/Commands/PackageSetup.php

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

33
namespace ctf0\SimpleMenu\Commands;
44

5+
use Illuminate\Support\Str;
56
use Illuminate\Console\Command;
67

78
class PackageSetup extends Command
89
{
910
protected $file;
10-
protected $signature = 'sm:setup';
11+
protected $signature = 'sm:setup';
1112
protected $description = 'setup package routes & assets compiling';
1213

1314
/**
@@ -29,7 +30,7 @@ public function handle()
2930
{
3031
// routes
3132
$route_file = base_path('routes/web.php');
32-
$search = 'SimpleMenu';
33+
$search = 'SimpleMenu';
3334

3435
if ($this->checkExist($route_file, $search)) {
3536
$data = "\n// SimpleMenu\nSimpleMenu::menuRoutes();";
@@ -39,7 +40,7 @@ public function handle()
3940

4041
// mix
4142
$mix_file = base_path('webpack.mix.js');
42-
$search = 'SimpleMenu';
43+
$search = 'SimpleMenu';
4344

4445
if ($this->checkExist($mix_file, $search)) {
4546
$data = "\n// SimpleMenu\nmix.sass('resources/assets/vendor/SimpleMenu/sass/style.scss', 'public/assets/vendor/SimpleMenu/style.css')";
@@ -60,6 +61,6 @@ public function handle()
6061
*/
6162
protected function checkExist($file, $search)
6263
{
63-
return $this->file->exists($file) && !str_contains($this->file->get($file), $search);
64+
return $this->file->exists($file) && !Str::contains($this->file->get($file), $search);
6465
}
65-
}
66+
}

‎src/SimpleMenuServiceProvider.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace ctf0\SimpleMenu;
44

5+
use Illuminate\Support\Str;
56
use Illuminate\Support\ServiceProvider;
67
use ctf0\SimpleMenu\Commands\PackageSetup;
78
use ctf0\SimpleMenu\Observers\MenuObserver;
@@ -58,7 +59,7 @@ protected function packagePublish()
5859
// views
5960
$this->loadViewsFrom(__DIR__ . '/resources/views', 'SimpleMenu');
6061
$this->publishes([
61-
__DIR__ . '/resources/views' => resource_path('views/vendor/SimpleMenu'),
62+
__DIR__ . '/resources/views' => resource_path('views/vendor/SimpleMenu'),
6263
__DIR__ . '/resources/pagination' => resource_path('views/vendor/pagination'),
6364
], 'views');
6465
}
@@ -94,7 +95,7 @@ protected function macros()
9495
});
9596

9697
$this->app['url']->macro('has', function ($needle) {
97-
return str_contains($this->current(), $needle);
98+
return Str::contains($this->current(), $needle);
9899
});
99100
}
100101

@@ -166,4 +167,4 @@ protected function regPMW()
166167
$this->app['router']->aliasMiddleware('localizationRedirect', LaravelLocalizationRedirectFilter::class);
167168
$this->app['router']->aliasMiddleware('localeSessionRedirect', LocaleSessionRedirect::class);
168169
}
169-
}
170+
}

‎src/Traits/Routes.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
trait Routes
99
{
10-
protected $allRoutes = [];
10+
protected $allRoutes = [];
1111
protected $listFileFound = true;
1212

1313
public function createRoutes()
1414
{
1515
app('router')->group([
16-
'prefix' => LaravelLocalization::setLocale(),
16+
'prefix' => LaravelLocalization::setLocale(),
1717
'middleware' => [
1818
'web',
1919
'localeSessionRedirect',
@@ -62,23 +62,23 @@ protected function routeGen($page)
6262
}
6363

6464
// route data
65-
$url = $page->url;
66-
$action = $page->action;
67-
$prefix = $page->prefix;
68-
$routeName = $page->route_name;
65+
$url = $page->url;
66+
$action = $page->action;
67+
$prefix = $page->prefix;
68+
$routeName = $page->route_name;
6969

7070
// page data
71-
$title = $page->title;
72-
$body = $page->body;
73-
$desc = $page->desc;
74-
$meta = $page->meta;
75-
$cover = $page->cover;
76-
$template = $page->template;
77-
$breadCrumb = $page->getAncestors();
71+
$title = $page->title;
72+
$body = $page->body;
73+
$desc = $page->desc;
74+
$meta = $page->meta;
75+
$cover = $page->cover;
76+
$template = $page->template;
77+
$breadCrumb = $page->getAncestors();
7878

7979
// middlewares
8080
$middlewares = is_null($page->middlewares) ? null : preg_split('/[\s,]+/', $page->middlewares);
81-
$roles = empty($page->roles->pluck('name')->toArray()) ? null : 'role:' . implode(',', $page->roles->pluck('name')->toArray());
81+
$roles = empty($page->roles->pluck('name')->toArray()) ? null : 'role:' . implode(',', $page->roles->pluck('name')->toArray());
8282
$permissions = empty($page->permissions->pluck('name')->toArray()) ? null : 'perm:' . implode(',', $page->permissions->pluck('name')->toArray());
8383

8484
// cache the page so we can pass the page params to the controller@method
@@ -107,7 +107,7 @@ protected function createRoutesList($page)
107107
$routeName = $page->route_name;
108108

109109
foreach ($this->AppLocales() as $code) {
110-
$url = $page->getTranslationWithoutFallback('url', $code);
110+
$url = $page->getTranslationWithoutFallback('url', $code);
111111
$prefix = $page->getTranslationWithoutFallback('prefix', $code);
112112

113113
if ($this->escapeEmptyRoute($url)) {
@@ -153,4 +153,4 @@ protected function clearExtraSlash($url)
153153
{
154154
return preg_replace('/\/+/', '/', $url);
155155
}
156-
}
156+
}

‎src/database/seeds/PagesTableSeeder.php

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
use Faker\Factory;
4+
use Illuminate\Support\Str;
45
use Illuminate\Database\Seeder;
56

67
class PagesTableSeeder extends Seeder
@@ -11,18 +12,18 @@ class PagesTableSeeder extends Seeder
1112
public function run()
1213
{
1314
$pageModel = app(config('simpleMenu.models.page'));
14-
$faker = Factory::create();
15+
$faker = Factory::create();
1516

1617
for ($i=0; $i < 20; ++$i) {
1718
$en = $faker->unique()->city;
1819
$es = $faker->unique()->city;
1920

2021
$pageModel->create([
21-
'template' => 'SimpleMenu::template-example',
22-
'route_name'=> str_slug($en),
23-
'title' => [
24-
'en' => title_case($en),
25-
'es' => title_case($es),
22+
'template' => 'SimpleMenu::template-example',
23+
'route_name'=> Str::slug($en),
24+
'title' => [
25+
'en' => Str::title($en),
26+
'es' => Str::title($es),
2627
],
2728
'body' => [
2829
'en' => $faker->text(),
@@ -33,14 +34,14 @@ public function run()
3334
'es' => $faker->text(),
3435
],
3536
'prefix' => [
36-
'en' => str_slug($faker->unique()->country),
37-
'es' => str_slug($faker->unique()->country),
37+
'en' => Str::slug($faker->unique()->country),
38+
'es' => Str::slug($faker->unique()->country),
3839
],
3940
'url' => [
40-
'en' => str_slug($en),
41-
'es' => str_slug($es),
41+
'en' => Str::slug($en),
42+
'es' => Str::slug($es),
4243
],
4344
]);
4445
}
4546
}
46-
}
47+
}

0 commit comments

Comments
 (0)