Merge branch 'release/2.1.1'

.gitignore

@@ -172,3 +172,13 @@ $RECYCLE.BIN/
 *.lnk
 
 # End of https://www.gitignore.io/api/macos,phpunit,windows,composer,phpstorm,phpcodesniffer
+
+# Sphinx documentation
+docs/_build/
+
+# PHP CodeSniffer
+.php_codesniffer_cache.json
+
+# PHP Coding Standards fixer
+.php_cs
+.php_coding_standard_cache.json

.php_cs.dist

@@ -7,8 +7,8 @@ Votifier PHP Client
 @package   VotifierClient
 @author    Manuele Vaccari <[email protected]>
 @copyright Copyright (c) 2017-$year Manuele Vaccari <[email protected]>
-@license   https://github.com/D3strukt0r/Votifier-PHP-Client/blob/master/LICENSE.md MIT License
-@link      https://github.com/D3strukt0r/Votifier-PHP-Client
+@license   https://github.com/D3strukt0r/votifier-client-php/blob/master/LICENSE.txt GNU General Public License v3.0
+@link      https://github.com/D3strukt0r/votifier-client-php
 EOF;
 
 $finder = PhpCsFixer\Finder::create()
@@ -17,27 +17,21 @@ $finder = PhpCsFixer\Finder::create()
 
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
-    ->setRules(array(
+    ->setRules([
+        '@PSR1' => true,
+        '@PSR2' => true,
+        '@PhpCsFixer' => true,
+        '@PhpCsFixer:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'array_syntax' => array('syntax' => 'long'),
         'linebreak_after_opening_tag' => true,
         'mb_str_functions' => true,
         'no_php4_constructor' => true,
-        'no_unreachable_default_argument_value' => true,
-        'no_useless_else' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => true,
-        'php_unit_strict' => true,
-        'phpdoc_order' => true,
-        'semicolon_after_instruction' => true,
-        'strict_comparison' => true,
-        'strict_param' => true,
-        'header_comment' => array(
-            'commentType' => 'PHPDoc',
+        'header_comment' => [
+            'comment_type' => 'PHPDoc',
             'header' => $header,
-        ),
-    ))
+        ],
+    ])
     ->setFinder($finder)
-    ->setCacheFile(__DIR__.'/.php_cs.cache')
+    ->setCacheFile(__DIR__.'/.php_coding_standard_cache.json')
 ;

.phpcs.xml

@@ -8,7 +8,7 @@
     <file>tests/</file>
 
     <arg name="basepath" value="."/>
-    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="cache" value=".php_codesniffer_cache.json"/>
     <arg name="colors"/>
     <arg name="extensions" value="php"/>
     <arg name="parallel" value="75"/>

.readthedocs.yml

@@ -0,0 +1,18 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements.txt

.travis.yml

@@ -37,7 +37,8 @@ install:
 
 script:
   #  - VOTIFIER_KEY=$(cat $HOME/mc-server/plugins/Votifier/rsa/public.key); ./phpunit
-  - ./vendor/bin/phpunit
+  - composer run-script check
+  - composer run-script test
 
 after_script:
   - |

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "restructuredtext.confPath": "${workspaceFolder}\\docs"
+}