Merge pull request php-vcr#225 from nstapelbroek/feature/remove-legacy-php-cs-fixer

Feature/remove legacy php cs fixer

Author: renatomefi

.php_cs.dist

@@ -1,46 +1,20 @@
 <?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 PhpCsFixer\Config::create()
+ ->setRules([
+ '@PSR2' => true,
+ 'single_blank_line_before_namespace' => true,
+ 'concat_space' => ['spacing' => 'one'],
+ 'single_quote' => true,
+ 'braces' => 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;
-}
+ ->setFinder(
+ PhpCsFixer\Finder::create()
+ ->exclude('vendor')
+ ->exclude('docs')
+ ->in(__DIR__)
+ )
+
+ ->setRiskyAllowed(true);
 

.travis.yml

@@ -20,7 +20,7 @@ matrix:
  php: 7.0
  - env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
  php: 7.0
- - env: TEST_DIR=.
+ - env: TEST_DIR=. PHP_CS_FIXER=true
  php: 7.1
  - env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
  php: 7.1
@@ -39,14 +39,12 @@ before_install:
 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 $PHPCS_FIXER_CONFIG_FLAG --dry-run --diff $TRAVIS_BUILD_DIR || echo "Continue without php-cs-fixer"
+ - if [ "${PHP_CS_FIXER}" = "true" ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar && php ./php-cs-fixer-v2.phar fix --dry-run --diff $TRAVIS_BUILD_DIR; fi
 
 after_success:
  - wget https://scrutinizer-ci.com/ocular.phar

composer.json

@@ -27,8 +27,7 @@
  "phpunit/phpunit": "^4.8|^5.0",
  "sebastian/version": "^1.0.3|^2.0",
  "mikey179/vfsStream": "^1.2",
- "lapistano/proxy-object": "dev-master#d7184a479f502d5a0f96d0bae73566dbb498da8f",
- "friendsofphp/php-cs-fixer": "^2.7|^1.12"
+ "lapistano/proxy-object": "dev-master#d7184a479f502d5a0f96d0bae73566dbb498da8f"
  },
 
  "autoload": {