diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89f44903a0..83b3c0594b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file based on the
 
 ### Improvements
 - Update Elasticsearch dependency to 1.7.0 and update plugin dependencies
+- Update php-cs-fixer to 1.10 [#898](https://github.com/ruflin/Elastica/pull/898)
 
 ### Deprecated
 
diff --git a/Dockerfile b/Dockerfile
index 0177e8cddd..4220a0692a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN composer global require "mayflower/php-codebrowser=~1.1"
 RUN composer global require "sebastian/phpcpd=~2.0"
 RUN composer global require "squizlabs/php_codesniffer=~2.3"
 RUN composer global require "phploc/phploc=~2.1"
-RUN composer global require "fabpot/php-cs-fixer=1.8.1"
+RUN composer global require "fabpot/php-cs-fixer=1.10.*"
 
 
 # Documentor dependencies
diff --git a/docker-compose.yml b/docker-compose.yml
index 674d6e9e09..bc188f5490 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 elastica:
   #build: . # In case the image must be built locally
-  image: ruflin/elastica
+  image: ruflin/elastica # comment out to build locally
   ports:
     - "9200:9200"
   volumes:
diff --git a/lib/Elastica/Aggregation/ReverseNested.php b/lib/Elastica/Aggregation/ReverseNested.php
index 5216ae8521..bd7a3ecdce 100644
--- a/lib/Elastica/Aggregation/ReverseNested.php
+++ b/lib/Elastica/Aggregation/ReverseNested.php
@@ -34,7 +34,7 @@ public function setPath($path)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function toArray()
     {