Permalink
Browse files

use version 2 of friendsofphp/php-cs-fixer

  • Loading branch information...
1 parent a5ac1f4 commit 837086ec60f50c84c611c613963e4ad2e2aec806 @MatTheCat MatTheCat committed Dec 15, 2016
Showing with 9 additions and 10 deletions.
  1. +7 −8 .php_cs
  2. +1 −1 composer.json
  3. +1 −1 src/League/ColorExtractor/ColorExtractor.php
View
@@ -1,14 +1,13 @@
<?php
-$finder = \Symfony\Component\Finder\Finder::create()
+$finder = Symfony\Component\Finder\Finder::create()
->files()
->name('*.php')
->in(array('src', 'tests'));
-$config = Symfony\CS\Config\Config::create()
- ->finder($finder)
- ->level(\Symfony\CS\FixerInterface::SYMFONY_LEVEL)
- ->fixers(array('short_array_syntax'))
- ->setUsingCache(true);
-
-return $config;
+return PhpCsFixer\Config::create()
+ ->setFinder($finder)
+ ->setRules([
+ '@Symfony' => true,
+ 'array_syntax' => ['syntax' => 'short'],
+ ]);
View
@@ -21,7 +21,7 @@
"ext-gd": "*"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "*",
+ "friendsofphp/php-cs-fixer": "~2",
"phpunit/phpunit": "~5"
},
"autoload": {
@@ -7,7 +7,7 @@ class ColorExtractor
/** @var \League\ColorExtractor\Palette */
protected $palette;
- /** @var \SplFixedArray */
+ /** @var \SplFixedArray */
protected $sortedColors;
/**

0 comments on commit 837086e

Please sign in to comment.