Merge pull request #10 from cleentfaar/removing-factory

Removed factory, simplified event handling and a lot of cs fixes

src/CL/Slack/Exception/SlackException.php

@@ -13,5 +13,4 @@
 
 class SlackException extends \Exception
 {
-
 }

src/CL/Slack/Model/AbstractModel.php

@@ -16,5 +16,4 @@
  */
 abstract class AbstractModel
 {
-
 }

src/CL/Slack/Model/Customizable.php

@@ -65,19 +65,11 @@ public function getCreator()
     /**
      * Returns the last date on which this customizable was customized ^_^,
      * or null if this was the first change
-     * 
+     *
      * @return \DateTime|null
      */
     public function getLastSet()
     {
         return $this->lastSet;
     }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->value;
-    }
 }

src/CL/Slack/Model/Message.php

@@ -19,10 +19,10 @@
 class Message extends SimpleMessage
 {
     /**
-     * @var Channel
+     * @var Channel|null
      */
     private $channel;
-    
+
     /**
      * @var string|null
      */

src/CL/Slack/Model/SimpleMessage.php

@@ -51,7 +51,7 @@ class SimpleMessage extends AbstractModel
     /**
      * @return string|null The Slack timestamp on which the message was posted
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }

src/CL/Slack/Payload/AbstractPayloadResponse.php

@@ -39,15 +39,15 @@ public function getError()
     public function getErrorExplanation()
     {
         if (null === $error = $this->getError()) {
-            return null;
+            return;
         }
 
         $ownErrors = $this->getPossibleErrors();
         if (array_key_exists($error, $ownErrors)) {
             return $ownErrors[$error];
         }
 
-        return sprintf('Unknown error: %s', $error);
+        return sprintf('Unknown error (%s)', $error);
     }
 
     /**

src/CL/Slack/Payload/AbstractSearchPayload.php

@@ -16,12 +16,6 @@
  */
 abstract class AbstractSearchPayload extends AbstractPayload
 {
-    const SORT_SCORE     = 'score';
-    const SORT_TIMESTAMP = 'timestamp';
-
-    const SORT_DIR_ASC  = 'asc';
-    const SORT_DIR_DESC = 'desc';
-
     /**
      * @var string
      */

src/CL/Slack/Payload/ApiTestPayload.php

@@ -29,7 +29,7 @@ class ApiTestPayload extends AbstractPayload
      * @var string
      */
     private $error;
-    
+
     /**
      * @param array $args
      */
@@ -49,15 +49,15 @@ public function addArgument($key, $value)
 
     /**
      * @param string $key
-     * 
+     *
      * @return mixed
      */
     public function getArgument($key)
     {
         if (!array_key_exists($key, $this->args)) {
             throw new \InvalidArgumentException(sprintf('There is no argument with that name: "%s"', $key));
         }
-        
+
         return $this->args[$key];
     }
 

src/CL/Slack/Payload/AuthTestPayloadResponse.php

@@ -64,7 +64,7 @@ public function getTeam()
     {
         return $this->team;
     }
-    
+
     /**
      * @return string
      */

src/CL/Slack/Payload/ChannelsInvitePayload.php

@@ -22,7 +22,7 @@ class ChannelsInvitePayload extends AbstractPayload
      * @var string
      */
     private $channel;
-    
+
     /**
      * @var string
      */

src/CL/Slack/Payload/ChannelsMarkPayload.php

@@ -47,15 +47,15 @@ public function getChannelId()
     /**
      * @param string $timestamp
      */
-    public function setTimestamp($timestamp)
+    public function setSlackTimestamp($timestamp)
     {
         $this->ts = $timestamp;
     }
 
     /**
      * @return string
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }

src/CL/Slack/Payload/ChannelsSetPurposePayloadResponse.php

@@ -35,7 +35,7 @@ public function getPurpose()
     protected function getPossibleErrors()
     {
         return array_merge(parent::getPossibleErrors(), [
-            'too_long' => 'Purpose was longer than 250 characters.'
+            'too_long' => 'Purpose was longer than 250 characters.',
         ]);
     }
 }

src/CL/Slack/Payload/ChannelsSetTopicPayloadResponse.php

@@ -35,7 +35,7 @@ public function getTopic()
     protected function getPossibleErrors()
     {
         return array_merge(parent::getPossibleErrors(), [
-            'too_long' => 'Topic was longer than 250 characters.'
+            'too_long' => 'Topic was longer than 250 characters.',
         ]);
     }
 }

src/CL/Slack/Payload/ChatDeletePayload.php

@@ -47,15 +47,15 @@ public function getChannelId()
     /**
      * @param string $timestamp
      */
-    public function setTimestamp($timestamp)
+    public function setSlackTimestamp($timestamp)
     {
         $this->ts = $timestamp;
     }
 
     /**
      * @return string
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }

src/CL/Slack/Payload/ChatDeletePayloadResponse.php

@@ -37,7 +37,7 @@ public function getChannelId()
     /**
      * @return string
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }

src/CL/Slack/Payload/ChatPostMessagePayload.php

@@ -57,7 +57,7 @@ class ChatPostMessagePayload extends AbstractPayload
     private $unfurlMedia;
 
     /**
-     * @var string
+     * @var boolean
      */
     private $linkNames;
 
@@ -115,7 +115,7 @@ public function getText()
 
     /**
      * @param string $message
-     * 
+     *
      * @deprecated Will be removed soon, use `setText()` instead
      */
     public function setMessage($message)
@@ -125,7 +125,7 @@ public function setMessage($message)
 
     /**
      * @return string
-     * 
+     *
      * @deprecated Will be removed soon, use `getText()` instead
      */
     public function getMessage()

src/CL/Slack/Payload/ChatPostMessagePayloadResponse.php

@@ -29,15 +29,15 @@ class ChatPostMessagePayloadResponse extends AbstractPayloadResponse
     /**
      * @return string|null The Slack timestamp on which your message has been posted, or null if the call failed
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }
 
     /**
-     * @return string|null The Slack channel on which your message has been posted, or null if the call failed
+     * @return string|null The Slack channel ID on which your message has been posted, or null if the call failed
      */
-    public function getChannel()
+    public function getChannelId()
     {
         return $this->channel;
     }

src/CL/Slack/Payload/ChatUpdatePayload.php

@@ -52,15 +52,15 @@ public function getChannelId()
     /**
      * @param string $timestamp
      */
-    public function setTimestamp($timestamp)
+    public function setSlackTimestamp($timestamp)
     {
         $this->ts = $timestamp;
     }
 
     /**
      * @return string
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }

src/CL/Slack/Payload/ChatUpdatePayloadResponse.php

@@ -42,7 +42,7 @@ public function getChannelId()
     /**
      * @return string
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }

src/CL/Slack/Payload/EmojiListPayloadResponse.php

@@ -17,12 +17,12 @@
 class EmojiListPayloadResponse extends AbstractPayloadResponse
 {
     /**
-     * @var array<string, string>
+     * @var array
      */
     private $emoji = [];
 
     /**
-     * @return array<string, string>
+     * @return array
      */
     public function getEmojis()
     {

src/CL/Slack/Payload/FilesUploadPayload.php

@@ -82,7 +82,7 @@ public function getChannels()
     {
         return $this->channels;
     }
-    
+
     /**
      * @param string|null $filename
      */

src/CL/Slack/Payload/GroupsArchivePayload.php

@@ -49,18 +49,4 @@ public function getMethod()
     {
         return 'groups.archive';
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getPossibleErrors()
-    {
-        return array_merge(parent::getPossibleErrors(), [
-            'channel_not_found'     => 'Value passed for group was invalid',
-            'already_archived'      => 'Group has already been archived',
-            'group_contains_others' => 'Restricted accounts cannot archive groups containing others',
-            'last_ra_channel'       => 'You cannot archive the last channel for a restricted account',
-            'restricted_action'     => 'A team preference prevents authenticated user from archiving',
-        ]);
-    }
 }

src/CL/Slack/Payload/GroupsArchivePayloadResponse.php

@@ -16,4 +16,17 @@
  */
 class GroupsArchivePayloadResponse extends AbstractPayloadResponse
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected function getPossibleErrors()
+    {
+        return array_merge(parent::getPossibleErrors(), [
+            'channel_not_found'     => 'Value passed for group was invalid',
+            'already_archived'      => 'Group has already been archived',
+            'group_contains_others' => 'Restricted accounts cannot archive groups containing others',
+            'last_ra_channel'       => 'You cannot archive the last channel for a restricted account',
+            'restricted_action'     => 'A team preference prevents authenticated user from archiving',
+        ]);
+    }
 }

src/CL/Slack/Payload/GroupsClosePayload.php

@@ -49,18 +49,4 @@ public function getMethod()
     {
         return 'groups.close';
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getPossibleErrors()
-    {
-        return array_merge(parent::getPossibleErrors(), [
-            'channel_not_found'     => 'Value passed for group was invalid',
-            'already_archived'      => 'Group has already been archived',
-            'group_contains_others' => 'Restricted accounts cannot archive groups containing others',
-            'last_ra_channel'       => 'You cannot archive the last channel for a restricted account',
-            'restricted_action'     => 'A team preference prevents authenticated user from archiving',
-        ]);
-    }
 }

src/CL/Slack/Payload/GroupsClosePayloadResponse.php

@@ -41,4 +41,18 @@ public function isNoOp()
     {
         return $this->noOp;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getPossibleErrors()
+    {
+        return array_merge(parent::getPossibleErrors(), [
+            'channel_not_found'     => 'Value passed for group was invalid',
+            'already_archived'      => 'Group has already been archived',
+            'group_contains_others' => 'Restricted accounts cannot archive groups containing others',
+            'last_ra_channel'       => 'You cannot archive the last channel for a restricted account',
+            'restricted_action'     => 'A team preference prevents authenticated user from archiving',
+        ]);
+    }
 }

src/CL/Slack/Payload/GroupsMarkPayload.php

@@ -50,15 +50,15 @@ public function getGroupId()
     /**
      * @param string $timestamp
      */
-    public function setTimestamp($timestamp)
+    public function setSlackTimestamp($timestamp)
     {
         $this->ts = $timestamp;
     }
 
     /**
      * @return string
      */
-    public function getTimestamp()
+    public function getSlackTimestamp()
     {
         return $this->ts;
     }

src/CL/Slack/Payload/GroupsSetPurposePayloadResponse.php

@@ -35,7 +35,7 @@ public function getPurpose()
     protected function getPossibleErrors()
     {
         return array_merge(parent::getPossibleErrors(), [
-            'too_long' => 'Purpose was longer than 250 characters.'
+            'too_long' => 'Purpose was longer than 250 characters.',
         ]);
     }
 }