From 33644b40c9a7c8c0f8d40dc61c0b0dbe070d3059 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Mon, 6 Feb 2023 14:47:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80hook=E5=91=BD=E5=90=8D=20add?= =?UTF-8?q?=5Ffilter=20=3D>=20add=5Fhook=5Ffilter=20add=5Faction=20=3D>=20?= =?UTF-8?q?add=5Fhook=5Faction=20blade=5Fhook=20=3D>=20add=5Fhook=5Fblade?= =?UTF-8?q?=20wrapperhook=20=3D>=20hookwrapper=20endwrapperhook=20=3D>=20e?= =?UTF-8?q?ndhookwrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Helpers.php | 6 +++--- beike/Hook/HookServiceProvider.php | 6 +++--- plugins/LatestProducts/Bootstrap.php | 20 +++++++++---------- plugins/Social/Bootstrap.php | 2 +- .../views/pages/products/form/form.blade.php | 4 ++-- themes/default/layout/header.blade.php | 20 +++++++++---------- themes/default/product.blade.php | 20 +++++++++---------- 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/beike/Helpers.php b/beike/Helpers.php index 597012f8..2b5c7916 100644 --- a/beike/Helpers.php +++ b/beike/Helpers.php @@ -636,7 +636,7 @@ function hook_action($hookKey, $hookValue) * @param int $arguments * @return mixed */ -function add_filter($hookKey, $callback, int $priority = 20, int $arguments = 1) +function add_hook_filter($hookKey, $callback, int $priority = 20, int $arguments = 1): mixed { return Eventy::addFilter($hookKey, $callback, $priority, $arguments); } @@ -649,7 +649,7 @@ function add_filter($hookKey, $callback, int $priority = 20, int $arguments = 1) * @param int $priority * @param int $arguments */ -function add_action($hookKey, $callback, int $priority = 20, int $arguments = 1) +function add_hook_action($hookKey, $callback, int $priority = 20, int $arguments = 1) { Eventy::addAction($hookKey, $callback, $priority, $arguments); } @@ -661,7 +661,7 @@ function add_action($hookKey, $callback, int $priority = 20, int $arguments = 1) * @param $callback * @param int $priority */ -function blade_hook($hookKey, $callback, int $priority = 0) +function add_hook_blade($hookKey, $callback, int $priority = 0) { Hook::listen($hookKey, $callback, $priority); } diff --git a/beike/Hook/HookServiceProvider.php b/beike/Hook/HookServiceProvider.php index 4b6f590a..21c5f1a0 100644 --- a/beike/Hook/HookServiceProvider.php +++ b/beike/Hook/HookServiceProvider.php @@ -55,11 +55,11 @@ class HookServiceProvider extends ServiceProvider /** * 添加 blade wrapper hook 标签 * - * @wrapperhook('xxx') --- @endwrapperhook, 将某段代码打包输出再添加 hook 输出 + * @hookwrapper('xxx') --- @endhookwrapper, 将某段代码打包输出再添加 hook 输出 */ protected function bootWrapperHookDirectives() { - Blade::directive('wrapperhook', function ($parameter) { + Blade::directive('hookwrapper', function ($parameter) { $parameter = trim($parameter, '()'); $parameters = explode(',', $parameter); $name = trim($parameters[0], "'"); @@ -70,7 +70,7 @@ class HookServiceProvider extends ServiceProvider ?>'; }); - Blade::directive('endwrapperhook', function () { + Blade::directive('endhookwrapper', function () { return ' trans('LatestProducts::header.latest_products'), "link" => shop_route('latest_products'), @@ -47,23 +47,23 @@ class Bootstrap */ private function modifyHeader() { - blade_hook('header.top.currency', function ($callback, $output, $data) { + add_hook_blade('header.top.currency', function ($callback, $output, $data) { return '货币前' . $output; }); - blade_hook('header.top.language', function ($callback, $output, $data) { + add_hook_blade('header.top.language', function ($callback, $output, $data) { return $output . '语言后'; }); - blade_hook('header.top.telephone', function ($callback, $output, $data) { + add_hook_blade('header.top.telephone', function ($callback, $output, $data) { return '电话前' . $output; }); - blade_hook('header.menu.logo', function ($callback, $output, $data) { + add_hook_blade('header.menu.logo', function ($callback, $output, $data) { return $output . 'Logo后'; }); - blade_hook('header.menu.icon', function ($callback, $output, $data) { + add_hook_blade('header.menu.icon', function ($callback, $output, $data) { $view = view('LatestProducts::shop.header_icon')->render(); return $output . $view; }); @@ -78,16 +78,16 @@ class Bootstrap */ private function modifyProductDetail() { - blade_hook('product.detail.name', function ($callback, $output, $data) { + add_hook_blade('product.detail.name', function ($callback, $output, $data) { $badge = 'Hot'; return $badge . $output; }); - blade_hook('product.detail.brand', function ($callback, $output, $data) { + add_hook_blade('product.detail.brand', function ($callback, $output, $data) { return $output . '
Brand 2:品牌 2
'; }); - blade_hook('product.detail.buy.after', function ($callback, $output, $data) { + add_hook_blade('product.detail.buy.after', function ($callback, $output, $data) { $view = view('LatestProducts::shop.product_button')->render(); return $output . $view; }); @@ -99,7 +99,7 @@ class Bootstrap */ private function modifyAdminProductEdit() { - blade_hook('admin.product.edit.extra', function ($callback, $output, $data) { + add_hook_blade('admin.product.edit.extra', function ($callback, $output, $data) { $view = view('LatestProducts::admin.product.edit_extra_field', $data)->render(); return $output . $view; }, 1); diff --git a/plugins/Social/Bootstrap.php b/plugins/Social/Bootstrap.php index 5fd6695c..c01036ab 100644 --- a/plugins/Social/Bootstrap.php +++ b/plugins/Social/Bootstrap.php @@ -24,7 +24,7 @@ class Bootstrap */ private function addSocialData() { - add_filter('login.social.buttons', function ($buttons) { + add_hook_filter('login.social.buttons', function ($buttons) { $providers = plugin_setting('social.setting'); if (empty($providers)) { return $buttons; diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index c74a277b..2410a0ff 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -76,12 +76,12 @@ {{-- --}} - @wrapperhook('admin.product.edit.brand') + @hookwrapper('admin.product.edit.brand') - @endwrapperhook + @endhookwrapper diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php index 2b177899..148083dc 100644 --- a/themes/default/layout/header.blade.php +++ b/themes/default/layout/header.blade.php @@ -2,7 +2,7 @@
- @wrapperhook('header.top.currency') + @hookwrapper('header.top.currency')
- @endwrapperhook + @endhookwrapper
@if (!is_mobile()) @include('shared.menu-pc') @@ -78,7 +78,7 @@