Merge branch '1.13'

Conflicts:
	composer.json

.travis.yml

@@ -91,8 +91,7 @@ before_deploy:
     - php box.phar --version
 
     # ensure that deps will work on lowest supported PHP version
-    - |
-      sed -i 's#"config":\s*{#"config": {\n        "platform": {"php": "5.3.6"},#' composer.json
+    - composer config platform.php 2> /dev/null || composer config platform.php 5.3.6
 
     # update deps to highest possible for lowest supported PHP version
     - composer update --no-dev --no-interaction --optimize-autoloader --prefer-stable

CHANGELOG.md

@@ -3,6 +3,17 @@ CHANGELOG for PHP CS Fixer
 
 This file contains changelogs for stable releases only.
 
+Changelog for v1.12.4
+---------------------
+
+* bug #2235 OrderedImportsFixer - PHP 7 group imports support (SpacePossum)
+* minor #2276 Tokens cleanup (keradus)
+* minor #2277 Remove trailing spaces (keradus)
+* minor #2294 Improve Travis configuration (keradus)
+* minor #2297 Use phpdbg instead of xdebug (keradus)
+* minor #2299 Travis: proper xdebug disabling (keradus)
+* minor #2301 Travis: update platform adjusting (keradus)
+
 Changelog for v1.12.3
 ---------------------
 

README.rst

@@ -30,13 +30,13 @@ your system:
 
 .. code-block:: bash
 
-    $ wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.3/php-cs-fixer.phar -O php-cs-fixer
+    $ wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.4/php-cs-fixer.phar -O php-cs-fixer
 
 or with curl:
 
 .. code-block:: bash
 
-    $ curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.3/php-cs-fixer.phar -o php-cs-fixer
+    $ curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.4/php-cs-fixer.phar -o php-cs-fixer
 
 then:
 
@@ -800,7 +800,7 @@ scanned by the tool when run in the directory of your project. It is useful for
 projects that follow a well-known directory structures (like for Symfony
 projects for instance).
 
-.. _php-cs-fixer.phar: https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.3/php-cs-fixer.phar
+.. _php-cs-fixer.phar: https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.4/php-cs-fixer.phar
 .. _Atom:              https://github.com/Glavin001/atom-beautify
 .. _NetBeans:          http://plugins.netbeans.org/plugin/49042/php-cs-fixer
 .. _PhpStorm:          http://tzfrs.de/2015/01/automatically-format-code-to-match-psr-standards-with-phpstorm

composer.json

@@ -39,9 +39,6 @@
         "psr-4": { "PhpCsFixer\\Tests\\": "tests/" }
     },
     "bin": ["php-cs-fixer"],
-    "config": {
-        "process-timeout": 0
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.0-dev"