diff --git a/.php_cs b/.php_cs
index e648d2c..cd1cc28 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,27 +1,36 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
-    ->setUsingLinter(false)
-    ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers([
-        'concat_with_spaces',
-        '-concat_without_spaces',
-        '-empty_return',
-        '-phpdoc_params',
-        '-phpdoc_separation',
-        '-phpdoc_to_comment',
-        '-spaces_cast',
-        '-blankline_after_open_tag',
-        '-single_blank_line_before_namespace',
-    ])
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
+// PHP-CS-Fixer 2.x syntax
+return PhpCsFixer\Config::create()
+    ->setRules(
+        [
+            '@Symfony' => true,
+            '@Symfony:risky' => true,
+            'concat_space' => ['spacing' => 'one'],
+            'array_syntax' => false,
+            'simplified_null_return' => false,
+            'phpdoc_align' => false,
+            'phpdoc_separation' => false,
+            'phpdoc_to_comment' => false,
+            'cast_spaces' => false,
+            'blank_line_after_opening_tag' => false,
+            'single_blank_line_before_namespace' => false,
+            'phpdoc_annotation_without_dot' => false,
+            'phpdoc_no_alias_tag' => false,
+            'space_after_semicolon' => false,
+            'yoda_style' => false,
+            'no_break_comment' => false,
+        ]
+    )
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
             ->in(__DIR__)
-            ->exclude([
-                'vendor',
-                'Resources'
-            ])
+            ->exclude(
+                [
+                    'vendor',
+                    'Resources',
+                ]
+            )
             ->files()->name('*.php')
-    )
-;
+    );
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..2ee87fe
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+language: php
+
+php:
+    - 7.1
+
+# test only master and stable branches (+ Pull requests)
+branches:
+    only:
+        - master
+        - /^\d.\d+$/
+
+install:
+    # Disable XDebug for better performance
+    - phpenv config-rm xdebug.ini
+    # Avoid memory issues on composer install
+    - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    # Get latest composer build
+    - travis_retry composer selfupdate
+    # Install packages
+    - travis_retry composer install --prefer-dist --no-interaction
+
+script:
+    - vendor/bin/php-cs-fixer fix -v --dry-run --diff --show-progress=estimating
+
+notifications:
+    email: false
diff --git a/composer.json b/composer.json
index 1b4058b..35a6de4 100644
--- a/composer.json
+++ b/composer.json
@@ -11,13 +11,19 @@
     }
   ],
   "require": {
-    "symfony/symfony": "~2.6"
+    "symfony/symfony": "~2.6 || ^3.3"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "~2.7.1"
   },
   "autoload": {
     "psr-4": {
       "EzSystems\\ShareButtonsBundle\\": ""
     }
   },
+  "scripts": {
+    "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
+  },
   "extra": {
     "branch-alias": {
       "dev-master": "1.0.x-dev"