Merge pull request #10 from simonschaufi/php-cs-fixer

Update and run php-cs-fixer

Author: GenieTim

.php_cs

@@ -1,19 +1,61 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
-    ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers([
-        'concat_with_spaces',
-        'newline_after_open_tag',
-        'ordered_use',
-        'phpdoc_order',
-        'short_array_syntax',
-        '-empty_return',
-        '-concat_without_spaces',
-        '-phpdoc_inline_tag',
-    ])
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()->in(['src', 'tests'])
-    )
-;
+$config = new \PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@DoctrineAnnotation' => true,
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_after_opening_tag' => true,
+        'braces' => ['allow_single_line_closure' => true],
+        'cast_spaces' => ['space' => 'none'],
+        'compact_nullable_typehint' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => ['space' => 'none'],
+        'dir_constant' => true,
+        'function_typehint_space' => true,
+        'hash_to_slash_comment' => true,
+        'lowercase_cast' => true,
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'modernize_types_casting' => true,
+        'native_function_casing' => true,
+        'new_with_braces' => true,
+        'no_alias_functions' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_null_property_initialization' => true,
+        'no_short_bool_cast' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_superfluous_elseif' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_whitespace_in_blank_line' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => ['assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame'],
+        'php_unit_mock_short_will_return' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+        'phpdoc_no_access' => true,
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_trim' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'return_type_declaration' => ['space_before' => 'none'],
+        'single_quote' => true,
+        'single_trait_insert_per_statement' => true,
+        'whitespace_after_comma_in_array' => true,
+    ]);
+
+$config
+    ->getFinder()
+    ->in(['src', 'tests']);
+
+return $config;

composer.json

@@ -31,8 +31,9 @@
     "doctrine/collections": "^1.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0|^8.0|^9.0",
+    "friendsofphp/php-cs-fixer": "^2.18",
     "mockery/mockery": "^1.0",
+    "phpunit/phpunit": "^7.0|^8.0|^9.0",
     "symfony/var-dumper": "^2.3|^3.0|^4.0|^5.0"
   },
   "suggest": {

src/Model/Attachment.php

@@ -86,7 +86,7 @@ class Attachment extends AbstractModel
     private $actions;
 
     /**
-     * @var Array
+     * @var array
      */
     private $mrkdwnIn;
 
@@ -320,7 +320,7 @@ public function setMrkdwnIn(array $mrkdwnIn)
     }
 
     /**
-     * @return Array Valid values for mrkdwn_in are: ["pretext", "text", "fields"]. Setting "fields" will enable markup formatting for the value of each field
+     * @return array Valid values for mrkdwn_in are: ["pretext", "text", "fields"]. Setting "fields" will enable markup formatting for the value of each field
      */
     public function getMrkdwnIn()
     {

src/Model/AttachmentAction.php

@@ -20,7 +20,6 @@
  */
 class AttachmentAction extends AbstractModel
 {
-
     const TYPE_BUTTON = 'button';
 
     const STYLE_DEFAULT = 'default';

src/Model/Message.php

@@ -86,7 +86,7 @@ public function getNext2Alt()
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getPermalink()
     {

src/Model/SimpleMessage.php

@@ -73,9 +73,9 @@ public function getType()
     {
         return $this->type;
     }
-    
+
     /**
-     * @return null|string The subtype of message
+     * @return string|null The subtype of message
      */
     public function getSubtype()
     {
@@ -125,7 +125,7 @@ public function getAttachments()
     }
 
     /**
-     * @return boolean wether or not this message has attachments
+     * @return bool wether or not this message has attachments
      */
     public function hasAttachments()
     {

src/Payload/AbstractPayloadResponse.php

@@ -22,7 +22,7 @@ abstract class AbstractPayloadResponse implements PayloadResponseInterface
      */
     public function isOk()
     {
-        return (bool) $this->ok;
+        return (bool)$this->ok;
     }
 
     /**

src/Payload/ChatPostMessagePayload.php

@@ -151,7 +151,7 @@ public function getText()
     }
 
     /**
-     * Change how messages are treated. Defaults to none. 
+     * Change how messages are treated. Defaults to none.
      *
      * @param string $parse full, none
      *
@@ -262,7 +262,7 @@ public function getUnfurlLinks()
      * Pass false to disable unfurling of media content.
      *
      * @param bool $unfurlMedia
-     * 
+     *
      * @see https://api.slack.com/docs/unfurling
      */
     public function setUnfurlMedia($unfurlMedia)

src/Payload/ChatUpdatePayload.php

@@ -94,7 +94,7 @@ public function getTs()
 
     /**
      * Channel (ID only!) containing the message to be updated.
-     * 
+     *
      * @param string $channel
      *
      * @return ChatUpdatePayload
@@ -116,7 +116,7 @@ public function getChannelId()
 
     /**
      * New text for the message, using the default formatting rules.
-     * 
+     *
      * @param string $text
      *
      * @return ChatUpdatePayload
@@ -179,8 +179,8 @@ public function getAttachmentsJson()
     }
 
     /**
-     * Change how messages are treated. Defaults to client, unlike chat.postMessage. 
-     * 
+     * Change how messages are treated. Defaults to client, unlike chat.postMessage.
+     *
      * @param string $parse
      *
      * @return ChatUpdatePayload
@@ -206,7 +206,7 @@ public function getParse()
      * Find and link channel names and usernames. Defaults to none.
      * This parameter should be used in conjunction with parse.
      * To set link_names to 1, specify a parse mode of full.
-     * 
+     *
      * @param bool $linkNames
      *
      * @return ChatUpdatePayload

src/Payload/ReactionsPayloadResponse.php

@@ -59,4 +59,4 @@ public function getReactions()
 
         return $this->message['reactions'];
     }
-}
+}