From 4691a3f775f03ec136e4a5fa38e22583bc81be8a Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 23 Aug 2022 17:48:09 +1000 Subject: [PATCH] Code styling update, no functional changes --- src/API.php | 3 ++- src/Base.php | 4 +--- src/Blockkit/Blocks/Accessories/Overflow.php | 5 ++--- src/Blockkit/Blocks/Actions.php | 8 ++------ src/Blockkit/Blocks/Context.php | 1 + src/Blockkit/Blocks/Divider.php | 6 ------ src/Blockkit/Blocks/Elements/Button.php | 1 + src/Blockkit/Blocks/Elements/Confirm.php | 3 ++- src/Blockkit/Blocks/Elements/Options.php | 1 + src/Blockkit/Blocks/Elements/Text.php | 1 + src/Blockkit/Blocks/Header.php | 1 + src/Blockkit/Blocks/Input.php | 4 ++-- src/Blockkit/Blocks/Section.php | 1 + src/Blockkit/Modal.php | 1 + src/Channels/SlackBotChannel.php | 3 +-- src/Command/Base.php | 2 +- src/Command/Factory.php | 1 + src/Command/Unknown.php | 2 +- src/Console/Commands/SlackSocketClient.php | 3 ++- src/Event/Base.php | 2 +- src/Event/Factory.php | 2 +- src/Event/Unknown.php | 1 - src/Http/Controllers/EventsController.php | 6 +++--- src/Http/Controllers/InteractiveMessageController.php | 4 ++-- src/Http/Controllers/InteractiveOptionsController.php | 5 +++-- src/Http/Controllers/SlackAppController.php | 3 +-- src/Http/Controllers/SlashCommandController.php | 1 - src/Http/Middleware/CheckRequest.php | 1 + src/Http/Middleware/CheckSignature.php | 1 + src/Interactive/Base.php | 1 + src/Interactive/BlockActions.php | 1 + src/Interactive/InteractiveMessage.php | 3 ++- src/Interactive/Shortcut.php | 2 +- src/Interactive/Unknown.php | 3 +-- src/Interactive/ViewClosed.php | 2 +- src/Interactive/ViewSubmission.php | 9 +++++---- src/Jobs/DeleteChat.php | 3 ++- src/Jobs/Job.php | 2 +- src/Jobs/TeamUpdate.php | 3 ++- src/Listeners/AppHomeOpenedListener.php | 4 ++-- src/Listeners/BlockActionListener.php | 3 ++- src/Listeners/ChannelJoinListener.php | 2 +- src/Listeners/ChannelLeftListener.php | 2 +- src/Listeners/InteractiveMessageListener.php | 2 +- src/Listeners/MessageListener.php | 2 +- src/Listeners/PinAddedListener.php | 2 +- src/Listeners/PinRemovedListener.php | 2 +- src/Listeners/ReactionAddedListener.php | 2 +- src/Listeners/ShortcutListener.php | 10 ++++++---- src/Listeners/ViewClosedListener.php | 2 +- src/Listeners/ViewSubmissionListener.php | 2 +- src/Message.php | 1 + src/Message/Attachment.php | 10 +--------- src/Models/Channel.php | 4 ++-- src/Models/Enterprise.php | 4 ++-- src/Models/Team.php | 4 ++-- src/Models/Token.php | 4 ++-- src/Models/User.php | 6 +++--- src/Options/InteractiveMessage.php | 1 + src/Options/Unknown.php | 5 ++--- src/Providers/SlackServiceProvider.php | 1 + src/Response/Base.php | 5 +++-- src/Response/ChannelList.php | 2 +- src/Response/Chat.php | 2 +- src/Response/Generic.php | 2 +- src/Response/Team.php | 2 +- src/Response/Test.php | 2 +- src/Response/User.php | 2 +- src/Traits/ScopeActive.php | 2 +- src/routes.php | 2 +- 70 files changed, 101 insertions(+), 101 deletions(-) diff --git a/src/API.php b/src/API.php index c0f5b08..02938d7 100644 --- a/src/API.php +++ b/src/API.php @@ -5,6 +5,7 @@ namespace Slack; use Illuminate\Support\Arr; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Log; + use Slack\Blockkit\Modal; use Slack\Response\Chat; use Slack\Exceptions\{SlackAlreadyPinnedException, @@ -484,4 +485,4 @@ final class API return $request; } -} +} \ No newline at end of file diff --git a/src/Base.php b/src/Base.php index bdce5fe..93c081d 100644 --- a/src/Base.php +++ b/src/Base.php @@ -2,14 +2,13 @@ namespace Slack; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; -use Slack\Models\{Channel,Enterprise,Team,User}; use App\Models\Slack\Channel as AppChannel; use App\Models\Slack\Enterprise as AppEnterprise; use App\Models\Slack\Team as AppTeam; use App\Models\Slack\User as AppUser; +use Slack\Models\{Channel,Enterprise,Team,User}; /** * Class Base - is a Base to all incoming Slack POST requests @@ -94,7 +93,6 @@ abstract class Base } return $o->exists ? $o : NULL; - } /** diff --git a/src/Blockkit/Blocks/Accessories/Overflow.php b/src/Blockkit/Blocks/Accessories/Overflow.php index 577bde9..049eb54 100644 --- a/src/Blockkit/Blocks/Accessories/Overflow.php +++ b/src/Blockkit/Blocks/Accessories/Overflow.php @@ -5,8 +5,8 @@ namespace Slack\Blockkit\Blocks\Accessories; use \Exception; use Illuminate\Support\Arr; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Log; -use Slack\Blockkit\Blocks\Elements\Text; + +use Slack\Blockkit\Blocks\Elements\{Confirm,Text}; use Slack\Blockkit\Element; final class Overflow extends Element @@ -19,7 +19,6 @@ final class Overflow extends Element private const MAX_OPTIONS = 5; /** - * @param Text $placeholder * @param string $action_id * @param Collection $options * @throws Exception diff --git a/src/Blockkit/Blocks/Actions.php b/src/Blockkit/Blocks/Actions.php index 1432f6b..e08d2b1 100644 --- a/src/Blockkit/Blocks/Actions.php +++ b/src/Blockkit/Blocks/Actions.php @@ -4,9 +4,9 @@ namespace Slack\Blockkit\Blocks; use \Exception; use Illuminate\Support\Collection; + use Slack\Blockkit\Blocks; -use Slack\Blockkit\Blocks\Elements\{Button,MultiStaticSelect,Text}; -use Slack\Blockkit\Element; +use Slack\Blockkit\Blocks\Elements\{Button,MultiStaticSelect}; final class Actions extends Blocks { @@ -22,10 +22,6 @@ final class Actions extends Blocks Blocks\Accessories\Overflow::class, ]; - /** - * @param Text $text - * @throws Exception - */ public function __construct() { parent::__construct(); diff --git a/src/Blockkit/Blocks/Context.php b/src/Blockkit/Blocks/Context.php index 60f51bd..8d9e9b7 100644 --- a/src/Blockkit/Blocks/Context.php +++ b/src/Blockkit/Blocks/Context.php @@ -4,6 +4,7 @@ namespace Slack\Blockkit\Blocks; use \Exception; use Illuminate\Support\Collection; + use Slack\Blockkit\Blocks; final class Context extends Blocks diff --git a/src/Blockkit/Blocks/Divider.php b/src/Blockkit/Blocks/Divider.php index d6f73f2..0ac258c 100644 --- a/src/Blockkit/Blocks/Divider.php +++ b/src/Blockkit/Blocks/Divider.php @@ -2,9 +2,7 @@ namespace Slack\Blockkit\Blocks; -use \Exception; use Slack\Blockkit\Blocks; -use Slack\Blockkit\Blocks\Elements\Text; final class Divider extends Blocks { @@ -12,10 +10,6 @@ final class Divider extends Blocks 'block_id' => 255, // @todo Should be unique for each message ]; - /** - * @param Text|NULL $text - * @throws Exception - */ public function __construct() { parent::__construct(); diff --git a/src/Blockkit/Blocks/Elements/Button.php b/src/Blockkit/Blocks/Elements/Button.php index fd65a3f..2e0dafc 100644 --- a/src/Blockkit/Blocks/Elements/Button.php +++ b/src/Blockkit/Blocks/Elements/Button.php @@ -3,6 +3,7 @@ namespace Slack\Blockkit\Blocks\Elements; use \Exception; + use Slack\Blockkit\Element; final class Button extends Element diff --git a/src/Blockkit/Blocks/Elements/Confirm.php b/src/Blockkit/Blocks/Elements/Confirm.php index 841e8f0..391e6dd 100644 --- a/src/Blockkit/Blocks/Elements/Confirm.php +++ b/src/Blockkit/Blocks/Elements/Confirm.php @@ -2,13 +2,14 @@ namespace Slack\Blockkit\Blocks\Elements; -use \Exception; use Slack\Blockkit\Element; final class Confirm extends Element { public function __construct() { + parent::__construct(); + abort(500,'Not Implememted'); } diff --git a/src/Blockkit/Blocks/Elements/Options.php b/src/Blockkit/Blocks/Elements/Options.php index f48bb55..889f26e 100644 --- a/src/Blockkit/Blocks/Elements/Options.php +++ b/src/Blockkit/Blocks/Elements/Options.php @@ -3,6 +3,7 @@ namespace Slack\Blockkit\Blocks\Elements; use \Exception; + use Slack\Blockkit\Element; /** diff --git a/src/Blockkit/Blocks/Elements/Text.php b/src/Blockkit/Blocks/Elements/Text.php index f098a9d..e58547c 100644 --- a/src/Blockkit/Blocks/Elements/Text.php +++ b/src/Blockkit/Blocks/Elements/Text.php @@ -3,6 +3,7 @@ namespace Slack\Blockkit\Blocks\Elements; use \Exception; + use Slack\Blockkit\Element; final class Text extends Element diff --git a/src/Blockkit/Blocks/Header.php b/src/Blockkit/Blocks/Header.php index 6e7eac5..b6c2a9e 100644 --- a/src/Blockkit/Blocks/Header.php +++ b/src/Blockkit/Blocks/Header.php @@ -3,6 +3,7 @@ namespace Slack\Blockkit\Blocks; use \Exception; + use Slack\Blockkit\Blocks; use Slack\Blockkit\Blocks\Elements\Text; diff --git a/src/Blockkit/Blocks/Input.php b/src/Blockkit/Blocks/Input.php index 71bd414..46f4c70 100644 --- a/src/Blockkit/Blocks/Input.php +++ b/src/Blockkit/Blocks/Input.php @@ -3,7 +3,7 @@ namespace Slack\Blockkit\Blocks; use \Exception; -use Illuminate\Support\Collection; + use Slack\Blockkit\{Blocks,Element}; final class Input extends Blocks @@ -22,7 +22,7 @@ final class Input extends Blocks // @todo dispatch_action /** - * @param Text|NULL $text not required if fields is provided + * @param Elements\Text|null $label * @throws Exception */ public function __construct(Elements\Text $label=NULL) diff --git a/src/Blockkit/Blocks/Section.php b/src/Blockkit/Blocks/Section.php index 9728505..149949f 100644 --- a/src/Blockkit/Blocks/Section.php +++ b/src/Blockkit/Blocks/Section.php @@ -4,6 +4,7 @@ namespace Slack\Blockkit\Blocks; use \Exception; use Illuminate\Support\Collection; + use Slack\Blockkit\{Blocks,Element}; use Slack\BLockKit\Blocks\Elements\Text; diff --git a/src/Blockkit/Modal.php b/src/Blockkit/Modal.php index d308201..0d6e68d 100644 --- a/src/Blockkit/Modal.php +++ b/src/Blockkit/Modal.php @@ -3,6 +3,7 @@ namespace Slack\Blockkit; use \Exception; + use Slack\BlockKit; use Slack\Blockkit\Blocks\Divider; use Slack\Blockkit\Blocks\Elements\Text; diff --git a/src/Channels/SlackBotChannel.php b/src/Channels/SlackBotChannel.php index 6b1b3ef..aa9f5dd 100644 --- a/src/Channels/SlackBotChannel.php +++ b/src/Channels/SlackBotChannel.php @@ -2,9 +2,8 @@ namespace Slack\Channels; -use Illuminate\Notifications\Notification; +use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Schema; class SlackBotChannel { diff --git a/src/Command/Base.php b/src/Command/Base.php index 9deb861..09e2875 100644 --- a/src/Command/Base.php +++ b/src/Command/Base.php @@ -3,8 +3,8 @@ namespace Slack\Command; use Illuminate\Support\Facades\Log; + use Slack\Base as SlackBase; -use Slack\Blockkit\Blocks; use Slack\Message; abstract class Base extends SlackBase diff --git a/src/Command/Factory.php b/src/Command/Factory.php index f6cabd1..3df6b15 100644 --- a/src/Command/Factory.php +++ b/src/Command/Factory.php @@ -5,6 +5,7 @@ namespace Slack\Command; use Illuminate\Support\Arr; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Log; + use Slack\Client\Payload; class Factory { diff --git a/src/Command/Unknown.php b/src/Command/Unknown.php index 7a66e5b..d9d7e8b 100644 --- a/src/Command/Unknown.php +++ b/src/Command/Unknown.php @@ -2,8 +2,8 @@ namespace Slack\Command; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; + use Slack\Message; /** diff --git a/src/Console/Commands/SlackSocketClient.php b/src/Console/Commands/SlackSocketClient.php index e71f21f..fbc42fc 100644 --- a/src/Console/Commands/SlackSocketClient.php +++ b/src/Console/Commands/SlackSocketClient.php @@ -5,6 +5,7 @@ namespace Slack\Console\Commands; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; use React\EventLoop\Loop; + use Slack\Client\SocketMode; use Slack\Command\Factory as SlackCommandFactory; use Slack\Event\Factory as SlackEventFactory; @@ -63,4 +64,4 @@ class SlackSocketClient extends Command $loop->run(); } -} +} \ No newline at end of file diff --git a/src/Event/Base.php b/src/Event/Base.php index 3c7bd6a..4b70dfa 100644 --- a/src/Event/Base.php +++ b/src/Event/Base.php @@ -2,8 +2,8 @@ namespace Slack\Event; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; + use Slack\Base as SlackBase; abstract class Base extends SlackBase diff --git a/src/Event/Factory.php b/src/Event/Factory.php index c2e088a..8682573 100644 --- a/src/Event/Factory.php +++ b/src/Event/Factory.php @@ -2,10 +2,10 @@ namespace Slack\Event; -use Illuminate\Http\Request; use Illuminate\Support\Arr; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Log; + use Slack\Client\Payload; class Factory { diff --git a/src/Event/Unknown.php b/src/Event/Unknown.php index 86a8486..4fbfef3 100644 --- a/src/Event/Unknown.php +++ b/src/Event/Unknown.php @@ -2,7 +2,6 @@ namespace Slack\Event; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; /** diff --git a/src/Http/Controllers/EventsController.php b/src/Http/Controllers/EventsController.php index 8ecdeb3..1718f8f 100644 --- a/src/Http/Controllers/EventsController.php +++ b/src/Http/Controllers/EventsController.php @@ -4,10 +4,10 @@ namespace Slack\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; -use Slack\Client\Payload; -use Slack\Event\Factory as SlackEventFactory; use App\Http\Controllers\Controller; +use Slack\Client\Payload; +use Slack\Event\Factory as SlackEventFactory; class EventsController extends Controller { @@ -27,4 +27,4 @@ class EventsController extends Controller return response('Event Processed',200); } -} +} \ No newline at end of file diff --git a/src/Http/Controllers/InteractiveMessageController.php b/src/Http/Controllers/InteractiveMessageController.php index 1a693b2..35b2836 100644 --- a/src/Http/Controllers/InteractiveMessageController.php +++ b/src/Http/Controllers/InteractiveMessageController.php @@ -4,12 +4,12 @@ namespace Slack\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; + +use App\Http\Controllers\Controller; use Slack\Client\Payload; use Slack\Message; use Slack\Interactive\Factory as InteractiveMessageFactory; -use App\Http\Controllers\Controller; - class InteractiveMessageController extends Controller { private const LOGKEY = 'CIM'; diff --git a/src/Http/Controllers/InteractiveOptionsController.php b/src/Http/Controllers/InteractiveOptionsController.php index 9ba6c4d..111787d 100644 --- a/src/Http/Controllers/InteractiveOptionsController.php +++ b/src/Http/Controllers/InteractiveOptionsController.php @@ -4,10 +4,10 @@ namespace Slack\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; -use Slack\Client\Payload; -use Slack\Options\Factory as SlackOptionsFactory; use App\Http\Controllers\Controller; +use Slack\Client\Payload; +use Slack\Options\Factory as SlackOptionsFactory; class InteractiveOptionsController extends Controller { @@ -18,6 +18,7 @@ class InteractiveOptionsController extends Controller * * @param Request $request * @return \Illuminate\Http\Response|\Laravel\Lumen\Http\ResponseFactory + * @throws \Exception */ public function fire(Request $request) { diff --git a/src/Http/Controllers/SlackAppController.php b/src/Http/Controllers/SlackAppController.php index bb1ea34..81ea380 100644 --- a/src/Http/Controllers/SlackAppController.php +++ b/src/Http/Controllers/SlackAppController.php @@ -11,7 +11,6 @@ use Slack\Jobs\TeamUpdate; use Slack\Models\{Enterprise,Team,Token,User}; use App\Http\Controllers\Controller; -use App\Models\Slack\Channel as AppChannel; use App\Models\Slack\Enterprise as AppEnterprise; use App\Models\Slack\Team as AppTeam; use App\Models\Slack\User as AppUser; @@ -177,4 +176,4 @@ class SlackAppController extends Controller 'user_scope' => join(',',config('slack.user_scopes')), ]; } -} +} \ No newline at end of file diff --git a/src/Http/Controllers/SlashCommandController.php b/src/Http/Controllers/SlashCommandController.php index c392294..86d1981 100644 --- a/src/Http/Controllers/SlashCommandController.php +++ b/src/Http/Controllers/SlashCommandController.php @@ -7,7 +7,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; use App\Http\Controllers\Controller; - use Slack\Client\Payload; use Slack\Command\Factory; use Slack\Message; diff --git a/src/Http/Middleware/CheckRequest.php b/src/Http/Middleware/CheckRequest.php index 3daab7d..b46dd19 100644 --- a/src/Http/Middleware/CheckRequest.php +++ b/src/Http/Middleware/CheckRequest.php @@ -5,6 +5,7 @@ namespace Slack\Http\Middleware; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; + use Slack\Client\Payload; use Slack\Event\Factory as EventFactory; use Slack\Interactive\Factory as InteractiveFactory; diff --git a/src/Http/Middleware/CheckSignature.php b/src/Http/Middleware/CheckSignature.php index d4fbdb8..7607c68 100644 --- a/src/Http/Middleware/CheckSignature.php +++ b/src/Http/Middleware/CheckSignature.php @@ -6,6 +6,7 @@ use Carbon\Carbon; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; + use Slack\Base; class CheckSignature diff --git a/src/Interactive/Base.php b/src/Interactive/Base.php index db219d7..201013a 100644 --- a/src/Interactive/Base.php +++ b/src/Interactive/Base.php @@ -3,6 +3,7 @@ namespace Slack\Interactive; use Illuminate\Support\Facades\Log; + use Slack\Base as SlackBase; abstract class Base extends SlackBase diff --git a/src/Interactive/BlockActions.php b/src/Interactive/BlockActions.php index a547536..e7a3f86 100644 --- a/src/Interactive/BlockActions.php +++ b/src/Interactive/BlockActions.php @@ -4,6 +4,7 @@ namespace Slack\Interactive; use Illuminate\Support\Arr; use Illuminate\Support\Collection; + use Slack\Models\Channel; /** diff --git a/src/Interactive/InteractiveMessage.php b/src/Interactive/InteractiveMessage.php index bdb2669..f2fce5e 100644 --- a/src/Interactive/InteractiveMessage.php +++ b/src/Interactive/InteractiveMessage.php @@ -4,6 +4,7 @@ namespace Slack\Interactive; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Log; + use Slack\Message; /** @@ -120,4 +121,4 @@ class InteractiveMessage extends Base return (new Message)->text('That didnt work, I didnt know what to do with your button - you might like to tell '.$this->team()->owner->slack_user); } } -} +} \ No newline at end of file diff --git a/src/Interactive/Shortcut.php b/src/Interactive/Shortcut.php index c79d2c1..c4b0a40 100644 --- a/src/Interactive/Shortcut.php +++ b/src/Interactive/Shortcut.php @@ -35,4 +35,4 @@ class Shortcut extends Base return parent::__get($key); } } -} +} \ No newline at end of file diff --git a/src/Interactive/Unknown.php b/src/Interactive/Unknown.php index 6a4bf89..4c2ad54 100644 --- a/src/Interactive/Unknown.php +++ b/src/Interactive/Unknown.php @@ -2,7 +2,6 @@ namespace Slack\Interactive; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; /** @@ -18,4 +17,4 @@ class Unknown extends Base parent::__construct($request); } -} +} \ No newline at end of file diff --git a/src/Interactive/ViewClosed.php b/src/Interactive/ViewClosed.php index da2b333..fdbb0d3 100644 --- a/src/Interactive/ViewClosed.php +++ b/src/Interactive/ViewClosed.php @@ -84,4 +84,4 @@ class ViewClosed extends Base return parent::__get($key); } } -} +} \ No newline at end of file diff --git a/src/Interactive/ViewSubmission.php b/src/Interactive/ViewSubmission.php index 10c1747..ee21f36 100644 --- a/src/Interactive/ViewSubmission.php +++ b/src/Interactive/ViewSubmission.php @@ -5,9 +5,9 @@ namespace Slack\Interactive; use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; -use Slack\Message; -use Slack\Models\Team; + use Slack\Blockkit\Modal; +use Slack\Models\Team; /** * Incoming modal view submission event. @@ -41,7 +41,8 @@ class ViewSubmission extends Base /** * This method should be overridden by a local implementation * - * @return Message + * @return Modal + * @throws \Exception */ public function respond(): Modal { @@ -96,4 +97,4 @@ class ViewSubmission extends Base // Return the state value, or the original block value return object_get($this->_data,'view.state.values.'.$key.'.'.$block_id.'.value') ?: object_get(Arr::get(object_get($this->_data,'view.blocks'),$key),'text.text',''); } -} +} \ No newline at end of file diff --git a/src/Jobs/DeleteChat.php b/src/Jobs/DeleteChat.php index c36379f..83278bb 100644 --- a/src/Jobs/DeleteChat.php +++ b/src/Jobs/DeleteChat.php @@ -4,6 +4,7 @@ namespace Slack\Jobs; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; + use Slack\Models\{Channel,User}; use Slack\Exceptions\SlackException; @@ -52,4 +53,4 @@ class DeleteChat extends Job Log::error(sprintf('%s:Failed to delete slack message [%s] [%s]',static::LOGKEY,$this->ts,$e->getMessage()),['m'=>__METHOD__]); } } -} +} \ No newline at end of file diff --git a/src/Jobs/Job.php b/src/Jobs/Job.php index 33f98ea..45c47c3 100644 --- a/src/Jobs/Job.php +++ b/src/Jobs/Job.php @@ -29,4 +29,4 @@ abstract class Job implements ShouldQueue { return Arr::get($this->_data,$key); } -} +} \ No newline at end of file diff --git a/src/Jobs/TeamUpdate.php b/src/Jobs/TeamUpdate.php index 812890e..549cc9b 100644 --- a/src/Jobs/TeamUpdate.php +++ b/src/Jobs/TeamUpdate.php @@ -3,6 +3,7 @@ namespace Slack\Jobs; use Illuminate\Support\Facades\Log; + use Slack\Exceptions\SlackTokenScopeException; use Slack\Models\Team; @@ -44,4 +45,4 @@ class TeamUpdate extends Job $this->to->save(); } -} +} \ No newline at end of file diff --git a/src/Listeners/AppHomeOpenedListener.php b/src/Listeners/AppHomeOpenedListener.php index 902d579..a7a76c9 100644 --- a/src/Listeners/AppHomeOpenedListener.php +++ b/src/Listeners/AppHomeOpenedListener.php @@ -4,9 +4,9 @@ namespace Slack\Listeners; use Illuminate\Support\Facades\Log; use Illuminate\Contracts\Queue\ShouldQueue; -use Slack\Event\AppHomeOpened; use App\Jobs\SlackHomeTabUpdate; +use Slack\Event\AppHomeOpened; class AppHomeOpenedListener implements ShouldQueue { @@ -27,4 +27,4 @@ class AppHomeOpenedListener implements ShouldQueue dispatch((new SlackHomeTabUpdate($event->user(),$event->team(TRUE),$event->tab,$event->view))->onQueue('high')); } -} +} \ No newline at end of file diff --git a/src/Listeners/BlockActionListener.php b/src/Listeners/BlockActionListener.php index 1c7f9b0..f498684 100644 --- a/src/Listeners/BlockActionListener.php +++ b/src/Listeners/BlockActionListener.php @@ -3,6 +3,7 @@ namespace Slack\Listeners; use Illuminate\Support\Facades\Log; + use Slack\Jobs\DeleteChat; use Slack\Interactive\BlockActions; @@ -82,4 +83,4 @@ class BlockActionListener } } } -} +} \ No newline at end of file diff --git a/src/Listeners/ChannelJoinListener.php b/src/Listeners/ChannelJoinListener.php index 2c5de0d..2ab1997 100644 --- a/src/Listeners/ChannelJoinListener.php +++ b/src/Listeners/ChannelJoinListener.php @@ -35,4 +35,4 @@ class ChannelJoinListener implements ShouldQueue Log::debug(sprintf('%s:Wasnt the BOT who joined Channel [%s]',self::LOGKEY,$event->channel_id),['m'=>__METHOD__]); } } -} +} \ No newline at end of file diff --git a/src/Listeners/ChannelLeftListener.php b/src/Listeners/ChannelLeftListener.php index cde19e5..4bbee4d 100644 --- a/src/Listeners/ChannelLeftListener.php +++ b/src/Listeners/ChannelLeftListener.php @@ -31,4 +31,4 @@ class ChannelLeftListener implements ShouldQueue $o->active = FALSE; $o->save(); } -} +} \ No newline at end of file diff --git a/src/Listeners/InteractiveMessageListener.php b/src/Listeners/InteractiveMessageListener.php index e7e33e2..a91b288 100644 --- a/src/Listeners/InteractiveMessageListener.php +++ b/src/Listeners/InteractiveMessageListener.php @@ -29,4 +29,4 @@ class InteractiveMessageListener implements ShouldQueue Log::notice(sprintf('%s:Unhandled CALLBACK [%s]',self::LOGKEY,$event->callback_id),['m'=>__METHOD__]); } } -} +} \ No newline at end of file diff --git a/src/Listeners/MessageListener.php b/src/Listeners/MessageListener.php index 81fd117..12eca8d 100644 --- a/src/Listeners/MessageListener.php +++ b/src/Listeners/MessageListener.php @@ -35,4 +35,4 @@ class MessageListener implements ShouldQueue Log::notice(sprintf('%s:Unhandled TYPE [%s]',self::LOGKEY,$event->type),['m'=>__METHOD__]); } } -} +} \ No newline at end of file diff --git a/src/Listeners/PinAddedListener.php b/src/Listeners/PinAddedListener.php index dad96a8..ed0b132 100644 --- a/src/Listeners/PinAddedListener.php +++ b/src/Listeners/PinAddedListener.php @@ -26,4 +26,4 @@ class PinAddedListener implements ShouldQueue Log::notice(sprintf('%s:Ignoring Pin Add on [%s]',static::LOGKEY,$event->ts),['m'=>__METHOD__]); } -} +} \ No newline at end of file diff --git a/src/Listeners/PinRemovedListener.php b/src/Listeners/PinRemovedListener.php index 4a6dc79..1b2fb2d 100644 --- a/src/Listeners/PinRemovedListener.php +++ b/src/Listeners/PinRemovedListener.php @@ -26,4 +26,4 @@ class PinRemovedListener implements ShouldQueue Log::debug(sprintf('%s:Ignoring Pin Remove on [%s]',static::LOGKEY,$event->ts),['m'=>__METHOD__]); } -} +} \ No newline at end of file diff --git a/src/Listeners/ReactionAddedListener.php b/src/Listeners/ReactionAddedListener.php index 1a57175..6afe82a 100644 --- a/src/Listeners/ReactionAddedListener.php +++ b/src/Listeners/ReactionAddedListener.php @@ -26,4 +26,4 @@ class ReactionAddedListener implements ShouldQueue Log::debug(sprintf('%s:Ignoring Reaction Add [%s] on [%s]',static::LOGKEY,$event->reaction,$event->ts),['m'=>__METHOD__]); } -} +} \ No newline at end of file diff --git a/src/Listeners/ShortcutListener.php b/src/Listeners/ShortcutListener.php index 75eea47..d370353 100644 --- a/src/Listeners/ShortcutListener.php +++ b/src/Listeners/ShortcutListener.php @@ -1,8 +1,9 @@ channel() || ! $event->channel()->active) { $modal = new Modal(Text::item(config('app.name'),'plain_text')); @@ -53,4 +55,4 @@ class ShortcutListener //implements ShouldQueue Log::notice(sprintf('%s:Unhandled CALLBACK [%s]',self::LOGKEY,$event->callback_id),['m'=>__METHOD__]); } } -} +} \ No newline at end of file diff --git a/src/Listeners/ViewClosedListener.php b/src/Listeners/ViewClosedListener.php index 89195f6..d085668 100644 --- a/src/Listeners/ViewClosedListener.php +++ b/src/Listeners/ViewClosedListener.php @@ -29,4 +29,4 @@ class ViewClosedListener implements ShouldQueue Log::notice(sprintf('%s:Unhandled CALLBACK [%s]',self::LOGKEY,$event->callback_id),['m'=>__METHOD__]); } } -} +} \ No newline at end of file diff --git a/src/Listeners/ViewSubmissionListener.php b/src/Listeners/ViewSubmissionListener.php index 412d9cb..6277335 100644 --- a/src/Listeners/ViewSubmissionListener.php +++ b/src/Listeners/ViewSubmissionListener.php @@ -29,4 +29,4 @@ class ViewSubmissionListener implements ShouldQueue Log::notice(sprintf('%s:Unhandled CALLBACK [%s]',self::LOGKEY,$event->callback_id),['m'=>__METHOD__]); } } -} +} \ No newline at end of file diff --git a/src/Message.php b/src/Message.php index aa46646..6534486 100644 --- a/src/Message.php +++ b/src/Message.php @@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; + use Slack\Blockkit\Blocks; use Slack\Blockkit\Blocks\Context; use Slack\Blockkit\Blocks\Elements\Text; diff --git a/src/Message/Attachment.php b/src/Message/Attachment.php index 6a49535..9359dc4 100644 --- a/src/Message/Attachment.php +++ b/src/Message/Attachment.php @@ -4,6 +4,7 @@ namespace Slack\Message; use \Exception; use Illuminate\Support\Arr; + use Slack\BlockKit; use Slack\Blockkit\Blocks; @@ -13,15 +14,6 @@ final class Attachment extends BlockKit 'footer' => 300, ]; - /** - * @param Text $text - * @throws Exception - */ - public function __construct() - { - parent::__construct(); - } - public static function item(): self { return new self(); diff --git a/src/Models/Channel.php b/src/Models/Channel.php index 2158234..f265b39 100644 --- a/src/Models/Channel.php +++ b/src/Models/Channel.php @@ -2,10 +2,10 @@ namespace Slack\Models; -use App\Models\Slack\Team as AppTeam; - use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Arr; + +use App\Models\Slack\Team as AppTeam; use Slack\Traits\ScopeActive; class Channel extends Model diff --git a/src/Models/Enterprise.php b/src/Models/Enterprise.php index 3d2ae1c..94325dd 100644 --- a/src/Models/Enterprise.php +++ b/src/Models/Enterprise.php @@ -2,9 +2,9 @@ namespace Slack\Models; -use App\Models\Slack\Team as AppTeam; - use Illuminate\Database\Eloquent\Model; + +use App\Models\Slack\Team as AppTeam; use Slack\Traits\ScopeActive; class Enterprise extends Model diff --git a/src/Models/Team.php b/src/Models/Team.php index a703ef6..b799ba5 100644 --- a/src/Models/Team.php +++ b/src/Models/Team.php @@ -2,11 +2,11 @@ namespace Slack\Models; +use Illuminate\Database\Eloquent\Model; + use App\Models\Slack\Channel as AppChannel; use App\Models\Slack\Token as AppToken; use App\Models\Slack\User as AppUser; - -use Illuminate\Database\Eloquent\Model; use Slack\API; use Slack\Traits\ScopeActive; diff --git a/src/Models/Token.php b/src/Models/Token.php index 7dcb727..111f499 100644 --- a/src/Models/Token.php +++ b/src/Models/Token.php @@ -2,10 +2,10 @@ namespace Slack\Models; -use App\Models\Slack\Team as AppTeam; - use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Collection; + +use App\Models\Slack\Team as AppTeam; use Slack\Traits\ScopeActive; class Token extends Model diff --git a/src/Models/User.php b/src/Models/User.php index 937d91d..aa8542b 100644 --- a/src/Models/User.php +++ b/src/Models/User.php @@ -2,12 +2,12 @@ namespace Slack\Models; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Log; + use App\Models\Slack\Channel; use App\Models\Slack\Enterprise as AppEnterprise; use App\Models\Slack\Team as AppTeam; - -use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Log; use Slack\Traits\ScopeActive; class User extends Model diff --git a/src/Options/InteractiveMessage.php b/src/Options/InteractiveMessage.php index 342f071..be5fc19 100644 --- a/src/Options/InteractiveMessage.php +++ b/src/Options/InteractiveMessage.php @@ -3,6 +3,7 @@ namespace Slack\Options; use Illuminate\Support\Facades\Log; + use Slack\Message; /** diff --git a/src/Options/Unknown.php b/src/Options/Unknown.php index be77c02..d83aa7c 100644 --- a/src/Options/Unknown.php +++ b/src/Options/Unknown.php @@ -2,7 +2,6 @@ namespace Slack\Options; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; /** @@ -12,10 +11,10 @@ use Illuminate\Support\Facades\Log; */ class Unknown extends Base { - public function __construct(Request $request) + public function __construct(array $request) { Log::notice(sprintf('SOU:UNKNOWN Slack Interaction Option received [%s]',get_class($this)),['m'=>__METHOD__]); parent::__construct($request); } -} +} \ No newline at end of file diff --git a/src/Providers/SlackServiceProvider.php b/src/Providers/SlackServiceProvider.php index 7414b92..9b1a63c 100644 --- a/src/Providers/SlackServiceProvider.php +++ b/src/Providers/SlackServiceProvider.php @@ -5,6 +5,7 @@ namespace Slack\Providers; use Illuminate\Notifications\ChannelManager; use Illuminate\Support\Facades\Notification; use Illuminate\Support\ServiceProvider; + use Slack\API; use Slack\Channels\SlackBotChannel; use Slack\Console\Commands\SlackSocketClient; diff --git a/src/Response/Base.php b/src/Response/Base.php index 219d022..5372ad6 100644 --- a/src/Response/Base.php +++ b/src/Response/Base.php @@ -4,6 +4,7 @@ namespace Slack\Response; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Log; + use Slack\Base as SlackBase; /** @@ -67,6 +68,6 @@ class Base extends SlackBase implements \JsonSerializable */ public function jsonSerialize() { - return $this->_data ? $this->_data : new \stdClass; + return $this->_data ?: new \stdClass; } -} +} \ No newline at end of file diff --git a/src/Response/ChannelList.php b/src/Response/ChannelList.php index 112e0f4..61944d9 100644 --- a/src/Response/ChannelList.php +++ b/src/Response/ChannelList.php @@ -20,4 +20,4 @@ final class ChannelList extends Base return object_get($this->_data,$key); } } -} +} \ No newline at end of file diff --git a/src/Response/Chat.php b/src/Response/Chat.php index 74ba1cc..d5b69d6 100644 --- a/src/Response/Chat.php +++ b/src/Response/Chat.php @@ -46,4 +46,4 @@ class Chat extends Base { return $this->messages->first()->reply_users_count; } -} +} \ No newline at end of file diff --git a/src/Response/Generic.php b/src/Response/Generic.php index 487d94c..be889f9 100644 --- a/src/Response/Generic.php +++ b/src/Response/Generic.php @@ -24,4 +24,4 @@ class Generic extends Base return parent::__get($key); } } -} +} \ No newline at end of file diff --git a/src/Response/Team.php b/src/Response/Team.php index 75c60bb..6f181ab 100644 --- a/src/Response/Team.php +++ b/src/Response/Team.php @@ -27,4 +27,4 @@ final class Team extends Base return object_get($this->_data,'team.'.$key); } } -} +} \ No newline at end of file diff --git a/src/Response/Test.php b/src/Response/Test.php index 419dcf3..1dafecd 100644 --- a/src/Response/Test.php +++ b/src/Response/Test.php @@ -28,4 +28,4 @@ class Test extends Base return parent::__get($key); } } -} +} \ No newline at end of file diff --git a/src/Response/User.php b/src/Response/User.php index e261afe..3c38afa 100644 --- a/src/Response/User.php +++ b/src/Response/User.php @@ -32,4 +32,4 @@ final class User extends Base return object_get($this->_data,'user.id'); } } -} +} \ No newline at end of file diff --git a/src/Traits/ScopeActive.php b/src/Traits/ScopeActive.php index 1866a9e..84c0cbb 100644 --- a/src/Traits/ScopeActive.php +++ b/src/Traits/ScopeActive.php @@ -14,4 +14,4 @@ trait ScopeActive { return $query->where($this->getTable().'.active',TRUE); } -} +} \ No newline at end of file diff --git a/src/routes.php b/src/routes.php index 8e0ee31..3153413 100644 --- a/src/routes.php +++ b/src/routes.php @@ -43,4 +43,4 @@ app('router') 'uses' => 'SlashCommandController@fire', 'as' => 'slashcommand', ]); - }); + }); \ No newline at end of file