diff --git a/.gitignore b/.gitignore
index 16b4a200..2e27c436 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.php_cs.cache
 /behat.yml
 /build/
 /composer.lock
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 23ba165e..00000000
--- a/.php_cs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/*
- * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
- * with composer.
- *
- * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
- * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
- */
-
-use SLLH\StyleCIBridge\ConfigBridge;
-
-return ConfigBridge::create();
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 00000000..9bff4e5c
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,14 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('Resources')
+    ->exclude('vendor')
+    ->in(__DIR__)
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+         '@Symfony' => true,
+         'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder);
diff --git a/.styleci.yml b/.styleci.yml
deleted file mode 100644
index 435b5fb4..00000000
--- a/.styleci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-preset: symfony
-
-finder:
-    exclude:
-        - "Resources"
-        - "vendor"
-
-enabled:
-    - short_array_syntax
-
-disabled:
-    - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 031fb5b0..88426e56 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -399,7 +399,7 @@ private function createClientPluginNode()
     /**
      * Add the definitions for shared plugin configurations.
      *
-     * @param ArrayNodeDefinition $pluginNode The node to add to.
+     * @param ArrayNodeDefinition $pluginNode the node to add to
      * @param bool                $disableAll Some shared plugins are enabled by default. On the client, all are disabled by default.
      */
     private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableAll = false)
@@ -497,7 +497,7 @@ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableA
     /**
      * Create configuration for authentication plugin.
      *
-     * @return NodeDefinition Definition for the authentication node in the plugins list.
+     * @return NodeDefinition definition for the authentication node in the plugins list
      */
     private function createAuthenticationPluginNode()
     {
@@ -588,7 +588,7 @@ private function validateAuthenticationType(array $expected, array $actual, $aut
     /**
      * Create configuration for cache plugin.
      *
-     * @return NodeDefinition Definition for the cache node in the plugins list.
+     * @return NodeDefinition definition for the cache node in the plugins list
      */
     private function createCachePluginNode()
     {
diff --git a/DependencyInjection/HttplugExtension.php b/DependencyInjection/HttplugExtension.php
index d00713d7..943d6259 100644
--- a/DependencyInjection/HttplugExtension.php
+++ b/DependencyInjection/HttplugExtension.php
@@ -142,7 +142,7 @@ private function configurePlugins(ContainerBuilder $container, array $config)
      * @param Definition       $definition
      * @param array            $config
      * @param ContainerBuilder $container  In case we need to add additional services for this plugin
-     * @param string           $serviceId  Service id of the plugin, in case we need to add additional services for this plugin.
+     * @param string           $serviceId  service id of the plugin, in case we need to add additional services for this plugin
      */
     private function configurePluginByName($name, Definition $definition, array $config, ContainerBuilder $container, $serviceId)
     {
@@ -241,7 +241,7 @@ private function configurePluginByName($name, Definition $definition, array $con
      * @param ContainerBuilder $container
      * @param array            $config
      *
-     * @return array List of service ids for the authentication plugins.
+     * @return array list of service ids for the authentication plugins
      */
     private function configureAuthentication(ContainerBuilder $container, array $config, $servicePrefix = 'httplug.plugin.authentication')
     {