Merge branch 'master' into patch-1

.travis.yml

@@ -42,7 +42,7 @@ before_script:
 script:
   - |
     if [[ "$WITH_CS" == "true" ]]; then
-        vendor/bin/php-cs-fixer fix --config=.php_cs.dist --verbose --diff --dry-run
+        vendor/bin/php-cs-fixer fix --config=.php_cs.dist --verbose --diff --dry-run --diff-format=udiff
     fi
   - |
     if [[ "$WITH_PHPUNIT" == "true" ]]; then

CONTRIBUTING.md

@@ -68,7 +68,21 @@ This will add your changes on top of what's already in upstream, minimizing merg
 
 Make sure that all tests are passing before submitting a pull request.
 
-### Step 8: Send the pull request
+### Step 8: Fix code style
+
+Run the following command to check the code style of your changes:
+
+```
+vendor/bin/php-cs-fixer fix --config=.php_cs.dist --verbose --diff --dry-run --diff-format=udiff
+```
+
+This will print a diff of proposed code style changes. To apply these suggestions, run the following command:
+
+```
+vendor/bin/php-cs-fixer fix --config=.php_cs.dist
+```
+
+### Step 9: Send the pull request
 
 Send the pull request from your feature branch to us. Be sure to include a description that lets us know what work you did.