diff --git a/.gitattributes b/.gitattributes
index 6b4dc843e..c5a870fd0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,3 +10,4 @@ build.xml export-ignore
 CONTRIBUTING.md export-ignore
 phpunit.xml.dist export-ignore
 run-all.sh export-ignore
+phpcs.xml.dist export-ignore
diff --git a/.gitignore b/.gitignore
index d2f5f6901..da7410292 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ lib/Doctrine/DBAL
 vendor/
 composer.lock
 /tests/Doctrine/Performance/history.db
+/.phpcs-cache
diff --git a/.travis.yml b/.travis.yml
index e55ea503c..31a63d87c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ jobs:
       env: DB=none
       before_script:
         - echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-        - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.7 symfony/console:^3.0
+        - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.8 symfony/console:^3.0
       script: vendor/bin/phpstan analyse -l 1 -c phpstan.neon lib
 
     - stage: Coverage
@@ -78,6 +78,11 @@ jobs:
       before_script: wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey
       script: php phpbench.phar run -l dots --report=default
 
+    - stage: Coding standard
+      php: nightly
+      script:
+        - ./vendor/bin/phpcs
+
   allow_failures:
     - php: nightly
 
diff --git a/composer.json b/composer.json
index b4371aaec..fad4b22ff 100644
--- a/composer.json
+++ b/composer.json
@@ -13,20 +13,25 @@
         {"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
     ],
     "minimum-stability": "dev",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "^7.1",
         "ext-pdo": "*",
+        "doctrine/annotations": "~1.4",
+        "doctrine/cache": "~1.6",
         "doctrine/collections": "^1.4",
+        "doctrine/common": "^2.7.1",
         "doctrine/dbal": "^2.6",
         "doctrine/instantiator": "~1.1",
-        "doctrine/common": "^2.7.1",
-        "doctrine/cache": "~1.6",
-        "doctrine/annotations": "~1.4",
         "symfony/console": "~3.0|~4.0"
     },
     "require-dev": {
-        "symfony/yaml": "~3.4|~4.0",
-        "phpunit/phpunit": "^6.0"
+        "doctrine/coding-standard": "^1.0",
+        "phpunit/phpunit": "^6.0",
+        "squizlabs/php_codesniffer": "^3.1",
+        "symfony/yaml": "~3.4|~4.0"
     },
     "suggest": {
         "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
new file mode 100644
index 000000000..9ffa05d31
--- /dev/null
+++ b/phpcs.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors" />
+
+    <!-- Ignore warnings and show progress of the run -->
+    <arg value="np"/>
+
+    <file>lib</file>
+    <file>tests</file>
+    <file>tools</file>
+
+    <exclude-pattern>*/tests/Doctrine/Tests/Proxies/__CG__/*</exclude-pattern>
+
+    <rule ref="Doctrine" />
+
+    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+</ruleset>
+