From 92a5b98b77fc86a7d597f842c15fc3f0fc3b4e58 Mon Sep 17 00:00:00 2001 From: Matthew Kilgore Date: Thu, 26 Nov 2020 20:45:09 -0500 Subject: [PATCH] Fix some review issues --- js/src/common/components/Select.js | 2 +- ...dWithSlugDriver.php => IdWithTransliteratedSlugDriver.php} | 4 ++-- src/Http/HttpServiceProvider.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/Discussion/{IdWithSlugDriver.php => IdWithTransliteratedSlugDriver.php} (87%) diff --git a/js/src/common/components/Select.js b/js/src/common/components/Select.js index 5256b8570..d4cfab4fa 100644 --- a/js/src/common/components/Select.js +++ b/js/src/common/components/Select.js @@ -13,7 +13,7 @@ import withAttr from '../utils/withAttr'; */ export default class Select extends Component { view() { - const { options, onchange, value, disabled, bidi } = this.attrs; + const { options, onchange, value, disabled } = this.attrs; return ( diff --git a/src/Discussion/IdWithSlugDriver.php b/src/Discussion/IdWithTransliteratedSlugDriver.php similarity index 87% rename from src/Discussion/IdWithSlugDriver.php rename to src/Discussion/IdWithTransliteratedSlugDriver.php index e9685736a..ecb4fe7bb 100644 --- a/src/Discussion/IdWithSlugDriver.php +++ b/src/Discussion/IdWithTransliteratedSlugDriver.php @@ -13,7 +13,7 @@ use Flarum\Database\AbstractModel; use Flarum\Http\SlugDriverInterface; use Flarum\User\User; -class IdWithSlugDriver implements SlugDriverInterface +class IdWithTransliteratedSlugDriver implements SlugDriverInterface { public function toSlug(AbstractModel $instance): string { @@ -22,7 +22,7 @@ class IdWithSlugDriver implements SlugDriverInterface public function fromSlug(string $slug, User $actor): AbstractModel { - if (strpos($slug, '-') == true) { + if (strpos($slug, '-')) { $slug_array = explode('-', $slug); $slug = $slug_array[0]; } diff --git a/src/Http/HttpServiceProvider.php b/src/Http/HttpServiceProvider.php index f8ed8182e..2e0c1ccdb 100644 --- a/src/Http/HttpServiceProvider.php +++ b/src/Http/HttpServiceProvider.php @@ -10,7 +10,7 @@ namespace Flarum\Http; use Flarum\Discussion\Discussion; -use Flarum\Discussion\IdWithSlugDriver; +use Flarum\Discussion\IdWithTransliteratedSlugDriver; use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\Application; use Flarum\Post\Post; @@ -36,7 +36,7 @@ class HttpServiceProvider extends AbstractServiceProvider $this->app->singleton('flarum.http.slugDrivers', function () { return [ Discussion::class => [ - 'default' => IdWithSlugDriver::class + 'default' => IdWithTransliteratedSlugDriver::class ], User::class => [ 'default' => UsernameSlugDriver::class