Upgrade php-cs-fixer config to a version 2 compatible format

Author: Nico Stapelbroek

.gitignore

@@ -5,3 +5,4 @@ coverage/*
 notes.md
 tests/fixtures/cassette*
 /.php_cs.cache
+/.php_cs

.php_cs

@@ -0,0 +1,46 @@
+<?php
+
+if (class_exists('\\PhpCsFixer\\Config')) {
+ $cacheFile = getenv('TRAVIS') ? getenv('HOME') . '/.php_cs.cache' : __DIR__ . '/.php_cs.cache';
+ $config = PhpCsFixer\Config::create()
+ ->setRules(array(
+ '@PSR2' => true,
+ 'single_blank_line_before_namespace' => true,
+ 'concat_space' => array('spacing' => 'one'),
+ 'single_quote' => true,
+ 'braces' => true,
+ ))
+ ->setFinder(
+ PhpCsFixer\Finder::create()
+ ->exclude('vendor')
+ ->exclude('docs')
+ ->in(__DIR__)
+ )
+ ->setCacheFile($cacheFile)
+ ->setUsingCache(true)
+ ->setRiskyAllowed(true);
+
+ return $config;
+} else {
+ $config = Symfony\CS\Config\Config::create()
+ ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+ ->fixers(
+ array(
+ 'single_blank_line_before_namespace',
+ 'concat_with_spaces',
+ 'single_quote',
+ 'braces',
+ )
+ )
+ ->finder(
+ Symfony\CS\Finder::create()
+ ->exclude('vendor')
+ ->exclude('docs')
+ ->in(__DIR__)
+ )
+ ->setUsingCache(true);
+ $cacheDir = getenv('TRAVIS') ? getenv('HOME') . '/.php-cs-fixer' : __DIR__;
+ $config->setDir($cacheDir);
+ return $config;
+}
+

.php_cs.dist

@@ -40,12 +40,13 @@ install:
  - composer update --prefer-source -o $COMPOSER_FLAGS
  - PHPUNIT_BIN=$(pwd)/vendor/bin/phpunit
  - PHPCS_FIXER_BIN=$(pwd)/vendor/bin/php-cs-fixer
+ - $PHPCS_FIXER_BIN --version | grep -q "2.*.*" && PHPCS_FIXER_CONFIG_FLAG="--config=.php_cs.dist" || PHPCS_FIXER_CONFIG_FLAG="--config-file=.php_cs.dist"
  - cd ${TEST_DIR}
  - composer update --prefer-source -o $COMPOSER_FLAGS
 
 script:
  - $PHPUNIT_BIN --coverage-clover=coverage.clover
- - test $TEST_DIR = "." && $PHPCS_FIXER_BIN fix --config-file=.php_cs --dry-run --diff $TRAVIS_BUILD_DIR || echo "Continue without php-cs-fixer"
+ - test $TEST_DIR = "." && $PHPCS_FIXER_BIN fix $PHPCS_FIXER_CONFIG_FLAG --dry-run --diff $TRAVIS_BUILD_DIR || echo "Continue without php-cs-fixer"
 
 after_success:
  - wget https://scrutinizer-ci.com/ocular.phar